Revision: 4010
Author: solomax666
Date: Thu Jul 28 10:12:40 2011
Log: - language id is added to UI
http://code.google.com/p/openmeetings/source/detail?r=4010
Modified:
/trunk/singlewebapp/WebContent/openmeetings/base/auth/checkLoginData.lzx
/trunk/singlewebapp/WebContent/openmeetings/base/auth/registerNewUser.lzx
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/admin/useradmin/userAdminValueForm.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/settings/editUserProfile.lzx
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/base/auth/checkLoginData.lzx
Mon Apr 18 05:08:54 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/base/auth/checkLoginData.lzx
Thu Jul 28 10:12:40 2011
@@ -4,7 +4,7 @@
<!--- LOGIN panel window -->
<class name="checkLoginData" extends="labelExplorerBox" labelid="108"
docking="true" resizeable="false" closable="false"
- width="460" height="260"
+ width="460" height="230"
x="$once{ canvas.width/2 - this.width/2 }" y="60">
<handler name="onclose">
@@ -27,29 +27,6 @@
}
</method>
- <datapointer id="pointer" name="pointer" xpath="languagesSet:/"
rerunxpath="true">
- <method name="processData">
- if ($debug) Debug.write("Process data of DATAPOINTER: ");
- if ($debug) Debug.write("combo language : " +
parent.languages.getValue());
-
- this.selectChild();
-
- if ($debug) Debug.write(" xQuery : " +
this.xpathQuery( 'language_id/text()' ));
-
- do {
- if (this.xpathQuery( 'language_id/text()' ) ==
parent.languages.getValue()) {
- if ($debug) Debug.write("LANGUAGE FOUND : " +
this.xpathQuery( 'name/text()' ));
- if ($debug) Debug.write("LANGUAGE FOUND RTL: " +
this.xpathQuery( 'rtl/text()' ));
-
- canvas.setAttribute('isrtl', this.xpathQuery(
'rtl/text()' ));
-
- break;
- }
-
- } while (this.selectNext());
- </method>
- </datapointer>
-
<attribute name="refObj" value="null" />
<attribute name="childObj" value="null" />
@@ -105,45 +82,9 @@
</handler>
</customEdittext>
- <labelText name="n3" labelid="111" width="300" y="86" resize="false"
x="2"/>
-
- <resetCombobox name="languages" width="330" y="84" x="120" >
- <labeldTextListItem datapath="languagesSet:/item"
text="$path{ 'name/text()' }"
- value="$path{ 'language_id/text()' }" />
- <handler name="oninit">
- var t = new lz.sharedObject();
- t.getLocal('userdata');
- var g = t.getData('userdata');
- if($debug) Debug.write("checkLoginData/g: ",g);
- if(g!=null) {
- if (g["userlang"]!=null) {
- this.selectItem(g["userlang"]);
- } else {
- this.selectItem(String(canvas.thishib.userlang));
- }
- } else {
- this.selectItem(String(canvas.thishib.userlang));
- }
- </handler>
- <handler name="onkeyup" args="key">
- <![CDATA[
- if ( this.parent.enterPressed && ( key == 13 ) )
- {
- parent.login();
- }
- ]]>
- </handler>
- <handler name="onkeydown" args="key">
- if ( key == 13 )
- {
- this.parent.enterPressed = true;
- }
- </handler>
- </resetCombobox>
-
- <labelText name="n5" text="Color-Style" width="300" y="116"
resize="false" x="2"/>
-
- <resetCombobox name="colors" width="330" y="114" x="120">
+ <labelText name="n5" text="Color-Style" width="300" y="86"
resize="false" x="2"/>
+
+ <resetCombobox name="colors" width="330" y="84" x="120">
<attribute name="initselect" value="true" type="boolean" />
<handler name="oninit">
this.addItem('redorange','redorange');
@@ -216,8 +157,8 @@
</handler>
</resetCombobox>
- <labelText name="nlabelquality" text="Quality" y="146" x="2"
visible="true" width="140" />
- <resetCombobox name="ncomboquality" width="330" y="144" x="120"
editable="false" >
+ <labelText name="nlabelquality" text="Quality" y="116" x="2"
visible="true" width="140" />
+ <resetCombobox name="ncomboquality" width="330" y="114" x="120"
editable="false" >
<handler name="oninit">
this.addItem("best ~ 16KB upload","best");
this.addItem("medium ~ 10KB upload ","medium");
@@ -254,8 +195,8 @@
</handler>
</resetCombobox>
- <labelText name="domain_label" text="Domain" width="300" y="174"
resize="false" x="2" />
- <resetCombobox name="domain" width="330" y="174" x="120"
editable="false">
+ <labelText name="domain_label" text="Domain" 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");
@@ -344,10 +285,6 @@
//Recheck the Applet Status
getAppletStatus();
- <!-- Setting the RTL Flag global -->
- this.parent.pointer.setXPath('languagesSet:/');
- this.parent.pointer.processData();
-
</handler>
</simpleLabelButton>
@@ -373,14 +310,18 @@
<netparam><method name="getValue"> return
parent.parent.username.getText(); </method></netparam>
<netparam><method name="getValue"> return
parent.parent.userpass.getText(); </method></netparam>
<netparam><method name="getValue"> return
parent.parent._savelogindata.getValue(); </method></netparam>
- <netparam><method name="getValue"> return
Number(parent.parent.languages.getValue()); </method></netparam>
+ <netparam><method name="getValue"> return null;
</method></netparam>
<netparam><method name="getValue"> return
Number(parent.parent.domain.getValue()); </method></netparam>
<handler name="ondata" args="value">
<![CDATA[
//The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("loginUser: ",value);
+ if ($debug) {
+ Debug.write("user.lang: ",value.language_id);
+ Debug.write("loginUser: ",value);
+ }
if (!(value<0)){
+ hib.userlang = isNaN(value.language_id) ? 1 :
Number(value.language_id);
if (this.parent._savelogindata.getValue()) {
var t = new lz.sharedObject();
@@ -391,7 +332,7 @@
g["userpass"] = parent.userpass.getText();
g["userquality"] = parent.ncomboquality.getValue();
g["usercolor"] = parent.colors.getValue();
- g["userlang"] = parent.languages.getValue();
+ g["userlang"] = hib.userlang;
g["userdomain"] = parent.domain.getValue();
g["saveuserdata"]=true;
g["storedSession"] = canvas.sessionId;
@@ -421,6 +362,8 @@
canvas.setAttribute('lastLogin','');
canvas.setAttribute('official_code','');
canvas.setAttribute('picture_uri','');
+ canvas.setAttribute('userlang', hib.userlang);
+ canvas.setAttribute('language_id', hib.userlang);
canvas.setAttribute('language','');
canvas.setAttribute('currentuser',value.login);
if (value.omTimeZone != null) {
@@ -437,8 +380,6 @@
} else {
canvas.becomemoderator = false;
}
-
- hib.userlang = Number(parent.languages.getValue());
if ($debug)
Debug.write("value.organisation_users ",value.organisation_users);
@@ -483,8 +424,6 @@
parent.username.setAttribute('visible',false);
parent.n2.setAttribute('visible',false);
parent.userpass.setAttribute('visible',false);
- parent.n3.setAttribute('visible',false);
- parent.languages.setAttribute('visible',false);
parent.n5.setAttribute('visible',false);
parent.colors.setAttribute('visible',false);
parent._register.setAttribute('visible',false);
@@ -592,9 +531,9 @@
<animator name="doreset" attribute="x" to="$once{ canvas.width/2 -
parent.width/2 }"
duration="1000" start="false" />
- <animator name="showResetForm" attribute="height" to="400"
duration="1000"
+ <animator name="showResetForm" attribute="height" to="370"
duration="1000"
onstop="parent.createReset(parent)" start="false" />
- <animator name="disableResetForm" attribute="height" to="260"
duration="1000"
+ <animator name="disableResetForm" attribute="height" to="230"
duration="1000"
onstart="parent.destroyReset(parent);" start="false" />
</class>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/base/auth/registerNewUser.lzx
Fri Jun 10 01:12:30 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/base/auth/registerNewUser.lzx
Thu Jul 28 10:12:40 2011
@@ -98,27 +98,29 @@
shownitems="7" validate_method="$once{ canvas.validateCountry
}"
resultId="state_id" resultName="name" />
-->
-<!--
- <labelText text="Language: " width="300" y="252" resize="false" x="2"/>
-
- <resetCombobox name="languages" width="370" y="252" x="120"
editable="false">
- <netRemoteCallHib name="getLanguages"
funcname="xmlcrm.getLanguages" remotecontext="$once{ canvas.thishib }" >
+
+ <labelText labelid="111" width="300" y="282" resize="false" x="2"/>
+
+ <resetCombobox name="languages" width="370" y="282" x="120"
editable="false">
+ <labeldTextListItem datapath="languagesSet:/item"
text="$path{ 'name/text()' }"
+ value="$path{ 'language_id/text()' }" />
<handler name="oninit">
- this.doCall();
- </handler>
- <handler name="ondata" args="value">
- //The onResult-Handler will be called be the
rtmpconnection
- //Debug.write("getLanguages: ",value);
- <![CDATA[
- for (var i=0;i<value.length;i++){
-
this.parent.addItem(value[i].name,value[i].language_id);
- }
- this.parent.selectItem(value[0].language_id);
- ]]>
+ var t = new lz.sharedObject();
+ t.getLocal('userdata');
+ var g = t.getData('userdata');
+ if($debug) Debug.write("checkLoginData/g: ",g);
+ if(g!=null) {
+ if (g["userlang"]!=null) {
+ this.selectItem(g["userlang"]);
+ } else {
+ this.selectItem(String(canvas.thishib.userlang));
+ }
+ } else {
+ this.selectItem(String(canvas.thishib.userlang));
+ }
</handler>
- </netRemoteCallHib>
</resetCombobox>
- -->
+
<simpleLabelButton name="registerB" labelid="121" width="120" x="240"
y="332">
<handler name="onclick">
<![CDATA[
@@ -144,7 +146,7 @@
this.parent.regObject["zip"]='';
this.parent.regObject["states_id"]=Number(this.parent._state.getValue());
this.parent.regObject["town"]='';
- this.parent.regObject["language_id"]=0;
+
this.parent.regObject["language_id"]=this.parent.languages.getValue();
this.parent.regObject["domain"]=canvas.rtmphostlocal;
this.parent.regObject["port"]=canvas.red5httpport;
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Sat Jun 11 00:57:08 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Thu Jul 28 10:12:40 2011
@@ -255,7 +255,7 @@
<netRemoteCallHib name="getDefaultLanguage"
funcname="languageservice.getDefaultLanguage" >
<handler name="ondata" args="value">
//The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("getDefaultLanguage: ",value);
+ if ($debug) Debug.write("getDefaultLanguage: ",value,";
canvas.lang = ", canvas.language_id);
if (canvas.language_id==0){
parent.userlang = value;
} else {
@@ -420,6 +420,7 @@
<netparam><method name="getValue">return
parent.step;</method></netparam>
<handler name="ondata" args="value">
<![CDATA[
+ if($debug)
Debug.write("hibRtmpConnection/userlang:[",parent.parent.userlang,"]");
//if($debug)
Debug.write("hibRtmpConnection/getLanguageByIdAndMax:[",value,"]");
setLabelObjectByHundred(this.start,value);
//The onResult-Handler will be called be the rtmpconnection
@@ -639,7 +640,10 @@
return;
}
- hib.userlang = Number(value.sessionData.language_id);
+ if ($debug) Debug.write("value.sessionData: ",
value.sessionData);
+ hib.userlang = isNaN(value.sessionData.language_id) ?
1 : Number(value.sessionData.language_id);
+ canvas.setAttribute('userlang', hib.userlang);
+ canvas.setAttribute('language_id', hib.userlang);
hib.userobject = value;
var found = false;
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/admin/useradmin/userAdminValueForm.lzx
Fri Jun 10 02:36:51 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/admin/useradmin/userAdminValueForm.lzx
Thu Jul 28 10:12:40 2011
@@ -61,6 +61,7 @@
this.userOffers.setAttribute('text',"");
this.userSearchs.setAttribute('text',"");
this.showContactData.selectItem("3");
+ this.languages.selectItem(String('1'));
]]>
</handler>
@@ -127,6 +128,7 @@
this.status.selectItem(String(obj.status));
this.salutation.selectItem(String(obj.title_id));
this._timeZone.selectItem(String(obj.omTimeZone.jname));
+ this.languages.selectItem(String(obj.language_id));
if (obj["forceTimeZoneCheck"] &&
obj.forceTimeZoneCheck!= null) {
if (obj.forceTimeZoneCheck) {
@@ -322,36 +324,58 @@
value="$path{ 'jname/text()' }" />
</resetCombobox>
- <view resource="messagebox_info_rsc" x="0" y="220" />
-
- <labelText labelid="1149" x="24" y="220" fontstyle="italic"
+ <labelText labelid="111" width="300" y="220" resize="false"
x="2"/>
+
+ <resetCombobox name="languages" width="370" y="220" x="120"
editable="false">
+ <labeldTextListItem datapath="languagesSet:/item"
text="$path{ 'name/text()' }"
+ value="$path{ 'language_id/text()' }" />
+ <handler name="oninit">
+ var t = new lz.sharedObject();
+ t.getLocal('userdata');
+ var g = t.getData('userdata');
+ if($debug) Debug.write("checkLoginData/g: ",g);
+ if(g!=null) {
+ if (g["userlang"]!=null) {
+ this.selectItem(g["userlang"]);
+ } else {
+ this.selectItem(String(canvas.thishib.userlang));
+ }
+ } else {
+ this.selectItem(String(canvas.thishib.userlang));
+ }
+ </handler>
+ </resetCombobox>
+
+ <view resource="messagebox_info_rsc" x="0" y="250" />
+
+ <labelText labelid="1149" x="24" y="250" fontstyle="italic"
multiline="true" width="364" />
- <labelText labelid="1148" width="200" y="250" resize="false" x="2"/>
- <labelCheckbox name="forceTimeZoneCheck" width="270" y="250"
x="130" fontsize="11" />
+ <labelText labelid="1148" width="200" y="280" resize="false" x="2"/>
+ <labelCheckbox name="forceTimeZoneCheck" width="270" y="280"
x="130" fontsize="11" />
- <labelText labelid="137" width="200" y="280" resize="false" x="2"/>
- <customEdittext name="email" y="280" x="120" width="270"
regexpType="email"
+ <labelText labelid="137" width="200" y="310" resize="false" x="2"/>
+ <customEdittext name="email" y="310" x="120" width="310"
regexpType="email"
text="" />
- <labelText labelid="607" width="200" y="310" resize="false" x="2"/>
- <customEdittext name="phone" y="310" x="120" width="270"
+ <labelText labelid="607" width="200" y="340" resize="false" x="2"/>
+ <customEdittext name="phone" y="340" x="120" width="270"
text="" />
- <labelText labelid="138" width="200" y="340" resize="false" x="2"/>
- <dateField name="age" y="340" x="120" width="270" text="" />
-
- <labelText labelid="139" width="200" y="370" resize="false" x="2"/>
- <customEdittext name="street" y="370" x="120" width="220" text=""
/>
- <customEdittext name="house" y="370" x="350" width="40" text="" />
-
- <labelText labelid="140" width="200" y="400" resize="false" x="2"/>
- <customEdittext name="zip" y="400" x="120" width="70" text="" />
- <customEdittext name="town" y="400" x="200" width="190" text="" />
-
- <labelText labelid="141" width="200" y="430" resize="false" x="2"/>
- <dynamicCombobox name="state" width="270" y="430" x="120"
+ <labelText labelid="138" width="200" y="370" resize="false" x="2"/>
+ <dateField name="age" y="370" x="120" width="270" text="" />
+
+ <labelText labelid="139" width="200" y="400" resize="false" x="2"/>
+ <customEdittext name="street" y="400" x="120" width="220" text=""
/>
+ <customEdittext name="house" y="400" x="350" width="40" text="" />
+
+ <labelText labelid="140" width="200" y="430" resize="false" x="2"/>
+ <customEdittext name="zip" y="430" x="120" width="70" text="" />
+ <customEdittext name="town" y="430" x="200" width="190" text="" />
+
+ <labelText labelid="141" width="200" y="460" resize="false" x="2"/>
+ <dynamicCombobox name="state" width="270" y="460" x="120"
text="Switzerland" value="204"
/>
<!--
@@ -360,8 +384,8 @@
resultId="state_id" resultName="name" />
-->
- <labelText labelid="158" width="200" y="460" resize="false" x="2"/>
- <resetCombobox name="status" width="270" y="460" x="120"
editable="false" fontsize="11">
+ <labelText labelid="158" width="200" y="490" resize="false" x="2"/>
+ <resetCombobox name="status" width="270" y="490" x="120"
editable="false" fontsize="11">
<handler name="oninit" >
<![CDATA[
this.addItem(canvas.getLabelName(159),'0');
@@ -372,8 +396,8 @@
</resetCombobox>
- <labelText labelid="169" width="200" y="490" resize="false" x="2"/>
- <resetCombobox name="level" width="270" y="490" x="120"
editable="false" fontsize="11">
+ <labelText labelid="169" width="200" y="520" resize="false" x="2"/>
+ <resetCombobox name="level" width="270" y="520" x="120"
editable="false" fontsize="11">
<handler name="oninit" >
<![CDATA[
this.addItem(canvas.getLabelName(166),'1');
@@ -385,12 +409,12 @@
</handler>
</resetCombobox>
- <labelText labelid="142" width="200" y="520" resize="false" x="2"/>
- <customScrollEdittext name="adress_comment" y="520" x="120"
width="270"
+ <labelText labelid="142" width="200" y="550" resize="false" x="2"/>
+ <customScrollEdittext name="adress_comment" y="550" x="120"
width="270"
height="70" text="" />
- <labelText labelid="161" width="200" y="600" resize="false" x="2"/>
- <simpleValueList name="_organisationslist" y="600" x="120" width="270"
height="100"
+ <labelText labelid="161" width="200" y="630" resize="false" x="2"/>
+ <simpleValueList name="_organisationslist" y="630" x="120" width="270"
height="100"
multiselect="true" />
<blueButton width="20" height="20" resourceItem="edit_add_rsc"
@@ -432,45 +456,45 @@
-->
<!-- SIP Account Data -->
- <labelText labelid="893" width="200" y="710" resize="false"
+ <labelText labelid="893" width="200" y="740" resize="false"
x="0" fontstyle="bold" />
- <view resource="messagebox_info_rsc" x="0" y="730" />
-
- <labelText labelid="894" x="24" y="730" fontstyle="italic"
+ <view resource="messagebox_info_rsc" x="0" y="760" />
+
+ <labelText labelid="894" x="24" y="760" fontstyle="italic"
multiline="true" width="364" />
- <labelText labelid="921" width="200" y="760" resize="false" x="2"/>
- <labelCheckbox name="generateSipUserData" width="270" y="760"
x="140" fontsize="11" />
-
- <labelText labelid="895" width="200" y="790" resize="false" x="2"/>
- <customEdittext name="sip_user" y="790" x="120" width="270"
+ <labelText labelid="921" width="200" y="790" resize="false" x="2"/>
+ <labelCheckbox name="generateSipUserData" width="270" y="790"
x="140" fontsize="11" />
+
+ <labelText labelid="895" width="200" y="820" resize="false" x="2"/>
+ <customEdittext name="sip_user" y="820" x="120" width="270"
text="" />
- <labelText labelid="896" width="200" y="820" resize="false" x="2"/>
- <customEdittext name="sip_pass" y="820" x="120" width="270"
+ <labelText labelid="896" width="200" y="850" resize="false" x="2"/>
+ <customEdittext name="sip_pass" y="850" x="120" width="270"
text="" />
- <labelText labelid="897" width="200" y="850" resize="false" x="2"/>
- <customEdittext name="sip_auth" y="850" x="120" width="270"
+ <labelText labelid="897" width="200" y="880" resize="false" x="2"/>
+ <customEdittext name="sip_auth" y="880" x="120" width="270"
text="" />
<!-- Community Settings -->
- <labelText labelid="1159" width="200" y="880" resize="false"
+ <labelText labelid="1159" width="200" y="910" resize="false"
x="0" fontstyle="bold" />
- <radiogroup name="showContactData"
layout="class:simplelayout;axis:y;spacing:2" y="910" x="10">
+ <radiogroup name="showContactData"
layout="class:simplelayout;axis:y;spacing:2" y="940" x="10">
<labelRadioButton labelid="1160" value="1" />
<labelRadioButton labelid="1168" value="2" />
<labelRadioButton labelid="1169" value="3" />
</radiogroup>
- <labelText labelid="1162" width="200" y="970" resize="false" x="2"/>
- <customScrollEdittext name="userOffers" y="970" x="120" width="270"
+ <labelText labelid="1162" width="200" y="1000" resize="false" x="2"/>
+ <customScrollEdittext name="userOffers" y="1000" x="120"
width="270"
height="100" text="" />
- <labelText labelid="1163" width="200" y="1080" resize="false" x="2"/>
- <customScrollEdittext name="userSearchs" y="1080" x="120"
width="270"
+ <labelText labelid="1163" width="200" y="1110" resize="false" x="2"/>
+ <customScrollEdittext name="userSearchs" y="1110" x="120"
width="270"
height="100" text="" />
<view y="1400" />
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/settings/editUserProfile.lzx
Wed Nov 10 04:23:52 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/settings/editUserProfile.lzx
Thu Jul 28 10:12:40 2011
@@ -53,6 +53,7 @@
this.adress_comment.setAttribute('text',obj.adresses.comment);
this.salutation.selectItem(String(obj.title_id));
this._timeZone.selectItem(String(obj.omTimeZone.jname));
+ this.languages.selectItem(String(obj.language_id));
this._organisationslist.clearList();
for (var i=0;i<obj.organisation_users.length;i++){
this._organisationslist.addItem(obj.organisation_users[i].organisation.name,obj.organisation_users[i].organisation.organisation_id);
@@ -140,6 +141,7 @@
this.parent.userObj.age = this.parent.age.getDate();
this.parent.userObj.title_id =
Number(this.parent.salutation.getValue());
this.parent.userObj.jnameTimeZone =
parent._timeZone.getValue();
+ this.parent.userObj.languages_id =
parent.languages.getValue();
this.parent.userObj.userOffers =
parent.userOffers.getText();
this.parent.userObj.userSearchs =
parent.userSearchs.getText();
@@ -213,31 +215,52 @@
value="$path{ 'jname/text()' }" />
</resetCombobox>
+ <labelText labelid="111" width="200" y="220" resize="false" x="2"/>
+ <resetCombobox name="languages" width="270" y="220" x="120"
editable="false">
+ <labeldTextListItem datapath="languagesSet:/item"
text="$path{ 'name/text()' }"
+ value="$path{ 'language_id/text()' }" />
+ <handler name="oninit">
+ var t = new lz.sharedObject();
+ t.getLocal('userdata');
+ var g = t.getData('userdata');
+ if($debug) Debug.write("checkLoginData/g: ",g);
+ if(g!=null) {
+ if (g["userlang"]!=null) {
+ this.selectItem(g["userlang"]);
+ } else {
+ this.selectItem(String(canvas.thishib.userlang));
+ }
+ } else {
+ this.selectItem(String(canvas.thishib.userlang));
+ }
+ </handler>
+ </resetCombobox>
+
<!-- 137:Mail -->
- <labelText labelid="137" width="200" y="220" resize="false" x="2"/>
- <customEdittext name="email" y="220" x="120" width="270" text=""
regexpType="email"/>
+ <labelText labelid="137" width="200" y="250" resize="false" x="2"/>
+ <customEdittext name="email" y="250" x="120" width="270" text=""
regexpType="email"/>
<!-- 607:Phone -->
- <labelText labelid="607" width="200" y="250" resize="false" x="2"/>
- <customEdittext name="phone" y="250" x="120" width="270" text="" />
+ <labelText labelid="607" width="200" y="280" resize="false" x="2"/>
+ <customEdittext name="phone" y="280" x="120" width="270" text="" />
<!-- 138:Birthday -->
- <labelText labelid="138" width="200" y="280" resize="false" x="2"/>
- <dateField name="age" y="280" x="120" width="270" text="" />
+ <labelText labelid="138" width="200" y="310" resize="false" x="2"/>
+ <dateField name="age" y="310" x="120" width="270" text="" />
<!-- 139:Street/No -->
- <labelText labelid="139" width="200" y="310" resize="false" x="2"/>
- <customEdittext name="street" y="310" x="120" width="220" text=""
/>
- <customEdittext name="house" y="310" x="350" width="40" text="" />
+ <labelText labelid="139" width="200" y="340" resize="false" x="2"/>
+ <customEdittext name="street" y="340" x="120" width="220" text=""
/>
+ <customEdittext name="house" y="340" x="350" width="40" text="" />
<!-- 140:ZIP/Town -->
- <labelText labelid="140" width="280" y="340" resize="false" x="2"/>
- <customEdittext name="zip" y="340" x="120" width="70" text="" />
- <customEdittext name="town" y="340" x="200" width="190" text="" />
+ <labelText labelid="140" width="280" y="370" resize="false" x="2"/>
+ <customEdittext name="zip" y="370" x="120" width="70" text="" />
+ <customEdittext name="town" y="370" x="200" width="190" text="" />
<!-- 141:Country -->
- <labelText labelid="141" width="200" y="370" resize="false" x="2"/>
- <dynamicCombobox name="state" width="270" y="370" x="120"
+ <labelText labelid="141" width="200" y="400" resize="false" x="2"/>
+ <dynamicCombobox name="state" width="270" y="400" x="120"
text="Switzerland" value="204" />
<!--
@@ -247,13 +270,13 @@
<!-- 142:Adress-Info -->
- <labelText labelid="142" width="200" y="400" resize="false" x="2"/>
- <customEdittext name="adress_comment" y="400" x="120" width="270"
+ <labelText labelid="142" width="200" y="430" resize="false" x="2"/>
+ <customEdittext name="adress_comment" y="430" x="120" width="270"
height="100" text="" multiline="true"/>
<!-- 161:Organisations -->
- <labelText labelid="161" width="200" y="510" resize="false" x="2"/>
- <simpleValueList name="_organisationslist" y="510" x="120" width="270"
height="100"
+ <labelText labelid="161" width="200" y="540" resize="false" x="2"/>
+ <simpleValueList name="_organisationslist" y="540" x="120" width="270"
height="100"
multiselect="true" />
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
Sat Jul 23 04:28:08 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
Thu Jul 28 10:12:40 2011
@@ -294,21 +294,6 @@
// Pruefen, ob User bereits vorhanden ist
Users user =
Usermanagement.getInstance().getUserByLoginOrEmail(usernameOrEmail);
-
- // AdminUser werden auf jeden Fall lokal authentifiziert
-// if(user != null){ // User exists in local DB
-// if (user.getExternalUserType() ==null || !
user.getExternalUserType().equals(EXTERNAL_USER_TYPE_LDAP)){ // User is not
of External Type LDAP
-// log.debug("User " + usernameOrEmail + " is local user -> Use
Internal DB");
-// withLdap = false;
-// }
-// else if(user.getLevel_id() >=3 &&
LdapLoginManagement.getInstance().getLdapPwdSynchStatus(ldapConfigId) ==
true){ // User is admin with pwd synch
-// log.debug("User " + usernameOrEmail + " : Ldap-user has admin
rights -> Use Internal DB");
-// withLdap = false;
-// }
-// else{
-// log.debug("User " + usernameOrEmail + " : Ldap user
authenticated using Ldap");
-// }
-// }
RoomClient currentClient;
IConnection current = Red5.getConnectionLocal();
@@ -330,19 +315,12 @@
}
o = LdapLoginManagement.getInstance().doLdapLogin(ldapLogin,
Userpass, currentClient, SID, ldapConfig.getConfigFileName());
-// o =
LdapLoginManagement.getInstance().doLdapLogin(usernameOrEmail, Userpass,
currentClient, SID,
-//
false, language_id);
-
- }
- else{
- log.debug("default login");
- // User exists -> DefaultLogin
-
-
+ } else {
+ log.debug("default login: lang: null ? " + (language_id == null)
+ "; user.lang: " + user.getLanguage_id());
currentClient =
this.clientListManager.getClientByStreamId(current.getClient().getId());
o =
Usermanagement.getInstance().loginUser(SID,usernameOrEmail,Userpass,
currentClient,
-
storePermanent, language_id);
+ storePermanent, language_id != null ? language_id :
user.getLanguage_id());
}
if(o==null)
--
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.
