Added description for "hide_dot_files" in README

[devedit.git] / modules / Command.pm

diff --git a/modules/Command.pm b/modules/Command.pm
index 2905545490d5458f307697871485ceefb89e12fd..f14a038ac1f76578b43f8bae3a1c99ebab04b488 100644 (file)
--- a/modules/Command.pm
+++ b/modules/Command.pm
@@ -6,7 +6,15 @@ package Command;
 # Execute Dev-Editor's commands
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>
 # Execute Dev-Editor's commands
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>

-# Last modified: 2009-03-30
+# Last modified: 2009-05-09
+#
+# Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann
+# Copyright (C) 2003-2009 Patrick Canterino
+# All Rights Reserved.
+#
+# This file can be distributed and/or modified under the terms of
+# of the Artistic License 1.0 (see also the LICENSE file found at
+# the top level of the Dev-Editor distribution).

 #
 
 use strict;
 #
 
 use strict;


@@ -31,17 +39,18 @@ use Template;
 my $script = encode_html($ENV{'SCRIPT_NAME'});
 my $users  = eval('getpwuid(0)') && eval('getgrgid(0)');
 
 my $script = encode_html($ENV{'SCRIPT_NAME'});
 my $users  = eval('getpwuid(0)') && eval('getgrgid(0)');
 

-my %dispatch = ('show'      => \&exec_show,
-                'beginedit' => \&exec_beginedit,
-                'endedit'   => \&exec_endedit,
-                'mkdir'     => \&exec_mkdir,
-                'mkfile'    => \&exec_mkfile,
-                'upload'    => \&exec_upload,
-                'copy'      => \&exec_copy,
-                'rename'    => \&exec_rename,
-                'remove'    => \&exec_remove,
-                'chprop'    => \&exec_chprop,
-                'about'     => \&exec_about
+my %dispatch = ('show'         => \&exec_show,
+                'beginedit'    => \&exec_beginedit,
+                'endedit'      => \&exec_endedit,
+                'mkdir'        => \&exec_mkdir,
+                'mkfile'       => \&exec_mkfile,
+                'upload'       => \&exec_upload,
+                'copy'         => \&exec_copy,
+                'rename'       => \&exec_rename,
+                'remove'       => \&exec_remove,
+                'remove_multi' => \&exec_remove_multi,
+                'chprop'       => \&exec_chprop,
+                'about'        => \&exec_about

                );
 
 ### Export ###
                );
 
 ### Export ###


@@ -108,6 +117,8 @@ sub exec_show($$)
 
   my $dirlist = '';
 
 
   my $dirlist = '';
 

+  my $count = 0;
+

   my $filter1 = $data->{'cgi'}->param('filter') || '*';        # The real wildcard
   my $filter2 = ($filter1 && $filter1 ne '*') ? $filter1 : ''; # Wildcard for output
 
   my $filter1 = $data->{'cgi'}->param('filter') || '*';        # The real wildcard
   my $filter2 = ($filter1 && $filter1 ne '*') ? $filter1 : ''; # Wildcard for output
 


@@ -116,6 +127,8 @@ sub exec_show($$)
 
   unless($virtual eq '/')
   {
 
   unless($virtual eq '/')
   {

+   $count++;
+

    my @stat  = stat($physical.'/..');
 
    my $udtpl = new Template;
    my @stat  = stat($physical.'/..');
 
    my $udtpl = new Template;


@@ -132,8 +145,11 @@ sub exec_show($$)
 
   foreach my $dir(@$dirs)
   {
 
   foreach my $dir(@$dirs)
   {

+   next if($config->{'hide_dot_files'} && substr($dir,0,1) eq '.');

    next unless(dos_wildcard_match($filter1,$dir));
 
    next unless(dos_wildcard_match($filter1,$dir));
 

+   $count++;
+

    my $phys_path = $physical.'/'.$dir;
    my $virt_path = multi_string($virtual.$dir.'/');
 
    my $phys_path = $physical.'/'.$dir;
    my $virt_path = multi_string($virtual.$dir.'/');
 


@@ -151,6 +167,7 @@ sub exec_show($$)
    $dtpl->parse_if_block('forbidden',is_forbidden_file($config->{'forbidden'},$virt_path->{'normal'}));
    $dtpl->parse_if_block('readable',-r $phys_path && -x $phys_path);
    $dtpl->parse_if_block('users',$users && -o $phys_path);
    $dtpl->parse_if_block('forbidden',is_forbidden_file($config->{'forbidden'},$virt_path->{'normal'}));
    $dtpl->parse_if_block('readable',-r $phys_path && -x $phys_path);
    $dtpl->parse_if_block('users',$users && -o $phys_path);

+   $dtpl->parse_if_block('even',($count % 2) == 0);

 
    $dirlist .= $dtpl->get_template;
   }
 
    $dirlist .= $dtpl->get_template;
   }


@@ -159,8 +176,11 @@ sub exec_show($$)
 
   foreach my $file(@$files)
   {
 
   foreach my $file(@$files)
   {

+   next if($config->{'hide_dot_files'} && substr($file,0,1) eq '.');

    next unless(dos_wildcard_match($filter1,$file));
 
    next unless(dos_wildcard_match($filter1,$file));
 

+   $count++;
+

    my $phys_path = $physical.'/'.$file;
    my $virt_path = multi_string($virtual.$file);
 
    my $phys_path = $physical.'/'.$file;
    my $virt_path = multi_string($virtual.$file);
 


@@ -191,6 +211,8 @@ sub exec_show($$)
 
    $ftpl->parse_if_block('users',$users && -o $phys_path);
 
 
    $ftpl->parse_if_block('users',$users && -o $phys_path);
 

+   $ftpl->parse_if_block('even',($count % 2) == 0);
+

    $dirlist .= $ftpl->get_template;
   }
 
    $dirlist .= $ftpl->get_template;
   }
 


@@ -827,6 +849,168 @@ sub exec_remove($$)
  }
 }
 
  }
 }
 

