Dev-Editor is now able to change the mode and the group of files

diff --git a/errors.dat b/errors.dat
index f867df81b4664702ea13809dd3d2ea44184c8e00..60088f1438332ce462f6ad1572cef659bd3a8db9 100644 (file)
--- a/errors.dat
+++ b/errors.dat
@@ -26,5 +26,7 @@ dir_not_exist  = The directory where you want to create this file or directory d
 file_too_large = The file you want to view or edit is too large (max. {SIZE} Bytes).
 remove_root    = You are not allowed to remove the root directory.
 rename_root    = You are not allowed to move/rename the root directory.
+no_users       = It seems that your system doesn't support users and groups.
+not_owner      = You are not the owner of {FILE}, so you are not allowed to change the mode and the group.
 
 # End of configuration file
\ No newline at end of file

diff --git a/modules/Command.pm b/modules/Command.pm
index 17f94709872e53531f78deb6f350fd6c77948af9..8e4716365ea22c0c082755da4f0fc7bb8b205db5 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-07-27
+# Last modified: 2004-07-28
 #
 
 use strict;
@@ -26,6 +26,7 @@ use Output;
 use Template;
 
 my $script = $ENV{'SCRIPT_NAME'};
+my $users  = eval("getpwuid(0)") && eval("getgrgid(0)");
 
 my %dispatch = ('show'       => \&exec_show,
                 'beginedit'  => \&exec_beginedit,
@@ -37,6 +38,7 @@ my %dispatch = ('show'       => \&exec_show,
                 'copy'       => \&exec_copy,
                 'rename'     => \&exec_rename,
                 'remove'     => \&exec_remove,
+                'chprop'     => \&exec_chprop,
                 'unlock'     => \&exec_unlock,
                 'about'      => \&exec_about
                );
@@ -134,6 +136,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);
+
    $dirlist .= $dtpl->get_template;
   }
 
@@ -169,6 +173,8 @@ sub exec_show($$)
 
    $ftpl->parse_if_block("too_large",$config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'});
 
+   $ftpl->parse_if_block("users",$users && -o $phys_path);
+
    $dirlist .= $ftpl->get_template;
   }
 
@@ -726,6 +732,83 @@ sub exec_remove($$)
  }
 }
 
+# exec_chprop()
+#
+# Change the mode and the group of a file or a directory
+#
+# Params: 1. Reference to user input hash
+#         2. Reference to config hash
+#
+# Return: Output of the command (Scalar Reference)
+
+sub exec_chprop($$)
+{
+ my ($data,$config) = @_;
+ my $physical       = $data->{'physical'};
+ my $virtual        = $data->{'virtual'};
+ my $dir            = upper_path($virtual);
+ my $cgi            = $data->{'cgi'};
+ my $mode           = $cgi->param('mode');
+ my $group          = $cgi->param('group');
+
+ if($users)
+ {
+  if(-o $physical)
+  {
+   if($mode || $group)
+   {
+    if($mode)
+    {
+     my $oct_mode = $mode;
+     $oct_mode    = "0".$oct_mode if(length($oct_mode) == 3);
+     $oct_mode    = oct($oct_mode);
+
+     chmod($oct_mode,$physical);
+    }
+
+    chgrp($group,$physical) if($group);
+
+    return devedit_reload({command => 'show', file => $dir});
+   }
+   else
+   {
+    my @stat     = lstat($physical);
+
+    my $mode     = $stat[2];
+    my $mode_oct = substr(sprintf("%04o",$mode),-4);
+    my $gid      = $stat[5];
+    my $group    = getgrgid($gid);
+
+    my $tpl = new Template;
+    $tpl->read_file($config->{'templates'}->{'chprop'});
+
+    $tpl->fillin("MODE_OCTAL",$mode_oct);
+    $tpl->fillin("MODE_STRING",mode_string($mode));
+    $tpl->fillin("GID",$gid);
+    $tpl->fillin("GROUP",$group);
+
+    $tpl->fillin("FILE",$virtual);
+    $tpl->fillin("DIR",$dir);
+    $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+    $tpl->fillin("SCRIPT",$script);
+
+    my $output = header(-type => "text/html");
+    $output   .= $tpl->get_template;
+
+    return \$output;
+   }
+  }
+  else
+  {
+   return error($config->{'errors'}->{'not_owner'},$dir,{FILE => $virtual});
+  }
+ }
+ else
+ {
+  return error($config->{'errors'}->{'no_users'},$dir,{FILE => $virtual});
+ }
+}
+
 # exec_unlock()
 #
 # Remove a file from the list of used files and
