X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/ed91b27bf5622a0eeb0a1d7adaebaea0ab380a32..6cb088cea794fc67941b4e174fe9ed80c8a45875:/modules/Command.pm?ds=sidebyside

diff --git a/modules/Command.pm b/modules/Command.pm
index b2bbfe9..28c6777 100644
--- a/modules/Command.pm
+++ b/modules/Command.pm
@@ -6,7 +6,7 @@ package Command;
 # Execute Dev-Editor's commands
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>
-# Last modified: 2005-06-14
+# Last modified: 2005-08-01
 #
 
 use strict;
@@ -409,7 +409,9 @@ sub exec_endedit($$)
     print FILE $content;
    }
 
-   $output = devedit_reload({command => 'show', file => $dir});
+   $output = ($cgi->param('continue'))
+           ? devedit_reload({command => 'beginedit', file => $virtual})
+           : devedit_reload({command => 'show', file => $dir});
   }
 
   close(FILE);
@@ -581,7 +583,6 @@ sub exec_copy($$)
  my $new_physical   = $data->{'new_physical'};
 
  return error($config->{'errors'}->{'link_copy'},$dir) if(-l $physical);
- return error($config->{'errors'}->{'dir_copy'},$dir)  if(-d $physical);
  return error($config->{'errors'}->{'no_copy'},$dir)   unless(-r $physical);
 
  if($new_physical)
@@ -589,53 +590,84 @@ sub exec_copy($$)
   my $new_virtual = multi_string($data->{'new_virtual'});
   my $new_dir     = upper_path($new_virtual->{'normal'});
 
-  if(-e $new_physical)
+  if(-d $physical)
   {
-   return error($config->{'errors'}->{'link_replace'},$new_dir)                                    if(-l $new_physical);
-   return error($config->{'errors'}->{'dir_replace'},$new_dir)                                     if(-d $new_physical);
-   return error($config->{'errors'}->{'exist_no_write'},$new_dir,{FILE => $new_virtual->{'html'}}) unless(-w $new_physical);
+   return error($config->{'errors'}->{'no_copy'},$dir)                                      unless(-x $physical);
+   return error($config->{'errors'}->{'file_exists'},$dir,{FILE => $new_virtual->{'html'}}) if(-e $new_physical);
+   return error($config->{'errors'}->{'dir_copy_self'},$dir)                                if(index($new_virtual->{'normal'},$virtual) == 0);
 
-   if(not $data->{'cgi'}->param('confirmed'))
+   dir_copy($physical,$new_physical) or return error($config->{'errors'}->{'copy_failed'},$dir,{FILE => encode_html($virtual), NEW_FILE => $new_virtual->{'html'}});
+   return devedit_reload({command => 'show', file => $new_dir});
+  }
+  else
+  {
+   if(-e $new_physical)
    {
-    my $tpl = new Template;
-    $tpl->read_file($config->{'templates'}->{'confirm_replace'});
-
-    $tpl->fillin('FILE',encode_html($virtual));
-    $tpl->fillin('NEW_FILE',$new_virtual->{'html'});
-    $tpl->fillin('NEW_FILENAME',file_name($new_virtual->{'html'}));
-    $tpl->fillin('NEW_DIR',encode_html($new_dir));
-    $tpl->fillin('DIR',encode_html($dir));
-    $tpl->fillin('DIR_URL',escape($dir));
-
-    $tpl->fillin('COMMAND','copy');
-    $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
-    $tpl->fillin('SCRIPT',$script);
-
-    my $output = header(-type => 'text/html');
-    $output   .= $tpl->get_template;
-
-    return \$output;
+    return error($config->{'errors'}->{'link_replace'},$new_dir)                                    if(-l $new_physical);
+    return error($config->{'errors'}->{'dir_replace'},$new_dir)                                     if(-d $new_physical);
+    return error($config->{'errors'}->{'exist_no_write'},$new_dir,{FILE => $new_virtual->{'html'}}) unless(-w $new_physical);
+
+    if(not $data->{'cgi'}->param('confirmed'))
+    {
+     my $tpl = new Template;
+     $tpl->read_file($config->{'templates'}->{'confirm_replace'});
+
+     $tpl->fillin('FILE',encode_html($virtual));
+     $tpl->fillin('NEW_FILE',$new_virtual->{'html'});
+     $tpl->fillin('NEW_FILENAME',file_name($new_virtual->{'html'}));
+     $tpl->fillin('NEW_DIR',encode_html($new_dir));
+     $tpl->fillin('DIR',encode_html($dir));
+     $tpl->fillin('DIR_URL',escape($dir));
+
+     $tpl->fillin('COMMAND','copy');
+     $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
+     $tpl->fillin('SCRIPT',$script);
+
+     my $output = header(-type => 'text/html');
+     $output   .= $tpl->get_template;
+
+     return \$output;
+    }
    }
-  }
 
-  copy($physical,$new_physical) or return error($config->{'errors'}->{'copy_failed'},$dir,{FILE => encode_html($virtual), NEW_FILE => $new_virtual->{'html'}});
-  return devedit_reload({command => 'show', file => $new_dir});
+   copy($physical,$new_physical) or return error($config->{'errors'}->{'copy_failed'},$dir,{FILE => encode_html($virtual), NEW_FILE => $new_virtual->{'html'}});
+   return devedit_reload({command => 'show', file => $new_dir});
+  }
  }
  else
  {
-  my $tpl = new Template;
-  $tpl->read_file($config->{'templates'}->{'copyfile'});
+  if(-d $physical)
+  {
+   my $tpl = new Template;
+   $tpl->read_file($config->{'templates'}->{'copydir'});
 
-  $tpl->fillin('FILE',encode_html($virtual));
-  $tpl->fillin('DIR',encode_html($dir));
-  $tpl->fillin('DIR_URL',escape($dir));
-  $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
-  $tpl->fillin('SCRIPT',$script);
+   $tpl->fillin('FILE',encode_html($virtual));
+   $tpl->fillin('DIR',encode_html($dir));
+   $tpl->fillin('DIR_URL',escape($dir));
+   $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
+   $tpl->fillin('SCRIPT',$script);
 
-  my $output = header(-type => 'text/html');
-  $output   .= $tpl->get_template;
+   my $output = header(-type => 'text/html');
+   $output   .= $tpl->get_template;
 
-  return \$output;
+   return \$output;
+  }
+  else
+  {
+   my $tpl = new Template;
+   $tpl->read_file($config->{'templates'}->{'copyfile'});
+
+   $tpl->fillin('FILE',encode_html($virtual));
+   $tpl->fillin('DIR',encode_html($dir));
+   $tpl->fillin('DIR_URL',escape($dir));
+   $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
+   $tpl->fillin('SCRIPT',$script);
+
+   my $output = header(-type => 'text/html');
+   $output   .= $tpl->get_template;
+
+   return \$output;
+  }
  }
 }
 
@@ -934,7 +966,7 @@ sub exec_about($$)
 
   $tpl->parse_if_block('users',1);
 
-  # ID's of user and group
+  # IDs of user and group
 
   $tpl->fillin('UID',$uid);
   $tpl->fillin('GID',$gid);