Changeset 1189

Timestamp:

12/06/08 09:31:03 (3 years ago)

Author:

CrawfordCurrie

Message:

Item5859: removed XHR headers that were banjaxing NTLM

Location:

trunk/TinyMCEPlugin

Files:

• data/System/TinyMCEPlugin.txt (modified) (1 diff)
• pub/System/TinyMCEPlugin/foswiki_tiny.js (modified) (1 diff)
• pub/System/TinyMCEPlugin/foswiki_tiny_src.js (modified) (1 diff)
• pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/jscripts/attach.js (modified) (1 diff)
• pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/jscripts/attach_src.js (modified) (1 diff)

trunk/TinyMCEPlugin/data/System/TinyMCEPlugin.txt

@@ -120 +120 @@
 |  License: | [[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]] |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
+|  06 Dec 2008 | Foswikitask:Item5859: removed XHR headers that were banjaxing NTLM |
 |  03 Dec 2008 | Re-released for the Foswiki project |
 |  03 Aug 2008 | TWiki 4.2.1 release version |

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/foswiki_tiny.js

@@ -6 +6 @@
 FoswikiTiny.request.editor=editor;FoswikiTiny.request.req.open("POST",url,true);FoswikiTiny.request.req.setRequestHeader("Content-type","application/x-www-form-urlencoded");var params="nocache="+encodeURIComponent((new Date()).getTime())
 +"&topic="+encodeURIComponent(path)
-+"&text="+encodeURIComponent(text);FoswikiTiny.request.req.setRequestHeader("Content-length",params.length);FoswikiTiny.request.req.setRequestHeader("Connection","close");FoswikiTiny.request.req.onreadystatechange=function(){if(FoswikiTiny.request.req.readyState==4){if(FoswikiTiny.request.req.status==200){onReply();}else{onFail();}}};onReadyToSend();FoswikiTiny.request.req.send(params);},initialisedFromServer:false,setUpContent:function(editor_id,body,doc){if(FoswikiTiny.initialisedFromServer)return;var editor=tinyMCE.getInstanceById(editor_id);FoswikiTiny.switchToWYSIWYG(editor);FoswikiTiny.initialisedFromServer=true;},switchToRaw:function(inst){inst.triggerSave(false,true);var text=inst.oldTargetElement.value;for(var i=0;i<FoswikiTiny.html2tml.length;i++){var cb=FoswikiTiny.html2tml[i];text=cb.apply(inst,[inst,text]);}
++"&text="+encodeURIComponent(text);FoswikiTiny.request.req.setRequestHeader("Content-length",params.length);FoswikiTiny.request.req.onreadystatechange=function(){if(FoswikiTiny.request.req.readyState==4){if(FoswikiTiny.request.req.status==200){onReply();}else{onFail();}}};onReadyToSend();FoswikiTiny.request.req.send(params);},initialisedFromServer:false,setUpContent:function(editor_id,body,doc){if(FoswikiTiny.initialisedFromServer)return;var editor=tinyMCE.getInstanceById(editor_id);FoswikiTiny.switchToWYSIWYG(editor);FoswikiTiny.initialisedFromServer=true;},switchToRaw:function(inst){inst.triggerSave(false,true);var text=inst.oldTargetElement.value;for(var i=0;i<FoswikiTiny.html2tml.length;i++){var cb=FoswikiTiny.html2tml[i];text=cb.apply(inst,[inst,text]);}
 FoswikiTiny.transform(inst,"html2tml",text,function(){FoswikiTiny.enableSave(false);var te=FoswikiTiny.request.editor.oldTargetElement;te.value="Please wait... retrieving page from server";},function(){var te=FoswikiTiny.request.editor.oldTargetElement;var text=FoswikiTiny.request.req.responseText;te.value=text;FoswikiTiny.enableSave(true);},function(){var te=FoswikiTiny.request.editor.oldTargetElement;te.value="There was a problem retrieving the page: "
 +FoswikiTiny.request.req.statusText;});var eid=inst.editorId;var id=eid+"_2WYSIWYG";var el=document.getElementById(id);if(el){el.style.display="block";}else{el=document.createElement('INPUT');el.id=id;el.type="button";el.value="WYSIWYG";el.className="foswikiButton";el.onclick=function(){tinyMCE.execCommand("mceToggleEditor",null,inst.editorId);return false;}

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/foswiki_tiny_src.js

@@ -81 +81 @@
         FoswikiTiny.request.req.setRequestHeader(
             "Content-length", params.length);
-        FoswikiTiny.request.req.setRequestHeader("Connection", "close");
+        /* Banjaxes NTLM - see http://foswiki.org/Tasks/Item5859 for analysis
+           FoswikiTiny.request.req.setRequestHeader("Connection", "close"); */
         FoswikiTiny.request.req.onreadystatechange = function() {
             // Callback for XMLHttpRequest

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/jscripts/attach.js

@@ -2 +2 @@
 function getAttachInfo(){var scripturl=FoswikiTiny.getFoswikiVar("SCRIPTURL");var suffix=FoswikiTiny.getFoswikiVar("SCRIPTSUFFIX");if(suffix==null)suffix='';var url=scripturl+"/rest"+suffix+"/WysiwygPlugin/attachments";var request=(tinyMCE.isIE)?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest();request.open("POST",url,true);request.setRequestHeader("Content-type","application/x-www-form-urlencoded");var path=FoswikiTiny.getFoswikiVar("WEB")+'.'
 +FoswikiTiny.getFoswikiVar("TOPIC");var params="nocache="+encodeURIComponent((new Date()).getTime())
-+"&topic="+encodeURIComponent(path);request.setRequestHeader("Content-length",params.length);request.setRequestHeader("Connection","close");request.onreadystatechange=function(){attachmentListCallback(request);};request.send(params);var el=document.getElementById('upload_form');el.action=scripturl+"/rest"+suffix+
++"&topic="+encodeURIComponent(path);request.setRequestHeader("Content-length",params.length);request.onreadystatechange=function(){attachmentListCallback(request);};request.send(params);var el=document.getElementById('upload_form');el.action=scripturl+"/rest"+suffix+
 "/WysiwygPlugin/upload";el=document.getElementById('upload_form_topic');el.value=path;}
 function attachmentListCallback(request){if(request.readyState==4){if(request.status==200){var atts=request.responseText;if(atts!=null){atts=eval(atts);var select=document.getElementById("attachments_select");for(var i=0;i<atts.length;i++){select.options[i]=new Option(atts[i].name,atts[i].name);}}}else{alert("There was a problem retrieving the attachments list: "

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/jscripts/attach_src.js

@@ -41 +41 @@
     
     request.setRequestHeader("Content-length", params.length);
-    request.setRequestHeader("Connection", "close");
+    /* Banjaxes NTLM - see http://foswiki.org/Tasks/Item5859 for analysis
+       request.setRequestHeader("Connection", "close"); */
     request.onreadystatechange = function() {
         attachmentListCallback(request);