+# exec_remove_multi()
+#
+# Remove a file or a directory and return to directory view
+#
+# Params: 1. Reference to user input hash
+#         2. Reference to config hash
+#
+# Return: Output of the command (Scalar Reference)
+
+sub exec_remove_multi($$)
+{
+ my ($data,$config) = @_;
+ my $physical       = $data->{'physical'};
+ my $virtual        = $data->{'virtual'};
+ my $cgi            = $data->{'cgi'};
+
+ my @files = $cgi->param('files');#
+ my @new_files;
+
+ if(@files)
+ {
+  foreach my $file(@files)
+  {
+   # Filter out some "bad" files (e.g. files going up in the
+   # directory hierarchy or files containing slashes (it's too
+   # dangerous...)
+
+   next if($file =~ m!^\.+$!);
+   next if($file =~ m!/!);
+   next if($file =~ m!\\!);
+
+   push(@new_files,$file);
+  }
+ }
+
+ if(@new_files)
+ {
+  if($cgi->param('confirmed'))
+  {
+   my @success;
+   my @failed;
+
+   foreach my $file(@new_files)
+   {
+    my $file_path = clean_path($physical.'/'.$file);
+
+    if(-e $file_path)
+    {
+     if(-d $file_path && not -l $file_path)
+     {
+      # Remove a directory
+
+      if(rmtree($file_path))
+      {
+       push(@success,clean_path($file));
+      }
+      else
+      {
+       push(@failed,clean_path($file));
+      }
+     }
+     else
+     {
+      # Remove a file
+
+      if(unlink($file_path))
+      {
+       push(@success,clean_path($file));
+      }
+      else
+      {
+       push(@failed,clean_path($file));
+      }
+     }
+    }
+    else
+    {
+     push(@failed,clean_path($file));
+    }
+   }
+
+   my $tpl = new Template;
+   $tpl->read_file($config->{'templates'}->{'rmmulti'});
+
+   if(scalar(@success) > 0)
+   {
+    if(scalar(@success) == scalar(@new_files) && scalar(@failed) == 0)
+    {
+     return devedit_reload({command => 'show', file => $virtual});
+    }
+    else
+    {
+     $tpl->parse_if_block('success',1);
+
+     foreach my $file_success(@success)
+     {
+      $tpl->add_loop_data('SUCCESS',{FILE => encode_html($file_success),
+                                     FILE_PATH => encode_html(clean_path($virtual.'/'.$file_success))});
+     }
+    }
+   }
+   else
+   {
+    $tpl->parse_if_block('success',0);
+   }
+
+   if(scalar(@failed) > 0)
+   {
+    $tpl->parse_if_block('failed',1);
+ 
+    foreach my $file_failed(@failed)
+    {
+     $tpl->add_loop_data('FAILED',{FILE => encode_html($file_failed),
+                                   FILE_PATH => encode_html(clean_path($virtual.'/'.$file_failed))});
+    }
+   }
+   else
+   {
+    $tpl->parse_if_block('failed',0);
+   }
+
+
+   $tpl->set_var('DIR',encode_html($virtual));
+   $tpl->set_var('SCRIPT',$script);
+
+   $tpl->parse;
+
+   my $output = header(-type => 'text/html');
+   $output   .= $tpl->get_template;
+
+   return \$output;
+  }
+  else
+  {
+   my $tpl = new Template;
+   $tpl->read_file($config->{'templates'}->{'confirm_rmmulti'});
+
+   foreach my $file(@new_files)
+   {
+    $tpl->add_loop_data('FILES',{FILE => encode_html($file),
+                                 FILE_PATH => encode_html(clean_path($virtual.'/'.$file))});
+   }
+
+   $tpl->set_var('COUNT',scalar(@new_files));
+
+   $tpl->set_var('DIR',encode_html($virtual));
+   $tpl->set_var('SCRIPT',$script);
+
+   $tpl->parse;
+
+   my $output = header(-type => 'text/html');
+   $output   .= $tpl->get_template;
+
+   return \$output;
+  }
+ }
+ else
+ {
+  return devedit_reload({command => 'show', file => $virtual});
+ }
+}
+

 # exec_chprop()
 #
 # Change the mode and the group of a file or a directory
 # exec_chprop()
 #
 # Change the mode and the group of a file or a directory