Author: sebawagner
Date: Thu Apr 5 09:07:59 2012
New Revision: 1309707
URL: http://svn.apache.org/viewvc?rev=1309707&view=rev
Log:
OPENMEETINGS-113 Define a default Login-Domain (ie an Ldap domain) to be
automatically selected in the frontend login window
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx?rev=1309707&r1=1309706&r2=1309707&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
Thu Apr 5 09:07:59 2012
@@ -34,11 +34,6 @@
if (this.childObj!=null) this.childObj.close();
</handler>
- <handler name="onconstruct">
- var g = canvas.getUserData();
- canvas.setColorStyle(g["usercolor"]);
- </handler>
-
<handler name="oninit">
canvas.thishib.setDefaultUserLanguage();
@@ -142,6 +137,7 @@
parent.selectItemAt(0);
}
+ parent.parent.getLoginOptions.doCall();
]]>
</handler>
</netRemoteCallHib>
@@ -350,9 +346,6 @@
</netRemoteCallHib>
<netRemoteCallHib name="getLoginOptions" funcname="xmlcrm.getLoginOptions"
remotecontext="$once{ canvas.thishib }" >
- <handler name="oninit">
- this.doCall();
- </handler>
<handler name="ondata" args="value">
//The onResult-Handler will be called be the rtmpconnection
//Debug.write("allowFrontendRegister: ",value);
@@ -362,6 +355,9 @@
if (value[1].conf_value==1){
parent._facebook.setAttribute('visible',true);
}
+ if (value[5].conf_value > 0){
+ parent.domain.selectItemAt(value[5].conf_value);
+ }
parent.user_login_minimum_length = Number(value[2].conf_value);
parent.user_pass_minimum_length = Number(value[3].conf_value);
</handler>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java?rev=1309707&r1=1309706&r2=1309707&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
Thu Apr 5 09:07:59 2012
@@ -553,6 +553,14 @@ public class ImportInitvalues {
null,
"The path to JOD library
(http://code.google.com/p/jodconverter), configure the path to point to the lib
directory of JOD that contains also the jodconverter-core-version.jar");
+ // system-wide ldap params
+ cfgManagement.addConfByKey(
+ 3,
+ "ldap_default_id",
+ "0",
+ null,
+ "Ldap domain selected by
default in the login screen");
+
}
public void loadDefaultRooms(boolean createRooms) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java?rev=1309707&r1=1309706&r2=1309707&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java
Thu Apr 5 09:07:59 2012
@@ -782,7 +782,7 @@ public class MainService implements IPen
cList.add(cfgManagement.getConfKey(3,
"user.login.minimum.length"));
cList.add(cfgManagement.getConfKey(3,
"user.pass.minimum.length"));
cList.add(cfgManagement.getConfKey(3,
"user.pass.minimum.length"));
-
+ cList.add(cfgManagement.getConfKey(3,
"ldap_default_id"));
return cList;
} catch (Exception err) {
