Revision: 2518
Author: seba.wagner
Date: Mon Oct 26 07:54:30 2009
Log: Fix some issue with the URL to connect to if port is 80
http://code.google.com/p/openmeetings/source/detail?r=2518
Modified:
/trunk/singlewebapp/WebContent/openmeetings/base/mainMethods.lzx
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/base/mainMethods.lzx Mon
Oct 26 07:32:47 2009
+++ /trunk/singlewebapp/WebContent/openmeetings/base/mainMethods.lzx Mon
Oct 26 07:54:30 2009
@@ -112,19 +112,26 @@
mainBaseText.setAttribute('text',canvas.currentappname);
mainBaseText.setShadow();
mainBaseTextLabel.setAttribute('text',canvas.currentappnameurl);
-
-
- var doubleSlash = _url.indexOf("//");
- var isNotPort80 = _url.indexOf(":", doubleSlash+2);
- //Debug.write("isNotPort80: ",isNotPort80);
+
+ var cleanUrl = _url;
+
+ var hasParams = _url.indexOf("?");
+ if (hasParams != -1) {
+ cleanUrl = _url.substr(0,hasParams-1);
+ }
+
+ if ($debug) Debug.write("_url ",_url,cleanUrl);
+ var doubleSlash = cleanUrl.indexOf("//");
+ var isNotPort80 = cleanUrl.indexOf(":", doubleSlash+2);
+ if ($debug) Debug.write("isNotPort80:
",isNotPort80,doubleSlash);
if (isNotPort80!=-1){
//Debug.write("isNotPort80: ",doubleSlash+2,
_url.indexOf(":",
doubleSlash+2)-doubleSlash-2);
- var server = _url.substr(doubleSlash+2, _url.indexOf(":",
doubleSlash+2)-doubleSlash-2);
+ var server = cleanUrl.substr(doubleSlash+2,
_url.indexOf(":",
doubleSlash+2)-doubleSlash-2);
} else {
- var server = _url.substr(doubleSlash+2, _url.indexOf("/",
doubleSlash+2)-doubleSlash-2);
+ var server = cleanUrl.substr(doubleSlash+2,
_url.indexOf("/",
doubleSlash+2)-doubleSlash-2);
}
- //Debug.write("this zielnr: ",this,server);
+ if ($debug) Debug.write("this zielnr: ",this,server);
this.setAttribute('rtmphost',server);
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
