Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/ExtendedFileManager/config.inc.php
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/ExtendedFileManager/config.inc.php,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/ExtendedFileManager/config.inc.php	16 Jan 2009 09:05:47 -0000	1.4
+++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/ExtendedFileManager/config.inc.php	23 May 2010 11:58:33 -0000	1.5
@@ -147,6 +147,15 @@
 $IMConfig['thumbnail_dir'] = 't';
 
 /**
+ * Resize files, or not.  If the dimensions for an image are changed
+ * this will control if the image is actually resized.  
+ *
+ * Usually you want this true, unless you are very disk space concious.
+ */
+ 
+$IMConfig['resize_files'] = true;
+
+/**
 * Resized prefix
 *
 * The prefix for resized files, something like .resized will do.  The
@@ -216,6 +225,16 @@
 /*
   Possible values: true, false
 
+ TRUE -  Allow the user to delete files and folders.
+
+ FALSE - No delete icon will be displayed.
+
+*/
+$IMConfig['allow_delete'] = true;
+
+/*
+  Possible values: true, false
+
   TRUE - Display color pickers for image background / border colors
 
   FALSE - Don't display color pickers
@@ -346,7 +365,13 @@
   if(get_magic_quotes_gpc()) {
     $_REQUEST['backend_config'] = stripslashes($_REQUEST['backend_config']);
   }
-
+  
+  if($_REQUEST['backend_config_secret_key_location'] !== 'Xinha:ExtendedFileManager')
+  {
+    trigger_error('Programming Error - please contact the website administrator/programmer to alert them to this problem. A non-default backend key location is being used to pass backend data to Xinha, but the same key location is not being used to receive data.  The special backend configuration has been ignored.  To resolve this, you should edit plugins/ExtendedFileManager/config.php and change the default key location from "Xinha:ExtendedFileManager" to your desired non default.  See: http://trac.xinha.org/ticket/1518', E_USER_ERROR);    
+  }
+  else
+  {
   // Config specified from front end, check that it's valid
   session_start();
   if (!array_key_exists($_REQUEST['backend_config_secret_key_location'], $_SESSION))
@@ -371,7 +396,7 @@
   $IMConfig['backend_url'] .= "backend_config=" . rawurlencode($_REQUEST['backend_config']) . '&';
   $IMConfig['backend_url'] .= "backend_config_hash=" . rawurlencode($_REQUEST['backend_config_hash']) . '&';
   $IMConfig['backend_url'] .= "backend_config_secret_key_location=" . rawurlencode($_REQUEST['backend_config_secret_key_location']) . '&';
-
+  }
 }
 if ($IMConfig['max_filesize_kb_link'] == "max")
 {