# Execute Dev-Editor's commands
#
# Author: Patrick Canterino <patrick@patshaping.de>
-# Last modified: 2004-11-29
+# Last modified: 2004-12-28
#
use strict;
use POSIX qw(strftime);
use Tool;
-use CGI qw(header);
+use CGI qw(header
+ escape);
+
use HTML::Entities;
use Output;
use Template;
-my $script = $ENV{'SCRIPT_NAME'};
+my $script = encode_entities($ENV{'SCRIPT_NAME'});
my $users = eval("getpwuid(0)") && eval("getgrgid(0)");
my %dispatch = ('show' => \&exec_show,
}
}
- return error($config->{'errors'}->{'cmd_unknown'},'/',{COMMAND => $command});
+ return error($config->{'errors'}->{'cmd_unknown'},'/',{COMMAND => encode_entities($command)});
}
# exec_show()
my ($data,$config) = @_;
my $physical = $data->{'physical'};
my $virtual = $data->{'virtual'};
- my $upper_path = upper_path($virtual);
+ my $upper_path = encode_entities(upper_path($virtual));
my $uselist = $data->{'uselist'};
my $tpl = new Template;
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,{DIR => $virtual}) unless($direntries);
+ return error($config->{'dir_read_fail'},$upper_path,{DIR => encode_entities($virtual)}) unless($direntries);
my $files = $direntries->{'files'};
my $dirs = $direntries->{'dirs'};
my $dirlist = "";
+ my $filter1 = $data->{'cgi'}->param('filter') || '*'; # The real wildcard
+ my $filter2 = ($filter1 && $filter1 ne '*') ? $filter1 : ''; # Wildcard for output
+
# Create the link to the upper directory
# (only if we are not in the root directory)
my $udtpl = new Template;
$udtpl->read_file($config->{'templates'}->{'dirlist_up'});
- $udtpl->fillin("UPPER_DIR",encode_entities($upper_path));
+ $udtpl->fillin("UPPER_DIR",$upper_path);
$udtpl->fillin("DATE",encode_entities(strftime($config->{'timeformat'},localtime($stat[9]))));
$dirlist .= $udtpl->get_template;
foreach my $dir(@$dirs)
{
+ next unless(dos_wildcard_match($filter1,$dir));
+
my $phys_path = $physical."/".$dir;
my $virt_path = encode_entities($virtual.$dir."/");
$dtpl->read_file($config->{'templates'}->{'dirlist_dir'});
$dtpl->fillin("DIR",$virt_path);
- $dtpl->fillin("DIR_NAME",$dir);
+ $dtpl->fillin("DIR_NAME",encode_entities($dir));
$dtpl->fillin("DATE",encode_entities(strftime($config->{'timeformat'},localtime($stat[9]))));
- $dtpl->fillin("URL",equal_url($config->{'httproot'},$virt_path));
+ $dtpl->fillin("URL",equal_url(encode_entities($config->{'httproot'}),$virt_path));
$dtpl->parse_if_block("readable",-r $phys_path && -x $phys_path);
$dtpl->parse_if_block("users",$users && -o $phys_path);
foreach my $file(@$files)
{
+ next unless(dos_wildcard_match($filter1,$file));
+
my $phys_path = $physical."/".$file;
my $virt_path = encode_entities($virtual.$file);
$ftpl->read_file($config->{'templates'}->{'dirlist_file'});
$ftpl->fillin("FILE",$virt_path);
- $ftpl->fillin("FILE_NAME",$file);
+ $ftpl->fillin("FILE_NAME",encode_entities($file));
$ftpl->fillin("SIZE",$stat[7]);
$ftpl->fillin("DATE",encode_entities(strftime($config->{'timeformat'},localtime($stat[9]))));
- $ftpl->fillin("URL",equal_url($config->{'httproot'},$virt_path));
+ $ftpl->fillin("URL",equal_url(encode_entities($config->{'httproot'}),$virt_path));
$ftpl->parse_if_block("not_readable",not -r $phys_path);
$ftpl->parse_if_block("binary",-B $phys_path);
$ftpl->parse_if_block("readonly",not -w $phys_path);
$ftpl->parse_if_block("viewable",-r $phys_path && -T $phys_path && not $too_large);
- $ftpl->parse_if_block("editable",-r $phys_path && -w $phys_path && -T $phys_path && not $too_large && not $in_use);
+ $ftpl->parse_if_block("editable",(-r $phys_path && -w $phys_path && -T $phys_path && not $too_large) && not $in_use);
$ftpl->parse_if_block("in_use",$in_use);
$ftpl->parse_if_block("unused",not $in_use);
$tpl->read_file($config->{'templates'}->{'dirlist'});
$tpl->fillin("DIRLIST",$dirlist);
- $tpl->fillin("DIR",$virtual);
+ $tpl->fillin("DIR",encode_entities($virtual));
$tpl->fillin("SCRIPT",$script);
- $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+ $tpl->fillin("URL",encode_entities(equal_url($config->{'httproot'},$virtual)));
+
+ $tpl->fillin("FILTER",encode_entities($filter2));
+ $tpl->fillin("FILTER_URL",escape($filter2));
$tpl->parse_if_block("dir_writeable",$dir_writeable);
+ $tpl->parse_if_block("filter",$filter2);
}
else
{
return error($config->{'errors'}->{'no_view'},$upper_path) unless(-r $physical);
# Check on binary files
- # We have to do it in this way, or empty files
- # will be recognized as binary files
+ # We have to do it in this way or empty files will be recognized
+ # as binary files
- unless(-T $physical)
- {
- # Binary file
+ return error($config->{'errors'}->{'binary'},$upper_path) unless(-T $physical);
- return error($config->{'errors'}->{'binary'},$upper_path);
- }
- else
- {
- # Text file
+ # Is the file too large?
- if($config->{'max_file_size'} && -s $physical > $config->{'max_file_size'})
- {
- return error($config->{'errors'}->{'file_too_large'},$upper_path,{SIZE => $config->{'max_file_size'}})
- }
- else
- {
- my $content = file_read($physical);
- $$content =~ s/\015\012|\012|\015/\n/g;
+ return error($config->{'errors'}->{'file_too_large'},$upper_path,{SIZE => $config->{'max_file_size'}}) if($config->{'max_file_size'} && -s $physical > $config->{'max_file_size'});
- $tpl->read_file($config->{'templates'}->{'viewfile'});
+ # View the file
- $tpl->fillin("FILE",$virtual);
- $tpl->fillin("DIR",$upper_path);
- $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
- $tpl->fillin("SCRIPT",$script);
+ my $content = file_read($physical);
+ $$content =~ s/\015\012|\012|\015/\n/g;
- $tpl->parse_if_block("editable",-w $physical && $uselist->unused($virtual));
+ $tpl->read_file($config->{'templates'}->{'viewfile'});
- $tpl->fillin("CONTENT",encode_entities($$content));
- }
- }
+ $tpl->fillin("FILE",encode_entities($virtual));
+ $tpl->fillin("DIR",$upper_path);
+ $tpl->fillin("URL",encode_entities(equal_url($config->{'httproot'},$virtual)));
+ $tpl->fillin("SCRIPT",$script);
+
+ $tpl->parse_if_block("editable",-w $physical && $uselist->unused($virtual));
+
+ $tpl->fillin("CONTENT",encode_entities($$content));
}
my $output = header(-type => "text/html");
# Check on binary files
- unless(-T $physical)
- {
- # Binary file
+ return error($config->{'errors'}->{'binary'},$dir) unless(-T $physical);
- return error($config->{'errors'}->{'binary'},$dir);
- }
- else
- {
- if($config->{'max_file_size'} && -s $physical > $config->{'max_file_size'})
- {
- return error($config->{'errors'}->{'file_too_large'},$dir,{SIZE => $config->{'max_file_size'}})
- }
- else
- {
- # Text file
+ # Is the file too large?
- $uselist->add_file($virtual);
- $uselist->save;
+ return error($config->{'errors'}->{'file_too_large'},$dir,{SIZE => $config->{'max_file_size'}}) if($config->{'max_file_size'} && -s $physical > $config->{'max_file_size'});
- my $content = file_read($physical);
- $$content =~ s/\015\012|\012|\015/\n/g;
+ # Lock the file...
- my $tpl = new Template;
- $tpl->read_file($config->{'templates'}->{'editfile'});
+ $uselist->add_file($virtual);
+ $uselist->save;
- $tpl->fillin("FILE",$virtual);
- $tpl->fillin("DIR",$dir);
- $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
- $tpl->fillin("SCRIPT",$script);
- $tpl->fillin("CONTENT",encode_entities($$content));
+ # ... and show the editing form
- my $output = header(-type => "text/html");
- $output .= $tpl->get_template;
+ my $content = file_read($physical);
+ $$content =~ s/\015\012|\012|\015/\n/g;
- return \$output;
- }
- }
+ my $tpl = new Template;
+ $tpl->read_file($config->{'templates'}->{'editfile'});
+
+ $tpl->fillin("FILE",$virtual);
+ $tpl->fillin("DIR",$dir);
+ $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+ $tpl->fillin("SCRIPT",$script);
+ $tpl->fillin("CONTENT",encode_entities($$content));
+
+ my $output = header(-type => "text/html");
+ $output .= $tpl->get_template;
+
+ return \$output;
}
# exec_canceledit()
my $content = $data->{'cgi'}->param('filecontent');
my $uselist = $data->{'uselist'};
- # We already unlock the file at the beginning of the
- # subroutine, because if we have to abort this routine,
- # the file keeps locked.
- # Nobody else will access the file during this routine
- # because of the concept of File::UseList.
+ # We already unlock the file at the beginning of the subroutine,
+ # because if we have to abort this routine, the file keeps locked.
+ # No other user of Dev-Editor will access the file during this
+ # routine because of the concept of File::UseList.
file_unlock($uselist,$virtual);
if(file_save($physical,\$content))
{
- # Saving of the file was successful - so unlock it!
+ # Saving of the file was successful!
return devedit_reload({command => 'show', file => $dir});
}
my $file_phys = $physical."/".$filename;
my $file_virt = $virtual.$filename;
- return error($config->{'errors'}->{'file_exists'},$virtual,{FILE => $file_virt}) if(-e $file_phys && not $cgi->param('overwrite'));
+ return error($config->{'errors'}->{'in_use'},$virtual,{FILE => $file_virt}) if($data->{'uselist'}->in_use($file_virt));
+
+ if(-e $file_phys)
+ {
+ return error($config->{'errors'}->{'dir_replace'},$virtual) if(-d $file_phys);
+ return error($config->{'errors'}->{'exist_no_write'},$virtual,{FILE => $file_virt}) unless(-w $file_phys);
+ return error($config->{'errors'}->{'file_exists'},$virtual,{FILE => $file_virt}) unless($cgi->param('overwrite'));
+ }
my $ascii = $cgi->param('ascii');
my $handle = $cgi->upload('uploaded_file');
- local *FILE;
-
- 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
read($handle, my $data, -s $handle);
$data =~ s/\015\012|\012|\015/\n/g if($ascii); # Replace line separators if transferring in ASCII mode
- print FILE $data;
-
- close(FILE);
+ file_save($file_phys,\$data,not $ascii) or return error($config->{'errors'}->{'mkfile_failed'},$virtual,{FILE => $file_virt});
return devedit_reload({command => "show", file => $virtual});
}
my ($data,$config) = @_;
my $physical = $data->{'physical'};
my $virtual = encode_entities($data->{'virtual'});
+ my $dir = upper_path($virtual);
my $new_physical = $data->{'new_physical'};
- return error($config->{'errors'}->{'dircopy'},upper_path($virtual)) if(-d $physical);
- return error($config->{'errors'}->{'no_copy'},upper_path($virtual)) unless(-r $physical);
+ return error($config->{'errors'}->{'dircopy'},$dir) if(-d $physical);
+ return error($config->{'errors'}->{'no_copy'},$dir) unless(-r $physical);
if($new_physical)
{
my $new_virtual = $data->{'new_virtual'};
- my $dir = upper_path($new_virtual);
+ my $new_dir = upper_path($new_virtual);
$new_virtual = encode_entities($new_virtual);
if(-e $new_physical)
{
- return error($config->{'errors'}->{'exist_edited'},$dir,{FILE => $new_virtual}) if($data->{'uselist'}->in_use($data->{'new_virtual'}));
+ return error($config->{'errors'}->{'exist_edited'},$new_dir,{FILE => $new_virtual}) if($data->{'uselist'}->in_use($data->{'new_virtual'}));
+ return error($config->{'errors'}->{'dir_replace'},$new_dir) if(-d $new_physical);
+ return error($config->{'errors'}->{'exist_no_write'},$new_dir,{FILE => $new_virtual}) unless(-w $new_physical);
- if(-d $new_physical)
- {
- return error($config->{'errors'}->{'dir_replace'},$dir);
- }
- elsif(not $data->{'cgi'}->param('confirmed'))
+ if(not $data->{'cgi'}->param('confirmed'))
{
my $tpl = new Template;
$tpl->read_file($config->{'templates'}->{'confirm_replace'});
$tpl->fillin("FILE",$virtual);
$tpl->fillin("NEW_FILE",$new_virtual);
$tpl->fillin("NEW_FILENAME",file_name($new_virtual));
- $tpl->fillin("NEW_DIR",$dir);
- $tpl->fillin("DIR",upper_path($virtual));
+ $tpl->fillin("NEW_DIR",$new_dir);
+ $tpl->fillin("DIR",$dir);
$tpl->fillin("COMMAND","copy");
$tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
}
}
- copy($physical,$new_physical) or return error($config->{'errors'}->{'copy_failed'},upper_path($virtual),{FILE => $virtual, NEW_FILE => $new_virtual});
- return devedit_reload({command => 'show', file => $dir});
+ copy($physical,$new_physical) or return error($config->{'errors'}->{'copy_failed'},$dir,{FILE => $virtual, NEW_FILE => $new_virtual});
+ return devedit_reload({command => 'show', file => $new_dir});
}
else
{
$tpl->read_file($config->{'templates'}->{'copyfile'});
$tpl->fillin("FILE",$virtual);
- $tpl->fillin("DIR",upper_path($virtual));
+ $tpl->fillin("DIR",$dir);
$tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
$tpl->fillin("SCRIPT",$script);
my ($data,$config) = @_;
my $physical = $data->{'physical'};
my $virtual = $data->{'virtual'};
+ my $dir = upper_path($virtual);
my $new_physical = $data->{'new_physical'};
- return error($config->{'errors'}->{'rename_root'},"/") if($virtual eq "/");
- return error($config->{'errors'}->{'no_rename'},upper_path($virtual)) unless(-w upper_path($physical));
- return error($config->{'errors'}->{'in_use'},upper_path($virtual),{FILE => $virtual}) if($data->{'uselist'}->in_use($virtual));
+ return error($config->{'errors'}->{'rename_root'},"/") if($virtual eq "/");
+ return error($config->{'errors'}->{'no_rename'},$dir) unless(-w upper_path($physical));
+ return error($config->{'errors'}->{'in_use'},$dir,{FILE => $virtual}) if($data->{'uselist'}->in_use($virtual));
if($new_physical)
{
my $new_virtual = $data->{'new_virtual'};
- my $dir = upper_path($new_virtual);
+ my $new_dir = upper_path($new_virtual);
$new_virtual = encode_entities($new_virtual);
if(-e $new_physical)
{
- return error($config->{'errors'}->{'exist_edited'},$dir,{FILE => $new_virtual}) if($data->{'uselist'}->in_use($data->{'new_virtual'}));
+ return error($config->{'errors'}->{'exist_edited'},$new_dir,{FILE => $new_virtual}) if($data->{'uselist'}->in_use($data->{'new_virtual'}));
+ return error($config->{'errors'}->{'dir_replace'},$new_dir) if(-d $new_physical);
+ return error($config->{'errors'}->{'exist_no_write'},$new_dir,{FILE => $new_virtual}) unless(-w $new_physical);
- if(-d $new_physical)
- {
- return error($config->{'errors'}->{'dir_replace'},$dir);
- }
- elsif(not $data->{'cgi'}->param('confirmed'))
+ if(not $data->{'cgi'}->param('confirmed'))
{
my $tpl = new Template;
$tpl->read_file($config->{'templates'}->{'confirm_replace'});
$tpl->fillin("FILE",$virtual);
$tpl->fillin("NEW_FILE",$new_virtual);
$tpl->fillin("NEW_FILENAME",file_name($new_virtual));
- $tpl->fillin("NEW_DIR",$dir);
- $tpl->fillin("DIR",upper_path($virtual));
+ $tpl->fillin("NEW_DIR",$new_dir);
+ $tpl->fillin("DIR",$dir);
$tpl->fillin("COMMAND","rename");
$tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
}
}
- rename($physical,$new_physical) or return error($config->{'errors'}->{'rename_failed'},upper_path($virtual),{FILE => $virtual, NEW_FILE => $new_virtual});
- return devedit_reload({command => 'show', file => $dir});
+ rename($physical,$new_physical) or return error($config->{'errors'}->{'rename_failed'},$dir,{FILE => $virtual, NEW_FILE => $new_virtual});
+ return devedit_reload({command => 'show', file => $new_dir});
}
else
{
$tpl->read_file($config->{'templates'}->{'renamefile'});
$tpl->fillin("FILE",$virtual);
- $tpl->fillin("DIR",upper_path($virtual));
+ $tpl->fillin("DIR",$dir);
$tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
$tpl->fillin("SCRIPT",$script);
my ($data,$config) = @_;
my $physical = $data->{'physical'};
my $virtual = $data->{'virtual'};
+ my $dir = upper_path($virtual);
- return error($config->{'errors'}->{'remove_root'},"/") if($virtual eq "/");
- return error($config->{'errors'}->{'no_delete'},upper_path($virtual)) unless(-w upper_path($physical));
+ return error($config->{'errors'}->{'remove_root'},"/") if($virtual eq "/");
+ return error($config->{'errors'}->{'no_delete'},$dir) unless(-w upper_path($physical));
if(-d $physical)
{
if($data->{'cgi'}->param('confirmed'))
{
rmtree($physical);
- return devedit_reload({command => 'show', file => upper_path($virtual)});
+ return devedit_reload({command => 'show', file => $dir});
}
else
{
$tpl->read_file($config->{'templates'}->{'confirm_rmdir'});
$tpl->fillin("DIR",$virtual);
- $tpl->fillin("UPPER_DIR",upper_path($virtual));
+ $tpl->fillin("UPPER_DIR",$dir);
$tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
$tpl->fillin("SCRIPT",$script);
{
# Remove a file
- return error($config->{'errors'}->{'in_use'},upper_path($virtual),{FILE => $virtual}) if($data->{'uselist'}->in_use($virtual));
+ return error($config->{'errors'}->{'in_use'},$dir,{FILE => $virtual}) if($data->{'uselist'}->in_use($virtual));
if($data->{'cgi'}->param('confirmed'))
{
- unlink($physical) or return error($config->{'errors'}->{'delete_failed'},upper_path($virtual),{FILE => $virtual});
- return devedit_reload({command => 'show', file => upper_path($virtual)});
+ unlink($physical) or return error($config->{'errors'}->{'delete_failed'},$dir,{FILE => $virtual});
+ return devedit_reload({command => 'show', file => $dir});
}
else
{
$tpl->read_file($config->{'templates'}->{'confirm_rmfile'});
$tpl->fillin("FILE",$virtual);
- $tpl->fillin("DIR",upper_path($virtual));
+ $tpl->fillin("DIR",$dir);
$tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
$tpl->fillin("SCRIPT",$script);
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)
- {
- # System supports user and groups
-
- if(-o $physical)
- {
- # We own this file
-
- if($mode || $group)
- {
- if($mode)
- {
- # Change the mode
- chmod(oct($mode),$physical);
- }
+ return error($config->{'errors'}->{'no_users'},$dir,{FILE => $virtual}) unless($users);
+ return error($config->{'errors'}->{'chprop_root'},"/") if($virtual eq "/");
+ return error($config->{'errors'}->{'not_owner'},$dir,{FILE => $virtual}) unless(-o $physical);
+ return error($config->{'errors'}->{'in_use'},$dir,{FILE => $virtual}) if($data->{'uselist'}->in_use($virtual));
- if($group)
- {
- # Change the group using the `chgrp` system command
+ my $cgi = $data->{'cgi'};
+ my $mode = $cgi->param('mode');
+ my $group = $cgi->param('group');
- return error($config->{'errors'}->{'invalid_group'},$dir,{GROUP => encode_entities($group)}) unless($group =~ /^[a-z0-9_]+[a-z0-9_-]*$/i);
- system("chgrp",$group,$physical);
- }
-
- return devedit_reload({command => 'show', file => $dir});
- }
- else
- {
- # Display the form
+ if($mode || $group)
+ {
+ if($mode)
+ {
+ # Change the mode
- my @stat = stat($physical);
+ chmod(oct($mode),$physical);
+ }
- my $mode = $stat[2];
- my $mode_oct = substr(sprintf("%04o",$mode),-4);
- my $gid = $stat[5];
+ if($group)
+ {
+ # Change the group using the `chgrp` system command
- my $tpl = new Template;
- $tpl->read_file($config->{'templates'}->{'chprop'});
+ return error($config->{'errors'}->{'invalid_group'},$dir,{GROUP => encode_entities($group)}) unless($group =~ /^[a-z0-9_]+[a-z0-9_-]*$/i);
+ system("chgrp",$group,$physical);
+ }
- # Insert file properties into the template
+ return devedit_reload({command => 'show', file => $dir});
+ }
+ else
+ {
+ # Display the form
- $tpl->fillin("MODE_OCTAL",$mode_oct);
- $tpl->fillin("MODE_STRING",mode_string($mode));
- $tpl->fillin("GID",$gid);
+ my @stat = stat($physical);
+ my $mode = $stat[2];
+ my $gid = $stat[5];
- if(my $group = getgrgid($gid))
- {
- $tpl->fillin("GROUP",encode_entities($group));
- $tpl->parse_if_block("group_detected",1);
- }
- else
- {
- $tpl->parse_if_block("group_detected",0);
- }
+ my $tpl = new Template;
+ $tpl->read_file($config->{'templates'}->{'chprop'});
- # Insert other information
+ # Insert file properties into the template
- $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;
+ $tpl->fillin("MODE_OCTAL",substr(sprintf("%04o",$mode),-4));
+ $tpl->fillin("MODE_STRING",mode_string($mode));
+ $tpl->fillin("GID",$gid);
- return \$output;
- }
+ if(my $group = getgrgid($gid))
+ {
+ $tpl->fillin("GROUP",encode_entities($group));
+ $tpl->parse_if_block("group_detected",1);
}
else
{
- return error($config->{'errors'}->{'not_owner'},$dir,{FILE => $virtual});
+ $tpl->parse_if_block("group_detected",0);
}
- }
- else
- {
- return error($config->{'errors'}->{'no_users'},$dir,{FILE => $virtual});
+
+ # Insert other information
+
+ $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;
}
}
my ($data,$config) = @_;
my $virtual = $data->{'virtual'};
my $uselist = $data->{'uselist'};
+ my $dir = upper_path($virtual);
- return devedit_reload({command => 'show', file => upper_path($virtual)}) if($uselist->unused($virtual));
+ return devedit_reload({command => 'show', file => $dir}) if($uselist->unused($virtual));
if($data->{'cgi'}->param('confirmed'))
{
file_unlock($uselist,$virtual);
- return devedit_reload({command => 'show', file => upper_path($virtual)});
+ return devedit_reload({command => 'show', file => $dir});
}
else
{
$tpl->read_file($config->{'templates'}->{'confirm_unlock'});
$tpl->fillin("FILE",$virtual);
- $tpl->fillin("DIR",upper_path($virtual));
+ $tpl->fillin("DIR",$dir);
$tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
$tpl->fillin("SCRIPT",$script);
# Perl
$tpl->fillin("PERL_PROG",encode_entities($^X));
- $tpl->fillin("PERL_VER",sprintf("%vd",$^V));
+ $tpl->fillin("PERL_VER", sprintf("%vd",$^V));
# Information about the server
$tpl->fillin("HTTPD",encode_entities($ENV{'SERVER_SOFTWARE'}));
- $tpl->fillin("OS",$^O);
- $tpl->fillin("TIME",encode_entities(strftime($config->{'timeformat'},localtime)));
+ $tpl->fillin("OS", encode_entities($^O));
+ $tpl->fillin("TIME", encode_entities(strftime($config->{'timeformat'},localtime)));
# Process information
git.p6c8.net / devedit.git / blobdiff