knguyen 2004/10/04 19:10:14 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/views/jsp/jahia/htmleditors/activex activex_htmleditor.jsp
Log:
- absolute url cleanup with activeX issue
Revision Changes Path
1.20.2.2 +6 -4
jahia/src/views/jsp/jahia/htmleditors/activex/activex_htmleditor.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/activex/activex_htmleditor.jsp.diff?r1=1.20.2.1&r2=1.20.2.2&f=h
Index: activex_htmleditor.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/htmleditors/activex/Attic/activex_htmleditor.jsp,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -r1.20.2.1 -r1.20.2.2
--- activex_htmleditor.jsp 6 Aug 2004 18:01:17 -0000 1.20.2.1
+++ activex_htmleditor.jsp 4 Oct 2004 17:10:14 -0000 1.20.2.2
@@ -17,10 +17,12 @@
boolean isIE = (request.getHeader( "user-agent" ).toUpperCase().indexOf("MSIE")
!= -1 );
- String serverURL = "http://"; + request.getServerName() + ":"
- + request.getServerPort()
- + engineUrl
- + "&screen=edit&fid=" + theField.getID();
+ String serverURL = request.getScheme() + "://" + request.getServerName();
+ String serverPort = String.valueOf(request.getServerPort());
+ if ( !"80".equals(serverPort) && !"443".equals(serverPort) ){
+ serverURL += ":" + request.getServerPort();
+ }
+ serverURL += engineUrl + "&screen=edit&fid=" + theField.getID();
%>