@@ -809,7 +892,7 @@ sub exec_about($$)
 
  # Check if the functions getpwuid() and getgrgid() are available
 
- if(eval("getpwuid(0)") && eval("getgrgid(0)"))
+ if($users)
  {
   # Dev-Editor is running on a system which allows users and groups
   # So we display the user and the group of our process

diff --git a/modules/File/Access.pm b/modules/File/Access.pm
index 2604d297f5bf4111410730cda61cb150a1ef839a..31ad87dde4561393962b46c1008001c73f800639 100644 (file)
--- a/modules/File/Access.pm
+++ b/modules/File/Access.pm
@@ -7,7 +7,7 @@ package File::Access;
 # with only one command
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2004-07-21
+# Last modified: 2004-07-28
 #
 
 use strict;
@@ -20,12 +20,32 @@ use Carp qw(croak);
 
 use base qw(Exporter);
 
-@EXPORT = qw(dir_read
+@EXPORT = qw(chgrp
+             dir_read
              file_create
              file_read
              file_save
              file_unlock);
 
+# chgrp()
+#
+# Change the group of files or directories
+#
+# Params: 1. Group name
+#         2. List of files
+#
+# Return: Number of files group successfully changed
+#         (or false)
+
+sub chgrp($@)
+{
+ my ($group,@files) = @_;
+ my $gid = getgrnam($group);
+
+ return unless($gid);
+ return chown(-1,$gid,@files);
+}
+
 # dir_read()
 #
 # Collect the files and directories in a directory

diff --git a/modules/Tool.pm b/modules/Tool.pm
index 840c13433085250eca4bf9fdad937486ff9a8633..3a43ffcd9005a5d3a65708b63e0c39feefcade77 100644 (file)
--- a/modules/Tool.pm
+++ b/modules/Tool.pm
@@ -6,7 +6,7 @@ package Tool;
 # Some shared sub routines
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2004-07-17
+# Last modified: 2004-07-28
 #
 
 use strict;
@@ -30,6 +30,7 @@ use base qw(Exporter);
              devedit_reload
              equal_url
              file_name
+             mode_string
              upper_path);
 
 # check_path()
@@ -144,12 +145,12 @@ sub devedit_reload($)
  # and modified by Patrick Canterino
 
  my $query = '?'.join ('&' =>
-    map {
-      (ref)
-      ? map{escape ($_).'='.escape ($params -> {$_})} @{$params -> {$_}}
-      : escape ($_).'='.escape ($params -> {$_})
-    } keys %$params
-  );
+   map {
+     (ref)
+     ? map{escape ($_).'='.escape ($params -> {$_})} @{$params -> {$_}}
+     : escape ($_).'='.escape ($params -> {$_})
+   } keys %$params
+ );
 
  # Create the redirection header
 
@@ -201,6 +202,48 @@ sub file_name($)
  return $path;
 }
 
+# mode_string()
+#
+# Convert a binary file mode string into a human
+# readable string (rwxr-x-r-x)
+#
+# Params: Binary file mode string
+#
+# Return: Humand readable mode string
+
+sub mode_string($)
+{
+ my $mode = shift;
+
+ my $string = "";
+
+  # Owner
+  $string .= (($mode & 0x0100) ? 'r' : '-') .
+         (($mode & 0x0080) ? 'w' : '-') .
+         (($mode & 0x0040) ?
+           (($mode & 0x0800) ? 's' : 'x' ) :
+           (($mode & 0x0800) ? 'S' : '-')
+         );
+
+  # Group
+  $string .= (($mode & 0x0020) ? 'r' : '-') .
+         (($mode & 0x0010) ? 'w' : '-') .
+         (($mode & 0x0008) ?
+           (($mode & 0x0400) ? 's' : 'x') :
+           (($mode & 0x0400) ? 'S' : '-')
+         );
+
+  # World
+  $string .= (($mode & 0x0004) ? 'r' : '-') .
+         (($mode & 0x0002) ? 'w' : '-') .
+         (($mode & 0x0001) ?
+           (($mode & 0x0200) ? 't' : 'x' ) :
+           (($mode & 0x0200) ? 'T' : '-')
+         );
+
+ return $string;
+}
+
 # upper_path()
 #
 # Cut away the last part of a path

