X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/6a0432ae8e83df713006409cf8ba6b673ad074e5..4420382fd54774603ff1d4b23bf321280051a1ce:/modules/Command.pm diff --git a/modules/Command.pm b/modules/Command.pm index cd3f6fb..b9467a5 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: 2005-02-12 +# Last modified: 2005-04-22 # use strict; @@ -103,7 +103,7 @@ sub exec_show($$) 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 => encode_entities($virtual)}) unless($direntries); + return error($config->{'errors'}->{'dir_read_fail'},$upper_path,{DIR => encode_entities($virtual)}) unless($direntries); my $files = $direntries->{'files'}; my $dirs = $direntries->{'dirs'}; @@ -207,6 +207,7 @@ sub exec_show($$) $tpl->fillin('FILTER',encode_entities($filter2)); $tpl->fillin('FILTER_URL',escape($filter2)); + $tpl->parse_if_block('empty',$dirlist eq ''); $tpl->parse_if_block('dir_writeable',$dir_writeable); $tpl->parse_if_block('filter',$filter2); $tpl->parse_if_block('gmt',$config->{'use_gmt'}); @@ -391,7 +392,7 @@ sub exec_endedit($$) return error($config->{'errors'}->{'link_edit'},$dir) if(-l $physical); return error($config->{'errors'}->{'dir_edit'},$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); + return error($config->{'errors'}->{'text_to_binary'},$dir) if(-e $physical && not -T $physical); if(file_save($physical,\$content)) { @@ -680,7 +681,7 @@ sub exec_rename($$) } } - rename($physical,$new_physical) or return error($config->{'errors'}->{'rename_failed'},$dir,{FILE => $virtual, NEW_FILE => $new_virtual}); + move($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