Added an "About" dialogue, which shows some (more or less useful) information about...

Additionally, the $VERSION variable in devedit.pl is back again.

diff --git a/devedit.dat b/devedit.dat
index f180caee64ad8f7e985a1546db2373b2282aa95e..79ad3db6672f0bc7b578f347d4c7e7734b5d951d 100644 (file)
--- a/devedit.dat
+++ b/devedit.dat
@@ -32,6 +32,7 @@ tpl_dirlist_file    = templates/dirlist_file.htm
 tpl_dirlist_dir     = templates/dirlist_dir.htm
 tpl_dirlist_up      = templates/dirlist_up.htm
 tpl_error           = templates/error.htm
+tpl_about           = templates/about.htm
 
 # Error messages
 

diff --git a/devedit.pl b/devedit.pl
index b2261ad1e1af384741e3ab89546bff2ea1564499..543d2203cf188eddb930dc7a203bedc4a834e948 100644 (file)
--- a/devedit.pl
+++ b/devedit.pl
@@ -1,17 +1,18 @@
 #!C:/Programme/Perl/bin/perl.exe -w
 
 #
-# Dev-Editor 1.2
+# Dev-Editor 2.0 (CVS)
 #
 # Dev-Editor's main program
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2004-02-23
+# Last modified: 2004-03-06
 #
 
 use strict;
 use CGI::Carp qw(fatalsToBrowser);
 
+use vars qw($VERSION);
 use lib 'modules';
 
 use CGI;
@@ -22,6 +23,8 @@ use Command;
 use Output;
 use Tool;
 
+$VERSION = '2.0 (CVS)';
+
 use constant CONFIGFILE => 'devedit.dat';
 
 # Read the configuration file
@@ -90,14 +93,16 @@ if(-e clean_path($config->{'fileroot'}."/".$file))
   $uselist->load;
 
   # Create a hash with data submitted by user
-  # (the CGI and the File::UseList object will also be included)
+  # (some other necessary information will also be included)
 
   my %data = (physical     => $physical,
               virtual      => $virtual,
               new_physical => $new_physical,
               new_virtual  => $new_virtual,
               uselist      => $uselist,
-              cgi          => $cgi);
+              cgi          => $cgi,
+              version      => $VERSION,
+              configfile   => CONFIGFILE);
 
   my $output = exec_command($command,\%data,$config); # Execute the command...
 

diff --git a/modules/Command.pm b/modules/Command.pm
index 8e899d369e7a581057acfa9f170df6eb93a88baf..9f6b970aff283f58cee28af30da52b7c19ec64d5 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-03-04
+# Last modified: 2004-03-09
 #
 
 use strict;
@@ -37,7 +37,8 @@ my %dispatch = ('show'       => \&exec_show,
                 'copy'       => \&exec_copy,
                 'rename'     => \&exec_rename,
                 'remove'     => \&exec_remove,
-                'unlock'     => \&exec_unlock
+                'unlock'     => \&exec_unlock,
+                'about'      => \&exec_about
                );
 
 ### Export ###
@@ -314,7 +315,7 @@ sub exec_endedit($$)
 
   # Check if someone else is editing the new file
 
-  return error_in_use($virtual) if($uselist->in_use($virtual));
+  return error($config->{'err_in_use'},upper_path($virtual),{FILE => $virtual}) if($uselist->in_use($virtual));
  }
 
  return error($config->{'err_editdir'},upper_path($virtual)) if(-d $physical);
@@ -487,6 +488,7 @@ sub exec_copy($$)
     $tpl->fillin("NEW_FILENAME",file_name($new_virtual));
     $tpl->fillin("NEW_DIR",$dir);
     $tpl->fillin("DIR",upper_path($virtual));
+
     $tpl->fillin("COMMAND","copy");
     $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
     $tpl->fillin("SCRIPT",$script);
@@ -560,6 +562,7 @@ sub exec_rename($$)
     $tpl->fillin("NEW_FILENAME",file_name($new_virtual));
     $tpl->fillin("NEW_DIR",$dir);
     $tpl->fillin("DIR",upper_path($virtual));
