#
# Execute Dev-Editor's commands
#
-# Author: Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2004-09-05
+# Author: Patrick Canterino <patrick@patshaping.de>
+# Last modified: 2004-11-29
#
use strict;
my ($data,$config) = @_;
my $physical = $data->{'physical'};
my $virtual = $data->{'virtual'};
+ my $upper_path = upper_path($virtual);
my $uselist = $data->{'uselist'};
my $tpl = new Template;
{
# Create directory listing
+ return error($config->{'errors'}->{'no_dir_access'},$upper_path) unless(-r $physical && -x $physical);
+
my $direntries = dir_read($physical);
- return error($config->{'dir_read_failed'},upper_path($virtual),{DIR => '$virtual'}) unless($direntries);
+ return error($config->{'dir_read_fail'},$upper_path,{DIR => $virtual}) unless($direntries);
my $files = $direntries->{'files'};
my $dirs = $direntries->{'dirs'};
+ my $dir_writeable = -w $physical;
+
my $dirlist = "";
# Create the link to the upper directory
my $udtpl = new Template;
$udtpl->read_file($config->{'templates'}->{'dirlist_up'});
- $udtpl->fillin("UPPER_DIR",encode_entities(upper_path($virtual)));
- $udtpl->fillin("DATE",strftime($config->{'timeformat'},localtime($stat[9])));
+ $udtpl->fillin("UPPER_DIR",encode_entities($upper_path));
+ $udtpl->fillin("DATE",encode_entities(strftime($config->{'timeformat'},localtime($stat[9]))));
$dirlist .= $udtpl->get_template;
}
foreach my $dir(@$dirs)
{
- my @stat = stat($physical."/".$dir);
+ my $phys_path = $physical."/".$dir;
my $virt_path = encode_entities($virtual.$dir."/");
+ my @stat = stat($phys_path);
+
my $dtpl = new Template;
$dtpl->read_file($config->{'templates'}->{'dirlist_dir'});
$dtpl->fillin("DIR",$virt_path);
$dtpl->fillin("DIR_NAME",$dir);
- $dtpl->fillin("DATE",strftime($config->{'timeformat'},localtime($stat[9])));
+ $dtpl->fillin("DATE",encode_entities(strftime($config->{'timeformat'},localtime($stat[9]))));
$dtpl->fillin("URL",equal_url($config->{'httproot'},$virt_path));
- $dtpl->parse_if_block("users",$users && -o $physical."/".$dir);
+ $dtpl->parse_if_block("readable",-r $phys_path && -x $phys_path);
+ $dtpl->parse_if_block("users",$users && -o $phys_path);
$dirlist .= $dtpl->get_template;
}
my @stat = stat($phys_path);
my $in_use = $uselist->in_use($virtual.$file);
+ my $too_large = $config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'};
my $ftpl = new Template;
$ftpl->read_file($config->{'templates'}->{'dirlist_file'});
$ftpl->fillin("FILE",$virt_path);
$ftpl->fillin("FILE_NAME",$file);
$ftpl->fillin("SIZE",$stat[7]);
- $ftpl->fillin("DATE",strftime($config->{'timeformat'},localtime($stat[9])));
+ $ftpl->fillin("DATE",encode_entities(strftime($config->{'timeformat'},localtime($stat[9]))));
$ftpl->fillin("URL",equal_url($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 ($config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'}));
-
- $ftpl->parse_if_block("editable",-r $phys_path && -w $phys_path && -T $phys_path && not ($config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'}) && not $in_use);
+ $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("in_use",$in_use);
$ftpl->parse_if_block("unused",not $in_use);
$tpl->fillin("DIR",$virtual);
$tpl->fillin("SCRIPT",$script);
$tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+
+ $tpl->parse_if_block("dir_writeable",$dir_writeable);
}
else
{
# View a file
- return error($config->{'errors'}->{'noview'},upper_path($virtual)) unless(-r $physical);
+ 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
{
# Binary file
- return error($config->{'errors'}->{'binary'},upper_path($virtual));
+ return error($config->{'errors'}->{'binary'},$upper_path);
}
else
{
# Text file
- my $size = (stat($physical))[7];
-
- if($config->{'max_file_size'} && $size > $config->{'max_file_size'})
+ if($config->{'max_file_size'} && -s $physical > $config->{'max_file_size'})
{
- return error($config->{'errors'}->{'file_too_large'},upper_path($virtual),{SIZE => $config->{'max_file_size'}})
+ return error($config->{'errors'}->{'file_too_large'},$upper_path,{SIZE => $config->{'max_file_size'}})
}
else
{
$tpl->read_file($config->{'templates'}->{'viewfile'});
$tpl->fillin("FILE",$virtual);
- $tpl->fillin("DIR",upper_path($virtual));
+ $tpl->fillin("DIR",$upper_path);
$tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
$tpl->fillin("SCRIPT",$script);
- $tpl->fillin("CONTENT",encode_entities($$content));
- $tpl->parse_if_block("editable",-r $physical && -w $physical && -T $physical && not ($config->{'max_file_size'} && $size > $config->{'max_file_size'}) && $uselist->unused($virtual));
+ $tpl->parse_if_block("editable",-w $physical && $uselist->unused($virtual));
+
+ $tpl->fillin("CONTENT",encode_entities($$content));
}
}
}
my ($data,$config) = @_;
my $physical = $data->{'physical'};
my $virtual = $data->{'virtual'};
+ my $dir = upper_path($virtual);
my $uselist = $data->{'uselist'};
- return error($config->{'errors'}->{'editdir'},upper_path($virtual)) if(-d $physical);
- return error($config->{'errors'}->{'in_use'},upper_path($virtual),{FILE => $virtual}) if($uselist->in_use($virtual));
- return error($config->{'errors'}->{'noedit'},upper_path($virtual)) unless(-r $physical && -w $physical);
+ return error($config->{'errors'}->{'editdir'},$dir) if(-d $physical);
+ return error($config->{'errors'}->{'in_use'}, $dir,{FILE => $virtual}) if($uselist->in_use($virtual));
+ return error($config->{'errors'}->{'no_edit'},$dir) unless(-r $physical && -w $physical);
# Check on binary files
{
# Binary file
- return error($config->{'errors'}->{'binary'},upper_path($virtual));
+ return error($config->{'errors'}->{'binary'},$dir);
}
else
{
- if($config->{'max_file_size'} && (stat($physical))[7] > $config->{'max_file_size'})
+ if($config->{'max_file_size'} && -s $physical > $config->{'max_file_size'})
{
- return error($config->{'errors'}->{'file_too_large'},upper_path($virtual),{SIZE => $config->{'max_file_size'}})
+ return error($config->{'errors'}->{'file_too_large'},$dir,{SIZE => $config->{'max_file_size'}})
}
else
- {
+ {
# Text file
$uselist->add_file($virtual);
$tpl->read_file($config->{'templates'}->{'editfile'});
$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);
$tpl->fillin("CONTENT",encode_entities($$content));
my ($data,$config) = @_;
my $physical = $data->{'physical'};
my $virtual = $data->{'virtual'};
+ my $dir = upper_path($virtual);
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.
+
+ file_unlock($uselist,$virtual);
+
# Normalize newlines
$content =~ s/\015\012|\012|\015/\n/g;
$content = encode_entities($content,"\200-\377");
}
- if($data->{'cgi'}->param('saveas'))
+ if($data->{'cgi'}->param('saveas') && $data->{'new_physical'} ne '' && $data->{'new_virtual'} ne '')
{
# Create the new filename
# Check if someone else is editing the new file
- return error($config->{'errors'}->{'in_use'},upper_path($virtual),{FILE => $virtual}) if($uselist->in_use($virtual));
+ return error($config->{'errors'}->{'in_use'},$dir,{FILE => $virtual}) if($uselist->in_use($virtual));
}
- return error($config->{'errors'}->{'editdir'},upper_path($virtual)) if(-d $physical);
- return error($config->{'errors'}->{'noedit'}, upper_path($virtual)) unless(-r $physical && -w $physical);
+ return error($config->{'errors'}->{'editdir'},$dir) if(-d $physical);
+ return error($config->{'errors'}->{'no_edit'},$dir) if(-e $physical && !(-r $physical && -w $physical));
+ return error($config->{'errors'}->{'text_to_binary'},$dir) unless(-T $physical);
if(file_save($physical,\$content))
{
# Saving of the file was successful - so unlock it!
- file_unlock($uselist,$data->{'virtual'});
- # ^^^^^^^^^^^^^^^^^^
- # Maybe the user saved the file using another filename...
- # But we have to unlock the original file!
-
- return devedit_reload({command => 'show', file => upper_path($virtual)});
+ return devedit_reload({command => 'show', file => $dir});
}
else
{
- return error($config->{'errors'}->{'edit_failed'},upper_path($virtual),{FILE => $virtual});
+ return error($config->{'errors'}->{'edit_failed'},$dir,{FILE => $virtual});
}
}
my $virtual = $data->{'virtual'};
my $cgi = $data->{'cgi'};
+ return error($config->{'errors'}->{'no_directory'},upper_path($virtual),{FILE => $virtual}) unless(-d $physical);
+ return error($config->{'errors'}->{'dir_no_create'},$virtual,{DIR => $virtual}) unless(-w $physical);
+
if(my $uploaded_file = $cgi->param('uploaded_file'))
{
# Process file upload
my $filename = file_name($uploaded_file);
my $file_phys = $physical."/".$filename;
- my $file_virt = $virtual."".$filename;
+ my $file_virt = $virtual.$filename;
return error($config->{'errors'}->{'file_exists'},$virtual,{FILE => $file_virt}) if(-e $file_phys && not $cgi->param('overwrite'));
local *FILE;
- open(FILE,">$file_phys") or return error($config->{'errors'}->{'mkfile_failed'},$virtual,{FILE => $file_virt});
+ 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
my $virtual = encode_entities($data->{'virtual'});
my $new_physical = $data->{'new_physical'};
- return error($config->{'errors'}->{'dircopy'}) if(-d $physical);
- return error($config->{'errors'}->{'nocopy'}) unless(-r $physical);
+ return error($config->{'errors'}->{'dircopy'},upper_path($virtual)) if(-d $physical);
+ return error($config->{'errors'}->{'no_copy'},upper_path($virtual)) unless(-r $physical);
if($new_physical)
{
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));
if($new_physical)
my $physical = $data->{'physical'};
my $virtual = $data->{'virtual'};
- return error($config->{'errors'}->{'remove_root'},"/") if($virtual eq "/");
+ return error($config->{'errors'}->{'remove_root'},"/") if($virtual eq "/");
+ return error($config->{'errors'}->{'no_delete'},upper_path($virtual)) unless(-w upper_path($physical));
if(-d $physical)
{
if($users)
{
+ # System supports user and groups
+
if(-o $physical)
{
+ # We own this file
+
if($mode || $group)
{
if($mode)
{
- my $oct_mode = $mode;
- $oct_mode = "0".$oct_mode if(length($oct_mode) == 3);
- $oct_mode = oct($oct_mode);
+ # Change the mode
- chmod($oct_mode,$physical);
+ chmod(oct($mode),$physical);
}
- chgrp($group,$physical) if($group);
+ if($group)
+ {
+ # Change the group using the `chgrp` system command
+
+ 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
+
my @stat = stat($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'});
+ # Insert file properties into the template
+
$tpl->fillin("MODE_OCTAL",$mode_oct);
$tpl->fillin("MODE_STRING",mode_string($mode));
$tpl->fillin("GID",$gid);
- $tpl->fillin("GROUP",$group);
+
+ 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);
+ }
+
+ # Insert other information
$tpl->fillin("FILE",$virtual);
$tpl->fillin("DIR",$dir);
{
my ($data,$config) = @_;
my $virtual = $data->{'virtual'};
+ my $uselist = $data->{'uselist'};
+
+ return devedit_reload({command => 'show', file => upper_path($virtual)}) if($uselist->unused($virtual));
if($data->{'cgi'}->param('confirmed'))
{
- file_unlock($data->{'uselist'},$virtual);
+ file_unlock($uselist,$virtual);
return devedit_reload({command => 'show', file => upper_path($virtual)});
}
else
# 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'});
+ $tpl->fillin("SCRIPT_PHYS",encode_entities($ENV{'SCRIPT_FILENAME'}));
+ $tpl->fillin("CONFIG_PATH",encode_entities($data->{'configfile'}));
+ $tpl->fillin("FILE_ROOT", encode_entities($config->{'fileroot'}));
+ $tpl->fillin("HTTP_ROOT", encode_entities($config->{'httproot'}));
# Perl
- $tpl->fillin("PERL_PROG",$^X);
+ $tpl->fillin("PERL_PROG",encode_entities($^X));
$tpl->fillin("PERL_VER",sprintf("%vd",$^V));
# Information about the server
- $tpl->fillin("HTTPD",$ENV{'SERVER_SOFTWARE'});
+ $tpl->fillin("HTTPD",encode_entities($ENV{'SERVER_SOFTWARE'}));
$tpl->fillin("OS",$^O);
- $tpl->fillin("TIME",strftime($config->{'timeformat'},localtime));
+ $tpl->fillin("TIME",encode_entities(strftime($config->{'timeformat'},localtime)));
# Process information
# Dev-Editor is running on a system which allows users and groups
# So we display the user and the group of our process
+ my $uid = POSIX::getuid;
+ my $gid = POSIX::getgid;
+
$tpl->parse_if_block("users",1);
# ID's of user and group
- $tpl->fillin("UID",$<);
- $tpl->fillin("GID",$();
+ $tpl->fillin("UID",$uid);
+ $tpl->fillin("GID",$gid);
# Names of user and group
- $tpl->fillin("USER",getpwuid($<));
- $tpl->fillin("GROUP",getgrgid($());
+ if(my $user = getpwuid($uid))
+ {
+ $tpl->fillin("USER",encode_entities($user));
+ $tpl->parse_if_block("user_detected",1);
+ }
+ else
+ {
+ $tpl->parse_if_block("user_detected",0);
+ }
+
+ 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);
+ }
+
+ # Process umask
+
+ $tpl->fillin("UMASK",sprintf("%04o",umask));
}
else
{
git.p6c8.net / devedit.git / blobdiff