Revision: 4571
Author: seba.wagner
Date: Wed Nov 16 06:36:51 2011
Log: Fixes issue 1572
http://code.google.com/p/openmeetings/source/detail?r=4571
Modified:
/trunk/singlewebapp/WebContent/languages/arabic.xml
/trunk/singlewebapp/WebContent/languages/bulgarian.xml
/trunk/singlewebapp/WebContent/languages/catalan.xml
/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
/trunk/singlewebapp/WebContent/languages/czech.xml
/trunk/singlewebapp/WebContent/languages/danish.xml
/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
/trunk/singlewebapp/WebContent/languages/deutsch.xml
/trunk/singlewebapp/WebContent/languages/dutch.xml
/trunk/singlewebapp/WebContent/languages/english.xml
/trunk/singlewebapp/WebContent/languages/errorvalues.xml
/trunk/singlewebapp/WebContent/languages/finnish.xml
/trunk/singlewebapp/WebContent/languages/french.xml
/trunk/singlewebapp/WebContent/languages/galician.xml
/trunk/singlewebapp/WebContent/languages/greek.xml
/trunk/singlewebapp/WebContent/languages/hebrew.xml
/trunk/singlewebapp/WebContent/languages/hungarian.xml
/trunk/singlewebapp/WebContent/languages/indonesian.xml
/trunk/singlewebapp/WebContent/languages/italian.xml
/trunk/singlewebapp/WebContent/languages/japanese.xml
/trunk/singlewebapp/WebContent/languages/korean.xml
/trunk/singlewebapp/WebContent/languages/persian.xml
/trunk/singlewebapp/WebContent/languages/polish.xml
/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
/trunk/singlewebapp/WebContent/languages/portugues.xml
/trunk/singlewebapp/WebContent/languages/russian.xml
/trunk/singlewebapp/WebContent/languages/slovak.xml
/trunk/singlewebapp/WebContent/languages/spanish.xml
/trunk/singlewebapp/WebContent/languages/swedish.xml
/trunk/singlewebapp/WebContent/languages/thai.xml
/trunk/singlewebapp/WebContent/languages/turkish.xml
/trunk/singlewebapp/WebContent/languages/ukrainian.xml
/trunk/singlewebapp/WebContent/openmeetings/base/auth/checkLoginData.lzx
/trunk/singlewebapp/WebContent/openmeetings/base/auth/registerNewUser.lzx
/trunk/singlewebapp/WebContent/openmeetings/base/functions.lzx
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/rpcerrorDialog.lzx
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Configurationmanagement.java
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
/trunk/singlewebapp/src/templates/install_step1_EN.vm
=======================================
--- /trunk/singlewebapp/WebContent/languages/arabic.xml Mon Nov 14 11:16:16
2011
+++ /trunk/singlewebapp/WebContent/languages/arabic.xml Wed Nov 16 06:36:51
2011
@@ -4252,4 +4252,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/bulgarian.xml Mon Nov 14
11:16:16 2011
+++ /trunk/singlewebapp/WebContent/languages/bulgarian.xml Wed Nov 16
06:36:51 2011
@@ -4250,4 +4250,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/catalan.xml Mon Nov 14
11:16:16 2011
+++ /trunk/singlewebapp/WebContent/languages/catalan.xml Wed Nov 16
06:36:51 2011
@@ -4251,4 +4251,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/chinese simplified.xml Sun
Nov 6 06:18:21 2011
+++ /trunk/singlewebapp/WebContent/languages/chinese simplified.xml Wed Nov
16 06:36:51 2011
@@ -4251,4 +4251,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/chinese traditional.xml Mon
Nov 14 11:16:16 2011
+++ /trunk/singlewebapp/WebContent/languages/chinese traditional.xml Wed
Nov 16 06:36:51 2011
@@ -4257,4 +4257,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/czech.xml Mon Nov 14 11:16:16
2011
+++ /trunk/singlewebapp/WebContent/languages/czech.xml Wed Nov 16 06:36:51
2011
@@ -4251,4 +4251,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/danish.xml Mon Nov 14 11:16:16
2011
+++ /trunk/singlewebapp/WebContent/languages/danish.xml Wed Nov 16 06:36:51
2011
@@ -4250,4 +4250,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Mon Nov
14 11:16:16 2011
+++ /trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Wed Nov
16 06:36:51 2011
@@ -4251,4 +4251,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/deutsch.xml Mon Nov 14
11:16:16 2011
+++ /trunk/singlewebapp/WebContent/languages/deutsch.xml Wed Nov 16
06:36:51 2011
@@ -997,7 +997,7 @@
<value>Die von Ihnen angegebenen Passwörter sind nicht
identisch.</value>
</string>
<string id="331" name="resetpass">
- <value>4 oder mehr Buchstaben. Groß- und Kleinschreibung
beachten!</value>
+ <value>Benutzername oder Passwort sind zu kurz, bitte geben Sie
mindestens folgende Anzahl an zeichen an Benutzername / Passwort:</value>
</string>
<string id="332" name="resetpass">
<value>Passwort gespeichert. Sie können sich nun damit
einloggen.</value>
@@ -4251,4 +4251,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Bitte geben Sie eine EMail an</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/dutch.xml Mon Nov 14 11:16:16
2011
+++ /trunk/singlewebapp/WebContent/languages/dutch.xml Wed Nov 16 06:36:51
2011
@@ -4247,4 +4247,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/english.xml Mon Nov 14
11:16:16 2011
+++ /trunk/singlewebapp/WebContent/languages/english.xml Wed Nov 16
06:36:51 2011
@@ -313,10 +313,10 @@
<value>input data error</value>
</string>
<string id="103" name="min4username">
- <value>Case sensitive with 4 or more characters</value>
+ <value>Password and or login is too short</value>
</string>
<string id="104" name="min4pass">
- <value>Password must be at least 4 characters in length</value>
+ <value>Password and or login is too short</value>
</string>
<string id="105" name="usernametaken">
<value>The username is already used</value>
@@ -997,7 +997,7 @@
<value>The passwords you entered weren't identical</value>
</string>
<string id="331" name="resetpass">
- <value>Case sensitive with 4 or more characters</value>
+ <value>Password and or username too short, required minimum length for
Username / Password are: </value>
</string>
<string id="332" name="resetpass">
<value>Password set. You can now login.</value>
@@ -4251,4 +4251,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/errorvalues.xml Sun Oct 9
06:28:50 2011
+++ /trunk/singlewebapp/WebContent/languages/errorvalues.xml Wed Nov 16
06:36:51 2011
@@ -416,4 +416,12 @@
<field name="fieldvalues_id">1310</field>
<field name="errortype_id">1</field>
</row>
+ <row>
+ <field name="errorvalues_id">53</field>
+ <field name="starttime" />
+ <field name="updatetime" />
+ <field name="deleted">false</field>
+ <field name="fieldvalues_id">1416</field>
+ <field name="errortype_id">1</field>
+ </row>
</ROOT>
=======================================
--- /trunk/singlewebapp/WebContent/languages/finnish.xml Mon Nov 14
11:16:16 2011
+++ /trunk/singlewebapp/WebContent/languages/finnish.xml Wed Nov 16
06:36:51 2011
@@ -4250,4 +4250,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/french.xml Mon Nov 14 11:16:16
2011
+++ /trunk/singlewebapp/WebContent/languages/french.xml Wed Nov 16 06:36:51
2011
@@ -4251,4 +4251,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/galician.xml Mon Nov 14
11:16:16 2011
+++ /trunk/singlewebapp/WebContent/languages/galician.xml Wed Nov 16
06:36:51 2011
@@ -4251,4 +4251,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/greek.xml Mon Nov 14 11:16:16
2011
+++ /trunk/singlewebapp/WebContent/languages/greek.xml Wed Nov 16 06:36:51
2011
@@ -4251,4 +4251,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/hebrew.xml Mon Nov 14 11:16:16
2011
+++ /trunk/singlewebapp/WebContent/languages/hebrew.xml Wed Nov 16 06:36:51
2011
@@ -4251,4 +4251,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/hungarian.xml Mon Nov 14
11:16:16 2011
+++ /trunk/singlewebapp/WebContent/languages/hungarian.xml Wed Nov 16
06:36:51 2011
@@ -4251,4 +4251,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/indonesian.xml Mon Nov 14
11:16:16 2011
+++ /trunk/singlewebapp/WebContent/languages/indonesian.xml Wed Nov 16
06:36:51 2011
@@ -4251,4 +4251,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/italian.xml Mon Nov 14
11:16:16 2011
+++ /trunk/singlewebapp/WebContent/languages/italian.xml Wed Nov 16
06:36:51 2011
@@ -4251,4 +4251,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/japanese.xml Mon Nov 14
11:16:16 2011
+++ /trunk/singlewebapp/WebContent/languages/japanese.xml Wed Nov 16
06:36:51 2011
@@ -4251,4 +4251,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/korean.xml Mon Nov 14 11:16:16
2011
+++ /trunk/singlewebapp/WebContent/languages/korean.xml Wed Nov 16 06:36:51
2011
@@ -4251,4 +4251,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/persian.xml Mon Nov 14
11:16:16 2011
+++ /trunk/singlewebapp/WebContent/languages/persian.xml Wed Nov 16
06:36:51 2011
@@ -4251,4 +4251,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/polish.xml Mon Nov 14 11:16:16
2011
+++ /trunk/singlewebapp/WebContent/languages/polish.xml Wed Nov 16 06:36:51
2011
@@ -4324,4 +4324,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/portugues brazil.xml Mon Nov
14 11:16:16 2011
+++ /trunk/singlewebapp/WebContent/languages/portugues brazil.xml Wed Nov
16 06:36:51 2011
@@ -4257,4 +4257,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/portugues.xml Mon Nov 14
11:16:16 2011
+++ /trunk/singlewebapp/WebContent/languages/portugues.xml Wed Nov 16
06:36:51 2011
@@ -4251,4 +4251,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/russian.xml Mon Nov 14
11:16:16 2011
+++ /trunk/singlewebapp/WebContent/languages/russian.xml Wed Nov 16
06:36:51 2011
@@ -4257,4 +4257,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/slovak.xml Mon Nov 14 11:16:16
2011
+++ /trunk/singlewebapp/WebContent/languages/slovak.xml Wed Nov 16 06:36:51
2011
@@ -4251,4 +4251,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/spanish.xml Mon Nov 14
11:16:16 2011
+++ /trunk/singlewebapp/WebContent/languages/spanish.xml Wed Nov 16
06:36:51 2011
@@ -4259,4 +4259,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/swedish.xml Mon Nov 14
11:16:16 2011
+++ /trunk/singlewebapp/WebContent/languages/swedish.xml Wed Nov 16
06:36:51 2011
@@ -4251,4 +4251,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/thai.xml Mon Nov 14 11:16:16
2011
+++ /trunk/singlewebapp/WebContent/languages/thai.xml Wed Nov 16 06:36:51
2011
@@ -4251,4 +4251,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/turkish.xml Mon Nov 14
11:16:16 2011
+++ /trunk/singlewebapp/WebContent/languages/turkish.xml Wed Nov 16
06:36:51 2011
@@ -4250,4 +4250,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/ukrainian.xml Mon Nov 14
11:16:16 2011
+++ /trunk/singlewebapp/WebContent/languages/ukrainian.xml Wed Nov 16
06:36:51 2011
@@ -4251,4 +4251,7 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
+ <string id="1416" name="sign_up_validation">
+ <value>Please enter email</value>
+ </string>
</language>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/base/auth/checkLoginData.lzx
Thu Sep 22 08:39:01 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/base/auth/checkLoginData.lzx
Wed Nov 16 06:36:51 2011
@@ -6,6 +6,9 @@
docking="true" resizeable="false" closable="false"
width="460" height="230"
x="$once{ canvas.width/2 - this.width/2 }" y="60">
+
+ <attribute name="user_login_minimum_length" type="number" value="4" />
+ <attribute name="user_pass_minimum_length" type="number" value="4" />
<handler name="onclose">
if (this.childObj!=null) this.childObj.close();
@@ -166,10 +169,6 @@
<labelText name="domain_label" labelid="1372" width="300" y="144"
resize="false" x="2" />
<resetCombobox name="domain" width="330" y="144" x="120"
editable="false">
<handler name="oninit">
- //this.addItem("localhost","localhost");
- //this.addItem("eu.p-f.biz","SA-MeetingEU");
- //this.addItem("am.p-f.biz","SA-MeetingAM");
- //this.addItem("ap.p-f.biz","SA-MeetingAP");
//this.selectItemAt(0);
this.getActiveLdapConfigs.doCall();
</handler>
@@ -216,10 +215,16 @@
<simpleLabelButton labelid="123" name="_register" width="120"
y="$once{ parent.height-40 }"
visible="false" x="10" height="22">
<handler name="onclick">
- this.parent._register.setAttribute('visible',false);
- this.parent.childObj = new
lz.registerNewUser(canvas,{refObj:this.parent});
- lz.Keys.removeKeyComboCall(this.parent.pressEnter, ["enter"]);
- //parent.showRegForm.doStart();
+ <![CDATA[
+ this.parent._register.setAttribute('visible',false);
+ this.parent.childObj = new lz.registerNewUser(canvas,{
+
refObj:this.parent,
+
user_login_minimum_length:parent.user_login_minimum_length,
+
user_pass_minimum_length:parent.user_pass_minimum_length
+
});
+ lz.Keys.removeKeyComboCall(this.parent.pressEnter,
["enter"]);
+ //parent.showRegForm.doStart();
+ ]]>
</handler>
</simpleLabelButton>
@@ -420,6 +425,8 @@
if (value[1].conf_value==1){
parent._facebook.setAttribute('visible',true);
}
+ parent.user_login_minimum_length = Number(value[2].conf_value);
+ parent.user_pass_minimum_length = Number(value[3].conf_value);
</handler>
</netRemoteCallHib>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/base/auth/registerNewUser.lzx
Sun Oct 9 06:28:50 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/base/auth/registerNewUser.lzx
Wed Nov 16 06:36:51 2011
@@ -8,6 +8,9 @@
<attribute name="refObj" value="null" />
<attribute name="regObject" value="null" />
+ <attribute name="user_login_minimum_length" type="number" value="4" />
+ <attribute name="user_pass_minimum_length" type="number" value="4" />
+
<handler name="oninit">
<![CDATA[
var pressEnter = new LzDelegate(this, "register");
@@ -118,20 +121,28 @@
<simpleLabelButton name="registerB" labelid="121" width="120" x="240"
y="332">
<handler name="onclick">
<![CDATA[
- var pwd1 = this.parent.userpass1.getText();
- var pwd2 = this.parent.userpass2.getText();
+ var pwd1 = strtrim(this.parent.userpass1.getText());
+ var pwd2 = strtrim(this.parent.userpass2.getText());
+ var login = strtrim(this.parent.username.getText());
+ var email = strtrim(this.parent.email.getText());
if (pwd1!=pwd2) {
- new
lz.rpcErrorDialog(canvas.main_content._content.inner,{errorid:-6});
- } else if(pwd1.length<4){
- new
lz.rpcErrorDialog(canvas.main_content._content.inner,{errorid:-7});
+ new
lz.rpcErrorDialog(canvas,{errorid:-6});
+ } else
if(pwd1.length<parent.user_pass_minimum_length
+ ||
login<parent.user_login_minimum_length){
+ var addInfo = "<br/> "
+ +
parent.user_pass_minimum_length + " / "
+ +
parent.user_login_minimum_length;
+ new
lz.rpcErrorDialog(canvas,{errorid:-7,addInfo:addInfo});
+ } else if (email=="") {
+ new lz.rpcErrorDialog(canvas,{errorid:-53});
} else {
this.parent.regObject = new Array();
this.parent.regObject["SID"]=canvas.sessionId;
-
this.parent.regObject["Username"]=this.parent.username.getText();
+ this.parent.regObject["Username"]=login;
this.parent.regObject["Userpass"]=this.parent.userpass1.getText();
this.parent.regObject["lastname"]=this.parent.lastname.getText();
this.parent.regObject["firstname"]=this.parent.firstname.getText();
-
this.parent.regObject["email"]=this.parent.email.getText();
+ this.parent.regObject["email"]=email;
this.parent.regObject["jNameTimeZone"]=this.parent._timeZone.getValue();
this.parent.regObject["age"]=0;
this.parent.regObject["street"]='';
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/base/functions.lzx Sat Jul
30 09:15:47 2011
+++ /trunk/singlewebapp/WebContent/openmeetings/base/functions.lzx Wed Nov
16 06:36:51 2011
@@ -334,6 +334,14 @@
if (seconds<10) seconds="0"+seconds;
return ''+hours+':'+minutes+':'+seconds;
}
+
+
+function strtrim(str)
+{
+ for(var i = 0; str.charCodeAt(i) < 33; i++);
+ for(var j = str.length-1; str.charCodeAt(j) < 33; j--);
+ return str.substring(i, j+1);
+}
]]>
</script>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Sun Nov 6 05:52:37 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Wed Nov 16 06:36:51 2011
@@ -301,8 +301,7 @@
var addInfo = "" + value.validFrom +"<br/>
- <br/>"+ value.validTo;
- var dlg = new
lz.rpcErrorDialog(canvas,{errorid:-50,addInfo:addInfo});
- lz.Focus.setFocus(dlg);
+ new
lz.rpcErrorDialog(canvas,{errorid:-50,addInfo:addInfo});
}
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/rpcerrorDialog.lzx
Sun Nov 6 05:52:37 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/rpcerrorDialog.lzx
Wed Nov 16 06:36:51 2011
@@ -7,6 +7,10 @@
<handler name="oninit">
this.bringToFront();
+ lz.Focus.setFocus(this);
+ if (errorid != 0) {
+ this.getErrorByCode.doCall();
+ }
</handler>
<attribute name="errortext" value="" type="string" />
@@ -40,9 +44,6 @@
<handler name="oninit">
lz.ModeManager.makeModal(this);
- if (errorid != 0) {
- this.getErrorByCode.doCall();
- }
</handler>
<handler name="onclose">
lz.ModeManager.release(this);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Configurationmanagement.java
Sun Nov 6 05:52:37 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Configurationmanagement.java
Wed Nov 16 06:36:51 2011
@@ -66,31 +66,6 @@
}
return null;
}
-
- public static void main(String... args) throws SecurityException,
- NoSuchMethodException, IllegalArgumentException,
- InstantiationException, IllegalAccessException,
- InvocationTargetException {
-
- Class<Integer> typeObject = Integer.class;
- String returnValue = "15";
-
- if (typeObject.isAssignableFrom(returnValue.getClass())) {
- Integer t = typeObject.cast(returnValue);
- System.out.println("t " + t);
- } else {
- System.out.println("cannot be cast to Integer ");
-
- Constructor<Integer> c =
typeObject.getConstructor(returnValue
- .getClass());
-
- Integer k = c.newInstance(returnValue);
-
- System.out.println("k " + k);
-
- }
-
- }
/**
* Return a object using a custom type and a default value if the key is
not present
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Wed Nov 16 04:51:46 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Wed Nov 16 06:36:51 2011
@@ -478,7 +478,7 @@
cfgManagement.addConfByKey(3, "user.login.minimum.length", "4",
null,
"Number of chars needed in a user login");
- cfgManagement.addConfByKey(3, "user.pass.minimum.length", "15",
null,
+ cfgManagement.addConfByKey(3, "user.pass.minimum.length", "4",
null,
"Number of chars needed in a user login");
}
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
Sun Sep 18 07:58:10 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
Wed Nov 16 06:36:51 2011
@@ -745,6 +745,8 @@
List<Configuration> cList = new
LinkedList<Configuration>();
cList.add(cfgManagement.getConfKey(3,
"allow_frontend_register"));
cList.add(cfgManagement.getConfKey(3,
"show.facebook.login"));
+ cList.add(cfgManagement.getConfKey(3,
"user.login.minimum.length"));
+ cList.add(cfgManagement.getConfKey(3,
"user.pass.minimum.length"));
return cList;
} catch (Exception err) {
=======================================
--- /trunk/singlewebapp/src/templates/install_step1_EN.vm Fri Oct 21
06:58:32 2011
+++ /trunk/singlewebapp/src/templates/install_step1_EN.vm Wed Nov 16
06:36:51 2011
@@ -218,7 +218,7 @@
</li><li>
<label for="configmailpass">SMTP-Userpass (email_userpass)</label>
<input name="configmailpass" id="configmailpass" size="27"
- title="Enter the mail-userpass" type="text" /><br/>
+ title="Enter the mail-userpass" type="password" /><br/>
</li><li>
<label for="mailusetls">Enable TLS in Mail Server Auth</label>
<select name="mailusetls" id="mailusetls"
--
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.
