From: pcanterino <> Date: Mon, 13 Dec 2004 15:17:44 +0000 (+0000) Subject: - exec_chprop() should have a proper coding style, but it made the routine hard X-Git-Tag: version_2_3~20 X-Git-Url: https://git.p6c8.net/devedit.git/commitdiff_plain/104b2df49b9ee7e65d6b48923ea539bf01041575 - exec_chprop() should have a proper coding style, but it made the routine hard to maintain. Thus, I changed its structure. - Don't allow to change the properties of a file in use - Don't allow to upload a file if a file with the same virtual name is currently in use --- diff --git a/modules/Command.pm b/modules/Command.pm index d62643d..0915697 100644 --- a/modules/Command.pm +++ b/modules/Command.pm @@ -6,7 +6,7 @@ package Command; # Execute Dev-Editor's commands # # Author: Patrick Canterino -# Last modified: 2004-12-10 +# Last modified: 2004-12-13 # use strict; @@ -495,6 +495,7 @@ sub exec_upload($$) my $file_phys = $physical."/".$filename; my $file_virt = $virtual.$filename; + return error($config->{'errors'}->{'in_use'},$virtual,{FILE => $file_virt}) if($data->{'uselist'}->in_use($file_virt)); return error($config->{'errors'}->{'file_exists'},$virtual,{FILE => $file_virt}) if(-e $file_phys && not $cgi->param('overwrite')); my $ascii = $cgi->param('ascii'); @@ -772,94 +773,73 @@ sub exec_chprop($$) 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 + 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($virtual ne "/") + my $cgi = $data->{'cgi'}; + my $mode = $cgi->param('mode'); + my $group = $cgi->param('group'); + + if($mode || $group) + { + if($mode) { - # Not the root directory + # Change the mode - if(-o $physical) - { - # We own this file - - if($mode || $group) - { - if($mode) - { - # Change the mode - - chmod(oct($mode),$physical); - } - - 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 $gid = $stat[5]; - - my $tpl = new Template; - $tpl->read_file($config->{'templates'}->{'chprop'}); - - # Insert file properties into the template - - $tpl->fillin("MODE_OCTAL",substr(sprintf("%04o",$mode),-4)); - $tpl->fillin("MODE_STRING",mode_string($mode)); - $tpl->fillin("GID",$gid); - - 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); - $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}); - } + chmod(oct($mode),$physical); } - else + + if($group) { - return error($config->{'errors'}->{'chprop_root'},"/"); + # 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 { - return error($config->{'errors'}->{'no_users'},$dir,{FILE => $virtual}); + # Display the form + + my @stat = stat($physical); + my $mode = $stat[2]; + my $gid = $stat[5]; + + my $tpl = new Template; + $tpl->read_file($config->{'templates'}->{'chprop'}); + + # Insert file properties into the template + + $tpl->fillin("MODE_OCTAL",substr(sprintf("%04o",$mode),-4)); + $tpl->fillin("MODE_STRING",mode_string($mode)); + $tpl->fillin("GID",$gid); + + 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); + $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual)); + $tpl->fillin("SCRIPT",$script); + + my $output = header(-type => "text/html"); + $output .= $tpl->get_template; + + return \$output; } } diff --git a/templates/dirlist_file.htm b/templates/dirlist_file.htm index 720ae17..7ee1b0c 100644 --- a/templates/dirlist_file.htm +++ b/templates/dirlist_file.htm @@ -2,5 +2,5 @@ {SIZE} {DATE} {FILE_NAME} -({IF viewable}View{ELSE}View{ENDIF} | {IF editable}Edit{ELSE}Edit{ENDIF} | Copy{IF unused}{IF dir_writeable} | Rename | Delete{ENDIF}{ENDIF}{IF in_use} | Unlock{ENDIF} |{IF users} Chmod/Chgrp |{ENDIF} View in Browser) - +({IF viewable}View{ELSE}View{ENDIF} | {IF editable}Edit{ELSE}Edit{ENDIF} | Copy{IF unused}{IF dir_writeable} | Rename | Delete{ENDIF}{ENDIF}{IF in_use} | Unlock{ENDIF} |{IF unused}{IF users} Chmod/Chgrp |{ENDIF}{ENDIF} View in Browser) + \ No newline at end of file