diff --git a/templates.dat b/templates.dat
index 6f065b8b87a7d199bf53c33d13bc5831dfd5083d..320c132a65fc7d11d377a0c4390bbfb5f12717b8 100644 (file)
--- a/templates.dat
+++ b/templates.dat
@@ -16,6 +16,7 @@ confirm_replace = templates/confirm_replace.htm
 dirlist_file    = templates/dirlist_file.htm
 dirlist_dir     = templates/dirlist_dir.htm
 dirlist_up      = templates/dirlist_up.htm
+chprop          = templates/chprop.htm
 error           = templates/error.htm
 about           = templates/about.htm
 

diff --git a/templates/chprop.htm b/templates/chprop.htm
new file mode 100644 (file)
index 0000000..67f362b
--- /dev/null
+++ b/templates/chprop.htm
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+<head>
+<title>Change properties of {FILE}</title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
+</head>
+<body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
+
+<h1>Change properties of {FILE}</h1>
+
+<p>(equals <a href="{URL}" target="_blank">{URL}</a>)</p>
+
+<p><a href="{SCRIPT}?command=show&amp;file={DIR}">Back to {DIR}</a></p>
+
+<p>Current mode: {MODE_STRING} (Octal: {MODE_OCTAL})</p>
+
+<p>Current group: {GROUP} (GID: {GID})</p>
+
+<hr>
+
+<table border="0">
+<tr>
+<td>Change mode:</td>
+<form action="{SCRIPT}" method="get">
+<input type="hidden" name="command" value="chprop">
+<input type="hidden" name="file" value="{FILE}">
+<td><input type="text" name="mode" value="{MODE_OCTAL}"> <input type="submit" value="Change!"></td>
+</form>
+</tr>
+<tr>
+<td>Change group:</td>
+<form action="{SCRIPT}" method="get">
+<input type="hidden" name="command" value="chprop">
+<input type="hidden" name="file" value="{FILE}">
+<td><input type="text" name="group" value="{GROUP}"> <input type="submit" value="Change!"></td>
+</form>
+</tr>
+</table>
+
+<hr>
+
+<p align="right"><a href="{SCRIPT}?command=about" target="_blank"><i>About Dev-Editor</i></a></p>
+</body>
+</html>
\ No newline at end of file

diff --git a/templates/dirlist_dir.htm b/templates/dirlist_dir.htm
index 04a2daaeee3b203942a4abbedd7ae4cfbfee233f..c1bf870d1a9c0285a0804a7d0c483f4b15e5920f 100644 (file)
--- a/templates/dirlist_dir.htm
+++ b/templates/dirlist_dir.htm
@@ -1,6 +1,6 @@
 <tr>
-<td align="right">[SUBDIR]</td>
-<td style="padding-left:15pt">{DATE}</td>
-<td style="padding-left:15pt"><a href="{SCRIPT}?command=show&amp;file={DIR}">{DIR_NAME}/</a></td>
-<td style="padding-left:15pt">(<a href="{SCRIPT}?command=rename&amp;file={DIR}">Rename</a> | <a href="{SCRIPT}?command=remove&amp;file={DIR}">Delete</a> | <a href="{URL}" target="_blank">View in Browser</a>)</td>
+<td align="right" style="white-space:nowrap">[SUBDIR]</td>
+<td style="padding-left:15pt;white-space:nowrap;">{DATE}</td>
+<td style="padding-left:15pt;white-space:nowrap;"><a href="{SCRIPT}?command=show&amp;file={DIR}">{DIR_NAME}/</a></td>
+<td style="padding-left:15pt;white-space:nowrap;">(<a href="{SCRIPT}?command=rename&amp;file={DIR}">Rename</a> | <a href="{SCRIPT}?command=remove&amp;file={DIR}">Delete</a> |{IF users} <a href="{SCRIPT}?command=chprop&amp;file={DIR}">Chmod/Chgrp</a> |{ENDIF} <a href="{URL}" target="_blank">View in Browser</a>)</td>
 </tr>

diff --git a/templates/dirlist_file.htm b/templates/dirlist_file.htm
index 92d61cc7c14fadffa04e662900a123a52bb58ce9..1de43cafd7dd67349a659f704d3ae6888451339f 100644 (file)
--- a/templates/dirlist_file.htm
+++ b/templates/dirlist_file.htm
@@ -1,6 +1,6 @@
 <tr>
