]> git.p6c8.net - devedit.git/commitdiff
git.p6c8.net / devedit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4397853)
In directory listing, when clicking on the buttons next to the fields for
authorpcanterino <>
Sun, 11 Jul 2004 14:04:51 +0000 (14:04 +0000)
committerpcanterino <>
Sun, 11 Jul 2004 14:04:51 +0000 (14:04 +0000)
creating new files and directories without entering a file or directory name,
the user got an error message which is a little bit strange.
Now, the user will see a form for creating new files or directories.

Well, this is not perfect, but at least, this error will be catched.

modules/Command.pm patch | blob | history
templates/mkdir.htm [new file with mode: 0644] patch | blob
templates/mkfile.htm [new file with mode: 0644] patch | blob

diff --git a/modules/Command.pm b/modules/Command.pm
index 64f49008c29f371a611a3bd3f11bbcc99542c17a..6db5d07b5429b8dc83d8da99dd9f4d6d87a7f64e 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-07-03
+# Last modified: 2004-07-11
 #
 
 use strict;
 #
 
 use strict;
@@ -25,8 +25,6 @@ use HTML::Entities;
 use Output;
 use Template;
 
 use Output;
 use Template;
 
-use Data::Dumper;
-
 my $script = $ENV{'SCRIPT_NAME'};
 
 my %dispatch = ('show'       => \&exec_show,
 my $script = $ENV{'SCRIPT_NAME'};
 
 my %dispatch = ('show'       => \&exec_show,
@@ -376,10 +374,26 @@ sub exec_mkfile($$)
  my $dir            = upper_path($new_virtual);
  $new_virtual       = encode_entities($new_virtual);
 
  my $dir            = upper_path($new_virtual);
  $new_virtual       = encode_entities($new_virtual);
 
- return error($config->{'errors'}->{'file_exists'},$dir,{FILE => $new_virtual}) if(-e $new_physical);
+ if($new_physical)
+ {
+  return error($config->{'errors'}->{'file_exists'},$dir,{FILE => $new_virtual}) if(-e $new_physical);
+
+  file_create($new_physical) or return error($config->{'errors'}->{'mkfile_failed'},$dir,{FILE => $new_virtual});
+  return devedit_reload({command => 'show', file => $dir});
+ }
+ else
+ {
+  my $tpl = new Template;
+  $tpl->read_file($config->{'templates'}->{'mkfile'});
+
+  $tpl->fillin("DIR","/");
+  $tpl->fillin("SCRIPT",$script);
 
 
- file_create($new_physical) or return error($config->{'errors'}->{'mkfile_failed'},$dir,{FILE => $new_virtual});
- return devedit_reload({command => 'show', file => $dir});
+  my $output = header(-type => "text/html");
+  $output   .= $tpl->get_template;
+
+  return \$output;
+ }
 }
 
 # exec_mkdir()
 }
 
 # exec_mkdir()
@@ -401,8 +415,24 @@ sub exec_mkdir($$)
 
  return error($config->{'errors'}->{'file_exists'},$dir,{FILE => $new_virtual}) if(-e $new_physical);
 
 
  return error($config->{'errors'}->{'file_exists'},$dir,{FILE => $new_virtual}) if(-e $new_physical);
 
- mkdir($new_physical,0777) or return error($config->{'errors'}->{'mkdir_failed'},$dir,{DIR => $new_virtual});
- return devedit_reload({command => 'show', file => $dir});
+ if($new_physical)
+ {
+  mkdir($new_physical,0777) or return error($config->{'errors'}->{'mkdir_failed'},$dir,{DIR => $new_virtual});
+  return devedit_reload({command => 'show', file => $dir});
+ }
+ else
+ {
+  my $tpl = new Template;
+  $tpl->read_file($config->{'templates'}->{'mkdir'});
+
+  $tpl->fillin("DIR","/");
+  $tpl->fillin("SCRIPT",$script);
+
+  my $output = header(-type => "text/html");
+  $output   .= $tpl->get_template;
+
+  return \$output;
+ }
 }
 
 # exec_upload()
 }
 
 # exec_upload()
diff --git a/templates/mkdir.htm b/templates/mkdir.htm
new file mode 100644 (file)
index 0000000..45d237c
--- /dev/null
+++ b/templates/mkdir.htm
@@ -0,0 +1,28 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+<head>
+<title>Create new directory</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>Create new directory</h1>
+
+<p><a href="{SCRIPT}?command=show&file={DIR}">Back to {DIR}</a></p>
+
+<p>Using this form, you can create a new directory in the current directory ('{DIR}').</p>
+
+<form action="{SCRIPT}">
+<input type="hidden" name="command" value="mkdir">
+<input type="hidden" name="curdir" value="{DIR}">
+<p>{DIR} <input type="text" name="newfile"> <input type="submit" value="Create!"></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/mkfile.htm b/templates/mkfile.htm
new file mode 100644 (file)
index 0000000..ef75c3f
--- /dev/null
+++ b/templates/mkfile.htm
@@ -0,0 +1,28 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+<head>
+<title>Create new 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>Create new file</h1>
+
+<p><a href="{SCRIPT}?command=show&file={DIR}">Back to {DIR}</a></p>
+
+<p>Using this form, you can create a new file in the current directory ('{DIR}').</p>
+
+<form action="{SCRIPT}">
+<input type="hidden" name="command" value="mkfile">
+<input type="hidden" name="curdir" value="{DIR}">
+<p>{DIR} <input type="text" name="newfile"> <input type="submit" value="Create!"></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
Dev-Editor is a simple web based file manager written in Perl, allowing you to access a file system on a server using a web browser

patrick-canterino.de