Revision: 3717
Author: seba.wagner
Date: Mon Apr 18 05:08:54 2011
Log: Fix login box input minimum + layout
Add new User-Level for Web-Service Access
http://code.google.com/p/openmeetings/source/detail?r=3717
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/auth/resetPassword.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/AuthLevelmanagement.java
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomService.java
/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserService.java
=======================================
--- /trunk/singlewebapp/WebContent/languages/arabic.xml Sat Apr 2 02:21:16
2011
+++ /trunk/singlewebapp/WebContent/languages/arabic.xml Mon Apr 18 05:08:54
2011
@@ -3931,4 +3931,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/bulgarian.xml Sat Apr 2
02:21:16 2011
+++ /trunk/singlewebapp/WebContent/languages/bulgarian.xml Mon Apr 18
05:08:54 2011
@@ -3929,4 +3929,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/catalan.xml Sat Apr 2
02:21:16 2011
+++ /trunk/singlewebapp/WebContent/languages/catalan.xml Mon Apr 18
05:08:54 2011
@@ -3930,4 +3930,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/chinese simplified.xml Sat
Apr 2 02:21:16 2011
+++ /trunk/singlewebapp/WebContent/languages/chinese simplified.xml Mon Apr
18 05:08:54 2011
@@ -3930,4 +3930,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/chinese traditional.xml Sat
Apr 2 02:21:16 2011
+++ /trunk/singlewebapp/WebContent/languages/chinese traditional.xml Mon
Apr 18 05:08:54 2011
@@ -3936,4 +3936,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/czech.xml Sat Apr 2 02:21:16
2011
+++ /trunk/singlewebapp/WebContent/languages/czech.xml Mon Apr 18 05:08:54
2011
@@ -3930,4 +3930,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/danish.xml Sat Apr 2 02:21:16
2011
+++ /trunk/singlewebapp/WebContent/languages/danish.xml Mon Apr 18 05:08:54
2011
@@ -3929,4 +3929,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Sat Apr
2 02:21:16 2011
+++ /trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Mon Apr
18 05:08:54 2011
@@ -3930,4 +3930,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/deutsch.xml Sat Apr 2
02:21:16 2011
+++ /trunk/singlewebapp/WebContent/languages/deutsch.xml Mon Apr 18
05:08:54 2011
@@ -3930,4 +3930,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/dutch.xml Sat Apr 2 02:21:16
2011
+++ /trunk/singlewebapp/WebContent/languages/dutch.xml Mon Apr 18 05:08:54
2011
@@ -3929,4 +3929,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/english.xml Sat Apr 2
02:21:16 2011
+++ /trunk/singlewebapp/WebContent/languages/english.xml Mon Apr 18
05:08:54 2011
@@ -3930,4 +3930,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/errorvalues.xml Fri Oct 22
08:23:42 2010
+++ /trunk/singlewebapp/WebContent/languages/errorvalues.xml Mon Apr 18
05:08:54 2011
@@ -399,5 +399,21 @@
<field name="deleted">false</field>
<field name="fieldvalues_id">1271</field>
<field name="errortype_id">1</field>
- </row>
+ </row>
+ <row>
+ <field name="errorvalues_id">51</field>
+ <field name="starttime" />
+ <field name="updatetime" />
+ <field name="deleted">false</field>
+ <field name="fieldvalues_id">1309</field>
+ <field name="errortype_id">1</field>
+ </row>
+ <row>
+ <field name="errorvalues_id">52</field>
+ <field name="starttime" />
+ <field name="updatetime" />
+ <field name="deleted">false</field>
+ <field name="fieldvalues_id">1310</field>
+ <field name="errortype_id">1</field>
+ </row>
</ROOT>
=======================================
--- /trunk/singlewebapp/WebContent/languages/finnish.xml Sat Apr 2
02:21:16 2011
+++ /trunk/singlewebapp/WebContent/languages/finnish.xml Mon Apr 18
05:08:54 2011
@@ -3929,4 +3929,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/french.xml Sat Apr 2 02:21:16
2011
+++ /trunk/singlewebapp/WebContent/languages/french.xml Mon Apr 18 05:08:54
2011
@@ -3930,4 +3930,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/galician.xml Sat Apr 2
02:21:16 2011
+++ /trunk/singlewebapp/WebContent/languages/galician.xml Mon Apr 18
05:08:54 2011
@@ -3930,4 +3930,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/greek.xml Sat Apr 2 02:21:16
2011
+++ /trunk/singlewebapp/WebContent/languages/greek.xml Mon Apr 18 05:08:54
2011
@@ -3930,4 +3930,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/hebrew.xml Sat Apr 2 02:21:16
2011
+++ /trunk/singlewebapp/WebContent/languages/hebrew.xml Mon Apr 18 05:08:54
2011
@@ -3930,4 +3930,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/hungarian.xml Sat Apr 2
02:21:16 2011
+++ /trunk/singlewebapp/WebContent/languages/hungarian.xml Mon Apr 18
05:08:54 2011
@@ -3930,4 +3930,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/indonesian.xml Sat Apr 2
02:21:16 2011
+++ /trunk/singlewebapp/WebContent/languages/indonesian.xml Mon Apr 18
05:08:54 2011
@@ -3930,4 +3930,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/italian.xml Sat Apr 2
02:21:16 2011
+++ /trunk/singlewebapp/WebContent/languages/italian.xml Mon Apr 18
05:08:54 2011
@@ -3930,4 +3930,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/japanese.xml Sat Apr 2
02:21:16 2011
+++ /trunk/singlewebapp/WebContent/languages/japanese.xml Mon Apr 18
05:08:54 2011
@@ -3930,4 +3930,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/korean.xml Sat Apr 2 02:21:16
2011
+++ /trunk/singlewebapp/WebContent/languages/korean.xml Mon Apr 18 05:08:54
2011
@@ -3930,4 +3930,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/persian.xml Sat Apr 2
02:21:16 2011
+++ /trunk/singlewebapp/WebContent/languages/persian.xml Mon Apr 18
05:08:54 2011
@@ -3930,4 +3930,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/polish.xml Sat Apr 2 02:21:16
2011
+++ /trunk/singlewebapp/WebContent/languages/polish.xml Mon Apr 18 05:08:54
2011
@@ -4004,4 +4004,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/portugues brazil.xml Sun Apr
3 04:04:06 2011
+++ /trunk/singlewebapp/WebContent/languages/portugues brazil.xml Mon Apr
18 05:08:54 2011
@@ -3936,4 +3936,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/portugues.xml Sat Apr 2
02:21:16 2011
+++ /trunk/singlewebapp/WebContent/languages/portugues.xml Mon Apr 18
05:08:54 2011
@@ -3930,4 +3930,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/russian.xml Sat Apr 2
02:21:16 2011
+++ /trunk/singlewebapp/WebContent/languages/russian.xml Mon Apr 18
05:08:54 2011
@@ -3936,4 +3936,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/slovak.xml Sat Apr 2 02:21:16
2011
+++ /trunk/singlewebapp/WebContent/languages/slovak.xml Mon Apr 18 05:08:54
2011
@@ -3930,4 +3930,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/spanish.xml Sat Apr 2
02:21:16 2011
+++ /trunk/singlewebapp/WebContent/languages/spanish.xml Mon Apr 18
05:08:54 2011
@@ -3938,4 +3938,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/swedish.xml Sat Apr 2
02:21:16 2011
+++ /trunk/singlewebapp/WebContent/languages/swedish.xml Mon Apr 18
05:08:54 2011
@@ -3930,4 +3930,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/thai.xml Sat Apr 2 02:21:16
2011
+++ /trunk/singlewebapp/WebContent/languages/thai.xml Mon Apr 18 05:08:54
2011
@@ -3930,4 +3930,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/turkish.xml Sat Apr 2
02:21:16 2011
+++ /trunk/singlewebapp/WebContent/languages/turkish.xml Mon Apr 18
05:08:54 2011
@@ -3929,4 +3929,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/ukrainian.xml Sat Apr 2
02:21:16 2011
+++ /trunk/singlewebapp/WebContent/languages/ukrainian.xml Mon Apr 18
05:08:54 2011
@@ -3930,4 +3930,10 @@
<string id="1308" name="room administration">
<value>Owner Id</value>
</string>
+ <string id="1309" name="login error">
+ <value>Please enter a password</value>
+ </string>
+ <string id="1310" name="login error">
+ <value>You need an account with User-Level User, Moderator or
Admin</value>
+ </string>
</language>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/base/auth/checkLoginData.lzx
Mon Nov 8 02:20:02 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/base/auth/checkLoginData.lzx
Mon Apr 18 05:08:54 2011
@@ -5,7 +5,7 @@
<class name="checkLoginData" extends="labelExplorerBox" labelid="108"
docking="true" resizeable="false" closable="false"
width="460" height="260"
- x="$once{ canvas.width/2 - this.width/2 }" y="120">
+ x="$once{ canvas.width/2 - this.width/2 }" y="60">
<handler name="onclose">
if (this.childObj!=null) this.childObj.close();
@@ -197,7 +197,7 @@
canvas.setAttribute('baseMouseOvercolorizer',"0xC2C8CD");
}
this.parent.close();
- new lz.checkLoginData(canvas);
+ new
lz.checkLoginData(canvas.main_content._content.inner);
}
</handler>
<handler name="onkeyup" args="key">
@@ -333,6 +333,12 @@
y="$once{ parent.height-40 }" height="22">
<handler name="onclick" >
this.parent.errormess.setAttribute('text','');
+
+ if (this.parent.userpass.getText().length == 0) {
+ new
lz.rpcErrorDialog(canvas.main_content._content.inner,{errorid:-51});
+ return;
+ }
+
this.parent.loginUser.doCall();
//Recheck the Applet Status
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/base/auth/registerNewUser.lzx
Sun Apr 3 07:09:17 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/base/auth/registerNewUser.lzx
Mon Apr 18 05:08:54 2011
@@ -178,7 +178,7 @@
<handler name="ondata" args="value">
<![CDATA[
//The onResult-Handler will be called be the rtmpconnection
- Debug.write("registerUserByObject: ",value);
+ if ($debug) Debug.write("registerUserByObject: ",value);
if (!(value<0)){
//Debug.write("successfully registered");
new
lz.rpcErrorDialog(canvas.main_content._content.inner,{errorid:-18});
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/base/auth/resetPassword.lzx
Thu Nov 4 09:17:40 2010
+++ /trunk/singlewebapp/WebContent/openmeetings/base/auth/resetPassword.lzx
Mon Apr 18 05:08:54 2011
@@ -60,7 +60,7 @@
<handler name="sendCallBack">
if (this.tempValue==-8) {
if ($debug) Debug.write("success");
- var authLogin = new lz.checkLoginData(canvas);
+ var authLogin = new
lz.checkLoginData(canvas.main_content._content.inner);
authLogin.username.setAttribute('text',parent.username.getText());
authLogin.userpass.setAttribute('text',parent.pass1.getText());
parent.close();
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Thu Mar 24 03:29:39 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Mon Apr 18 05:08:54 2011
@@ -633,7 +633,7 @@
if (value.sessionData == null) {
if ($debug) Debug.write("No Language Found to
assign");
- new lz.checkLoginData(canvas);
+ new
lz.checkLoginData(canvas.main_content._content.inner);
return;
}
@@ -676,12 +676,12 @@
}
} else {
if ($debug) Debug.write("No Organization Found to
assign");
- new lz.checkLoginData(canvas);
+ new
lz.checkLoginData(canvas.main_content._content.inner);
}
} else {
if ($debug) Debug.write("No RPC-Sesion Found to
assign");
- new lz.checkLoginData(canvas);
+ new
lz.checkLoginData(canvas.main_content._content.inner);
}
]]>
</handler>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/rpcerrorDialog.lzx
Fri Oct 15 06:53:14 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/rpcerrorDialog.lzx
Mon Apr 18 05:08:54 2011
@@ -5,6 +5,10 @@
docking="true" resizeable="false" closable="true" width="300"
x="$once{ canvas.width/2-this.width/2 }" height="130">
+ <handler name="oninit">
+ this.bringToFront();
+ </handler>
+
<attribute name="errortext" value="" type="string" />
<attribute name="errorid" value="0" type="number" />
@@ -50,7 +54,7 @@
<handler name="oninit">
lz.ModeManager.makeModal(this);
- Debug.write("contentsavewindow: ",errorid);
+ if ($debug) Debug.write("contentsavewindow: ",errorid);
this.startSave();
</handler>
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/AuthLevelmanagement.java
Tue May 11 13:54:08 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/AuthLevelmanagement.java
Mon Apr 18 05:08:54 2011
@@ -20,7 +20,7 @@
}
public boolean checkUserLevel(Long user_level) {
- if (user_level > 0) {
+ if (user_level == 1 || user_level == 2 || user_level == 3) {
return true;
} else {
return false;
@@ -28,7 +28,7 @@
}
public boolean checkModLevel(Long user_level) {
- if (user_level > 1) {
+ if (user_level == 2 || user_level == 3) {
return true;
} else {
return false;
@@ -36,7 +36,15 @@
}
public boolean checkAdminLevel(Long user_level) {
- if (user_level > 2) {
+ if (user_level == 3) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ public boolean checkWebServiceLevel(Long user_level) {
+ if (user_level == 3 || user_level == 4) {
return true;
} else {
return false;
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Sun Apr 3 04:04:06 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Mon Apr 18 05:08:54 2011
@@ -59,6 +59,7 @@
Usermanagement.getInstance().addUserLevel("User", 1);
Usermanagement.getInstance().addUserLevel("Moderator", 2);
Usermanagement.getInstance().addUserLevel("Admin", 3);
+ Usermanagement.getInstance().addUserLevel("Web-Service (only access via
SOAP)", 4);
/* ########################
* Dashboard Menu Points
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
Sun Apr 3 04:04:06 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
Mon Apr 18 05:08:54 2011
@@ -253,6 +253,25 @@
}
return null;
}
+
+ public Object webLoginUser(String SID, String usernameOrEmail, String
Userpass, Boolean storePermanent, Long language_id, Long ldapConfigId){
+
+ Object returnValue = this.loginUser(SID, usernameOrEmail, Userpass,
storePermanent, language_id, ldapConfigId);
+
+ if (returnValue instanceof Long) {
+ return returnValue;
+ } else if (returnValue instanceof Users) {
+ Users us = (Users) returnValue;
+ if
(AuthLevelmanagement.getInstance().checkUserLevel(us.getLevel_id())) {
+ return us;
+ } else {
+ return -52L;
+ }
+ }
+
+ return returnValue;
+
+ }
/**
* auth function, use the SID you get by getsessiondata
=======================================
---
/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomService.java
Sat Apr 2 02:21:16 2011
+++
/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomService.java
Mon Apr 18 05:08:54 2011
@@ -50,7 +50,7 @@
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
Long User_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(User_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(User_level)){
List<Rooms> roomList =
Roommanagement.getInstance().getPublicRooms(User_level, roomtypes_id);
//We need to re-marshal the Rooms object cause Axis2 cannot use our
objects
@@ -83,7 +83,7 @@
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
FlvRecordingDaoImpl.getInstance().deleteFlvRecording(flvRecordingId);
}
@@ -100,7 +100,7 @@
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
List<FlvRecording> recordingList =
FlvRecordingDaoImpl.getInstance().getFlvRecordingByExternalUserId(Long.parseLong(externalUserId));
//We need to re-marshal the Rooms object cause Axis2 cannot use our
objects
@@ -133,7 +133,7 @@
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
List<FlvRecording> recordingList =
FlvRecordingDaoImpl.getInstance().getFlvRecordingByExternalRoomTypeAndCreator(externalRoomType,
insertedBy);
//We need to re-marshal the Rooms object cause Axis2 cannot use our
objects
@@ -166,7 +166,7 @@
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
return
FlvRecordingDaoImpl.getInstance().getFlvRecordingByExternalRoomType(externalRoomType);
}
@@ -184,7 +184,7 @@
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
List<FlvRecording> recordingList =
FlvRecordingDaoImpl.getInstance().getFlvRecordingByExternalRoomType(externalRoomType);
//We need to re-marshal the Rooms object cause Axis2 cannot use our
objects
@@ -217,7 +217,7 @@
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
List<FlvRecording> recordingList =
FlvRecordingDaoImpl.getInstance().getFlvRecordingByRoomId(roomId);
@@ -297,7 +297,7 @@
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
LinkedList<Integer> roomIds = new
LinkedList<Integer>();
@@ -387,7 +387,7 @@
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
Rooms room =
Roommanagement.getInstance().getRoomById(user_level,rooms_id);
@@ -845,7 +845,7 @@
Long user_level =
Usermanagement.getInstance().getUserLevelByID(
users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
Date dFrom = null;
Date dTo = null;
@@ -954,7 +954,7 @@
Long user_level =
Usermanagement.getInstance().getUserLevelByID(
users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
Date dFrom = null;
Date dTo = null;
@@ -1059,7 +1059,7 @@
Long user_level =
Usermanagement.getInstance().getUserLevelByID(
users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
Calendar calFrom = Calendar.getInstance();
calFrom.setTime(fromDate);
@@ -1205,7 +1205,7 @@
Long user_level =
Usermanagement.getInstance().getUserLevelByID(
users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
Date dFrom = null;
Date dTo = null;
@@ -1284,7 +1284,7 @@
Long user_level =
Usermanagement.getInstance().getUserLevelByID(
users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
Appointment appointment =
AppointmentDaoImpl.getInstance().getAppointmentByRoom(room_id);
@@ -1317,7 +1317,7 @@
Long user_level =
Usermanagement.getInstance().getUserLevelByID(
users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
Appointment appointment =
AppointmentDaoImpl.getInstance().getAppointmentByRoom(room_id);
@@ -1351,7 +1351,7 @@
log.debug("closeRoom 1 "+room_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
log.debug("closeRoom 2 "+status);
=======================================
---
/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserService.java
Thu Nov 4 04:04:47 2010
+++
/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserService.java
Mon Apr 18 05:08:54 2011
@@ -103,7 +103,7 @@
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
Configuration conf =
Configurationmanagement.getInstance().getConfKey(3L, "default.timezone");
String jName_timeZone = "";
@@ -160,7 +160,7 @@
Long user_level =
Usermanagement.getInstance().getUserLevelByID(
users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)) {
+ if (AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level))
{
Long user_id =
Usermanagement.getInstance().registerUser(
username, userpass,
@@ -215,7 +215,7 @@
try {
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
RemoteSessionObject remoteSessionObject = new
RemoteSessionObject(username, firstname, lastname,
profilePictureUrl, email);
@@ -270,7 +270,7 @@
try {
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
RemoteSessionObject remoteSessionObject = new
RemoteSessionObject(username, firstname, lastname,
profilePictureUrl, email,
externalUserId, externalUserType);
@@ -311,7 +311,7 @@
try {
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
RemoteSessionObject remoteSessionObject = new
RemoteSessionObject(username, firstname, lastname,
profilePictureUrl, email,
externalUserId, externalUserType);
@@ -374,7 +374,7 @@
try {
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
RemoteSessionObject remoteSessionObject = new
RemoteSessionObject(username, firstname, lastname,
profilePictureUrl, email,
externalUserId, externalUserType);
@@ -434,7 +434,7 @@
try {
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
RemoteSessionObject remoteSessionObject = new
RemoteSessionObject(username, firstname, lastname,
profilePictureUrl, email,
externalUserId, externalUserType);
@@ -487,7 +487,7 @@
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
RemoteSessionObject remoteSessionObject = new
RemoteSessionObject(username, firstname, lastname,
profilePictureUrl, email,
externalUserId, externalUserType);
@@ -551,7 +551,7 @@
try {
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
RemoteSessionObject remoteSessionObject = new
RemoteSessionObject(username, firstname, "",
"", "", externalUserId,
externalUserType);
@@ -600,7 +600,7 @@
try {
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
return
Organisationmanagement.getInstance().addUserToOrganisation(user_id,
organisation_id, users_id, comment);
@@ -617,7 +617,7 @@
try {
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
return
Organisationmanagement.getInstance().getUsersSearchResultByOrganisationId(organisation_id,
start, max, orderby, asc);
} else {
log.error("Need Administration Account");
--
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.