-<td align="right">{SIZE}</td>
-<td style="padding-left:15pt">{DATE}</td>
-<td style="padding-left:15pt">{FILE_NAME}</td>
-<td style="padding-left:15pt">({IF viewable}<a href="{SCRIPT}?command=show&amp;file={FILE}">View</a>{ELSE}<span style="color:#C0C0C0" title="{IF not_readable}Not readable{ELSE}{IF binary}Binary file{ELSE}{IF too_large}File too large{ENDIF}{ENDIF}{ENDIF}">View</span>{ENDIF} | {IF editable}<a href="{SCRIPT}?command=beginedit&amp;file={FILE}">Edit</a>{ELSE}<span style="color:#C0C0C0" title="{IF not_readable}Not readable{ELSE}{IF readonly}Read only{ELSE}{IF binary}Binary file{ELSE}{IF too_large}File too large{ENDIF}{IF in_use}In use{ENDIF}{ENDIF}{ENDIF}{ENDIF}">Edit</span>{ENDIF} | <a href="{SCRIPT}?command=copy&amp;file={FILE}">Copy</a>{IF unused} | <a href="{SCRIPT}?command=rename&amp;file={FILE}">Rename</a> | <a href="{SCRIPT}?command=remove&amp;file={FILE}">Delete</a>{ENDIF}{IF in_use} | <a href="{SCRIPT}?command=unlock&amp;file={FILE}">Unlock</a>{ENDIF} | <a href="{URL}" target="_blank">View in Browser</a>)</td>
+<td align="right" style="white-space:nowrap">{SIZE}</td>
+<td style="padding-left:15pt;white-space:nowrap;">{DATE}</td>
+<td style="padding-left:15pt;white-space:nowrap;">{FILE_NAME}</td>
+<td style="padding-left:15pt;white-space:nowrap;">({IF viewable}<a href="{SCRIPT}?command=show&amp;file={FILE}">View</a>{ELSE}<span style="color:#C0C0C0" title="{IF not_readable}Not readable{ELSE}{IF binary}Binary file{ELSE}{IF too_large}File too large{ENDIF}{ENDIF}{ENDIF}">View</span>{ENDIF} | {IF editable}<a href="{SCRIPT}?command=beginedit&amp;file={FILE}">Edit</a>{ELSE}<span style="color:#C0C0C0" title="{IF not_readable}Not readable{ELSE}{IF readonly}Read only{ELSE}{IF binary}Binary file{ELSE}{IF too_large}File too large{ENDIF}{IF in_use}In use{ENDIF}{ENDIF}{ENDIF}{ENDIF}">Edit</span>{ENDIF} | <a href="{SCRIPT}?command=copy&amp;file={FILE}">Copy</a>{IF unused} | <a href="{SCRIPT}?command=rename&amp;file={FILE}">Rename</a> | <a href="{SCRIPT}?command=remove&amp;file={FILE}">Delete</a>{ENDIF}{IF in_use} | <a href="{SCRIPT}?command=unlock&amp;file={FILE}">Unlock</a>{ENDIF} |{IF users} <a href="{SCRIPT}?command=chprop&amp;file={FILE}">Chmod/Chgrp</a> |{ENDIF} <a href="{URL}" target="_blank">View in Browser</a>)</td>
 </tr>

diff --git a/templates/dirlist_up.htm b/templates/dirlist_up.htm
index 734be5c307d6f3a7fba2137a4519b10e49a994f1..5f375e5615a14d45c7b7f5bee578a4ff488c6c0f 100644 (file)
--- a/templates/dirlist_up.htm
+++ b/templates/dirlist_up.htm
@@ -1,5 +1,5 @@
 <tr>
-<td align="right">[SUBDIR]</td>
-<td style="padding-left:15pt">{DATE}</td>
-<td colspan="2" style="padding-left:15pt"><a href="{SCRIPT}?command=show&amp;file={UPPER_DIR}">../</a></td>
+<td align="right" style="white-space:nowrap">[SUBDIR]</td>
+<td style="padding-left:15pt;white-space:nowrap;">{DATE}</td>
+<td colspan="2" style="padding-left:15pt;white-space:nowrap"><a href="{SCRIPT}?command=show&amp;file={UPPER_DIR}">../</a></td>
 </tr>