+
     $tpl->fillin("COMMAND","rename");
     $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
     $tpl->fillin("SCRIPT",$script);
@@ -697,6 +700,80 @@ sub exec_unlock($$)
  }
 }
 
+# exec_about()
+#
+# Display some information about Dev-Editor
+#
+# Params: 1. Reference to user input hash
+#         2. Reference to config hash
+#
+# Return: Output of the command (Scalar Reference)
+
+sub exec_about($$)
+{
+ my ($data,$config) = @_;
+
+ my $tpl = new Template;
+ $tpl->read_file($config->{'tpl_about'});
+
+ $tpl->fillin("SCRIPT",$script);
+
+ # Dev-Editor's version number
+
+ $tpl->fillin("VERSION",$data->{'version'});
+
+ # Some path information
+
+ $tpl->fillin("SCRIPT_PHYS",$ENV{'SCRIPT_FILENAME'});
+ $tpl->fillin("CONFIG_PATH",$data->{'configfile'});
+ $tpl->fillin("FILE_ROOT",$config->{'fileroot'});
+ $tpl->fillin("HTTP_ROOT",$config->{'httproot'});
+
+ # Perl
+
+ $tpl->fillin("PERL_PROG",$^X);
+ $tpl->fillin("PERL_VER",sprintf("%vd",$^V));
+
+ # Information about the server
+
+ $tpl->fillin("HTTPD",$ENV{'SERVER_SOFTWARE'});
+ $tpl->fillin("OS",$^O);
+ $tpl->fillin("TIME",strftime($config->{'timeformat'},localtime));
+
+ # Process information
+
+ $tpl->fillin("PID",$$);
+
+ # Check if the functions getpwuid() and getgrgid() are available
+
+ if(eval("getpwuid(0)") && eval("getgrgid(0)"))
+ {
+  # Dev-Editor is running on a system which allows users and groups
+  # So we display the user and the group of our process
+
+  $tpl->parse_if_block("users",1);
+
+  # ID's of user and group
+
+  $tpl->fillin("UID",$<);
+  $tpl->fillin("GID",$();
+
+  # Names of user and group
+
+  $tpl->fillin("USER",getpwuid($<));
+  $tpl->fillin("GROUP",getgrgid($());
+ }
+ else
+ {
+  $tpl->parse_if_block("users",0);
+ }
+
+ my $output = header(-type => "text/html");
+ $output   .= $tpl->get_template;
+
+ return \$output;
+}
+
 # it's true, baby ;-)
 
 1;

diff --git a/templates/about.htm b/templates/about.htm
new file mode 100644 (file)
index 0000000..7b5d36a
--- /dev/null
+++ b/templates/about.htm
@@ -0,0 +1,91 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+<head>
+<title>About Dev-Editor</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>About Dev-Editor</h1>
+
+<p>Dev-Editor {VERSION}</p>
+
+<p>&copy;&nbsp;1999-2000 Roland Bl&uuml;thgen, <a href="http://www.defined.de/" target="_blank">Frank Sch&ouml;nmann</a><br />
+&copy;&nbsp;2003-2004 <a href="http://www.patshaping.de/" target="_blank">Patrick Canterino</a></p>
+
+<p><a href="http://devedit.sourceforge.net/artistic.txt" target="_blank">View license</a> (needs an active internet connection)</p>
+
+<p><a href="http://devedit.sourceforge.net/" target="_blank">http://devedit.sourceforge.net/</a></p>
+
+<hr>
+
+<table border="0">
+
+<tr>
+<td><b>Physical script path:</b></td>
+<td>{SCRIPT_PHYS}</td>
+</tr>
+
+<tr>
+<td><b>Path to configuration file:</b></td>
+<td>{CONFIG_PATH}</td>
+</tr>
+
+<tr>
+<td><b>Physical root directory:</b></td>
+<td>{FILE_ROOT}</td>
+</tr>
+
+<tr>
+<td><b>HTTP root:</b></td>
+<td>{HTTP_ROOT}</td>
+</tr>
+
+<tr>
+<td><b>Perl executable:</b></td>
+<td>{PERL_PROG}</td>
+</tr>
+
+<tr>
+<td><b>Perl version:</b></td>
+<td>{PERL_VER}</td>
+</tr>
+
+<tr>
+<td><b>HTTP server software:</b></td>
+<td>{HTTPD}</td>
+</tr>
+
+<tr>
+<td><b>Server operating system:</b></td>
+<td>{OS}</td>
+</tr>
+
+<tr>
+<td><b>Server time:</b></td>
+<td>{TIME}</td>
+</tr>
+
+<tr>
+<td><b>Process ID:</b></td>
+<td>{PID}</td>
+</tr>
+{IF users}
+<tr>
+<td><b>User:</b></td>
+<td>{USER} (UID: {UID})</td>
+</tr>
+
+<tr>
+<td><b>Group:</b></td>
+<td>{GROUP} (GID: {GID})</td>
+</tr>
+{ENDIF}
+</table>
+
+<hr>
+
+</body>
+</html>
\ No newline at end of file

diff --git a/templates/copyfile.htm b/templates/copyfile.htm
index 9733ed2fe6b845be4e2a3430e2e3ef916ec66ae8..fa7ce7c90ca9d949f39e79e879ec8e4cf871a33b 100644 (file)
--- a/templates/copyfile.htm
+++ b/templates/copyfile.htm
@@ -14,6 +14,8 @@
 
 <p><a href="{SCRIPT}?command=show&file={DIR}">Back to {DIR}</a></p>
 
+<hr>
+
 <form action="{SCRIPT}" method="post">
 <input type="hidden" name="command" value="copy">
 <input type="hidden" name="file" value="{FILE}">
@@ -23,5 +25,9 @@
 
 <p><input type="submit" value="Copy file!"></p>
 </form>
+
+<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.htm b/templates/dirlist.htm
index 3ababdedc1d54f8c689e2b514239b0aa8aee3eb0..6f83465ad3cbfd4d5210cb7493da6ce7f285f129 100644 (file)
--- a/templates/dirlist.htm
+++ b/templates/dirlist.htm
@@ -45,5 +45,6 @@
 
 <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/renamefile.htm b/templates/renamefile.htm
index 0d59a07c50a632f929850b7800be67d1cb596d42..bdfb04bdcb7875fa84866d75664d6691acd590c9 100644 (file)
--- a/templates/renamefile.htm
+++ b/templates/renamefile.htm
@@ -14,6 +14,8 @@
 
 <p><a href="{SCRIPT}?command=show&file={DIR}">Back to {DIR}</a></p>
 
+<hr>
+
 <form action="{SCRIPT}" method="post">
 <input type="hidden" name="command" value="rename">
 <input type="hidden" name="file" value="{FILE}">
@@ -21,7 +23,11 @@
 <p>Move/Rename file '{FILE}' to:<br>
 {DIR} <input type="text" name="newfile"></p>
 
-<p><input type="submit" value="Move/Rename file!"></p>  
+<p><input type="submit" value="Move/Rename file!"></p>
 </form>
+
+<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/upload.htm b/templates/upload.htm
index 552bb57be413ae940795f0b3b83d99b041ef2884..276bc6b3fa2b966a1b901b0a99059bd82ac79865 100644 (file)
--- a/templates/upload.htm
+++ b/templates/upload.htm
@@ -44,5 +44,6 @@
 
 <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/viewfile.htm b/templates/viewfile.htm
index 556e0174fdc8bcb4d025a0244dbf38b1871a7a75..0de0bc62815aa42cc7a73b7093f6c4e72ece7f35 100644 (file)
--- a/templates/viewfile.htm
+++ b/templates/viewfile.htm
@@ -19,5 +19,7 @@
 {CONTENT}
 </pre>
 </div>
+
+<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