Changeset 1252 for trunk

Timestamp:

05/09/10 20:17:54 (2 years ago)

Author:

gogo

Message:

ticket:1518

Issue an error and ignore the special backend configuration when the key location is non default, for both the ImageManager and ExtendedFileManager deprecated config passing methods.

Location:

trunk/plugins

Files:

• ExtendedFileManager/ExtendedFileManager.js (modified) (1 diff)
• ExtendedFileManager/config.inc.php (modified) (2 diffs)
• ImageManager/config.inc.php (modified) (2 diffs)

trunk/plugins/ExtendedFileManager/ExtendedFileManager.js

@@ -74 +74 @@
   'backend_config'     : null,
   'backend_config_hash': null,
-  'backend_config_secret_key_location': 'Xinha:ImageManager'
+  'backend_config_secret_key_location': 'Xinha:ExtendedFileManager'
 };
 

trunk/plugins/ExtendedFileManager/config.inc.php

@@ -366 +366 @@
     $_REQUEST['backend_config'] = stripslashes($_REQUEST['backend_config']);
   }
-
+  
+  if($_REQUEST['backend_config_secret_key_location'] !== 'Xinha:ExtendedFileManager')
+  {
+    trigger_error(E_USER_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');    
+  }
+  else
+  {
   // Config specified from front end, check that it's valid
   session_start();
@@ -391 +397 @@
   $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")

trunk/plugins/ImageManager/config.inc.php

@@ -412 +412 @@
   }
   
+  if($_REQUEST['backend_config_secret_key_location'] !== 'Xinha:ImageManager')
+  {
+    trigger_error(E_USER_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/ImageManager/config.php and change the default key location from "Xinha:ImageManager" to your desired non default.  See: http://trac.xinha.org/ticket/1518');    
+  }
+  else
+  {
+  
   // Config specified from front end, check that it's valid
   session_start();
@@ -431 +438 @@
   $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']) . '&';
-
+  }
 }