Changeset 1252


Ignore:
Timestamp:
05/10/10 01:17:54 (7 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/plugins/ExtendedFileManager/ExtendedFileManager.js

    r1067 r1252  
    7474  'backend_config'     : null, 
    7575  'backend_config_hash': null, 
    76   'backend_config_secret_key_location': 'Xinha:ImageManager' 
     76  'backend_config_secret_key_location': 'Xinha:ExtendedFileManager' 
    7777}; 
    7878 
  • trunk/plugins/ExtendedFileManager/config.inc.php

    r1231 r1252  
    366366    $_REQUEST['backend_config'] = stripslashes($_REQUEST['backend_config']); 
    367367  } 
    368  
     368   
     369  if($_REQUEST['backend_config_secret_key_location'] !== 'Xinha:ExtendedFileManager') 
     370  { 
     371    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');     
     372  } 
     373  else 
     374  { 
    369375  // Config specified from front end, check that it's valid 
    370376  session_start(); 
     
    391397  $IMConfig['backend_url'] .= "backend_config_hash=" . rawurlencode($_REQUEST['backend_config_hash']) . '&'; 
    392398  $IMConfig['backend_url'] .= "backend_config_secret_key_location=" . rawurlencode($_REQUEST['backend_config_secret_key_location']) . '&'; 
    393  
     399  } 
    394400} 
    395401if ($IMConfig['max_filesize_kb_link'] == "max") 
  • trunk/plugins/ImageManager/config.inc.php

    r1231 r1252  
    412412  } 
    413413   
     414  if($_REQUEST['backend_config_secret_key_location'] !== 'Xinha:ImageManager') 
     415  { 
     416    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');     
     417  } 
     418  else 
     419  { 
     420   
    414421  // Config specified from front end, check that it's valid 
    415422  session_start(); 
     
    431438  $IMConfig['backend_url'] .= "backend_config_hash=" . rawurlencode($_REQUEST['backend_config_hash']) . '&'; 
    432439  $IMConfig['backend_url'] .= "backend_config_secret_key_location=" . rawurlencode($_REQUEST['backend_config_secret_key_location']) . '&'; 
    433  
     440  } 
    434441} 
    435442 
Note: See TracChangeset for help on using the changeset viewer.