Changeset 1327 for trunk/plugins


Ignore:
Timestamp:
06/22/12 14:01:51 (7 years ago)
Author:
gogo
Message:

#1595 - suhosin caused breakage of MootoolsFileManager?, typical error session expired due to suhosin having killed the session, this works around it.

Location:
trunk/plugins/MootoolsFileManager
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/plugins/MootoolsFileManager/MootoolsFileManager.ImageManager.js

    r1324 r1327  
    4040        f_alt    : image.alt, 
    4141        f_border : image.style.borderWidth ? image.style.borderWidth : image.border, 
    42         f_align  : image.hasAttribute('align') ? image.align : null, 
     42        f_align  : Xinha.hasAttribute(image, 'align') ? image.align : null, 
    4343        f_padding: image.style.padding, 
    4444        f_margin : image.style.margin, 
    45         f_width  :  image.hasAttribute('width') ? image.width : null, 
    46         f_height  : image.hasAttribute('height') ? image.height : null, 
     45        f_width  :  Xinha.hasAttribute(image, 'width') ? image.width : null, 
     46        f_height  : Xinha.hasAttribute(image, 'height') ? image.height : null, 
    4747        f_backgroundColor: image.style.backgroundColor, 
    4848        f_borderColor: image.style.borderColor, 
  • trunk/plugins/MootoolsFileManager/MootoolsFileManager.js

    r1324 r1327  
    5656  if(typeof __MFM_USE_FLASH__ == 'undefined') 
    5757  { 
    58     __MFM_USE_FLASH__ = true; 
     58    __MFM_USE_FLASH__ = Browser.Plugins.Flash.version ? true : false; 
    5959  } 
    6060   
  • trunk/plugins/MootoolsFileManager/backend.php

    r1324 r1327  
    7575} 
    7676 
     77define('I_KNOW_ABOUT_SUHOSIN', TRUE); // /contrib/xinha-php.js does it's best to avoid this problem for us 
    7778require_once('config.php'); 
    7879 
  • trunk/plugins/MootoolsFileManager/config.php

    r1324 r1327  
    191191  $IMConfig = array_merge($IMConfig, $passed_data); 
    192192} 
    193 @session_write_close(); // Close session now so we don't lock. 
    194193 
    195194// Back Compat, Some of our config options have been renamed,  
  • trunk/plugins/MootoolsFileManager/mootools-filemanager/Assets/Connector/FileManager.php

    r1324 r1327  
    525525} 
    526526 
     527if(!defined("I_KNOW_ABOUT_SUHOSIN") && ini_get('suhosin.session.cryptua')) 
     528{ 
     529  header('HTTP/1.0 500 Developer must read https://github.com/sleemanj/mootools-filemanager/wiki/suhosin', true, 500); // Internal server error 
     530  throw Exception('suhosin.session.cryptua: https://github.com/sleemanj/mootools-filemanager/wiki/suhosin" }');   // this exception will most probably not be caught; that's our intent!   
     531  exit; 
     532} 
    527533//------------------------------------------------------------------------------------------------------------- 
    528534 
  • trunk/plugins/MootoolsFileManager/mootools-filemanager/Source/FileManager.js

    r1324 r1327  
    18051805        revert_drag_n_drop: function(el) { 
    18061806                el.fade(1).removeClass('drag').removeClass('move').setStyles({ 
    1807                         'z-index': 'auto', 
     1807                //      'z-index': 'auto', 
    18081808                        position: 'relative', 
    18091809                        width: 'auto', 
     
    18111811                        top: 0 
    18121812                }).inject(el.retrieve('parent')); 
     1813    try{ el.setStyle('z-index', 'auto'); } catch(e) { el.setStyle('z-index', ''); } // IE<8 Complains about 'auto' for z-index 
    18131814                // also dial down the opacity of the icons within this row (download, rename, delete): 
    18141815                var icons = el.getElements('img.browser-icon'); 
     
    32733274                var el = new Element('div', { 
    32743275                        'class': 'filemanager-button filemanager-' + name, 
    3275                         text: this.language[name], 
     3276                        text: this.language[name] 
    32763277                }).inject(this.menu, 'top'); 
    32773278 
     
    37833784                                // HTML5 support: see    http://diveintohtml5.org/detect.html 
    37843785                        autofocus_el.setProperty('autofocus', 'autofocus'); 
    3785       autofocus_el.focus(); 
     3786      try{autofocus_el.focus();}catch(e) { /* IE<8 Failes */ } 
    37863787                } 
    37873788                this.el.center().fade(1).get('tween').chain((function() { 
     
    39463947                } 
    39473948                else { 
    3948                         this.el.setStyles({ 
     3949                        document.id(this.el).setStyles({ // IE7 thinks this.el is no longer a mootools object, ^shrug^ 
    39493950                                width: document.getScrollWidth(), 
    39503951                                height: document.getScrollHeight() 
Note: See TracChangeset for help on using the changeset viewer.