Revision: 2549
Author: seba.wagner
Date: Tue Oct 27 12:27:49 2009
Log: Fix:
Advanced SOAP Login with single Hash Param
Configuration Administration fixed
Binary SWFs
http://code.google.com/p/openmeetings/source/detail?r=2549
Modified:
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
/trunk/singlewebapp/WebContent/openmeetings/main.lzx.swf8.swf
/trunk/singlewebapp/WebContent/openmeetings/maindebug.lzx.swf8.swf
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/conferenceMenubar.lzx
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Configurationmanagement.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/dao/SOAPLoginDAO.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Tue Oct 27 06:35:26 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Tue Oct 27 12:27:49 2009
@@ -251,7 +251,7 @@
<![CDATA[
canvas.thishib.loaderVar.close();
//The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("loginUserByRemote:
",value);
+ if ($debug) Debug.write("secureLoginByRemote:
",value);
if (value<0){
} else {
@@ -299,7 +299,7 @@
canvas.setAttribute('official_code','');
canvas.setAttribute('picture_uri','');
canvas.setAttribute('language','');
- canvas.setAttribute('currentuser',value.login);
+ //canvas.setAttribute('currentuser',value.login);
parent.getRoomById.doCall();
}
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/main.lzx.swf8.swf Tue Oct
27 08:01:22 2009
+++ /trunk/singlewebapp/WebContent/openmeetings/main.lzx.swf8.swf Tue Oct
27 12:27:49 2009
Binary file, no diff available.
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/maindebug.lzx.swf8.swf Tue
Oct 27 08:01:22 2009
+++ /trunk/singlewebapp/WebContent/openmeetings/maindebug.lzx.swf8.swf Tue
Oct 27 12:27:49 2009
File is too large to display a diff.
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/conferenceMenubar.lzx
Tue Oct 27 06:35:26 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/conferenceMenubar.lzx
Tue Oct 27 12:27:49 2009
@@ -45,7 +45,7 @@
<_labelMenu labelid="245" width="250">
<handler name="oninit">
<![CDATA[
- if (canvas.isinitRoomDirect || canvas.remoteUserLogin)
{
+ if (canvas.isinitRoomDirect || canvas.remoteUserLogin |
| canvas.secureRemoteUserLogin) {
if ($debug) Debug.write("this mbarcontent ",this);
parent._exitbtn.destroy();
}
@@ -153,7 +153,7 @@
<_labelMenu labelid="245" width="250">
<handler name="oninit">
<![CDATA[
- if (canvas.isinitRoomDirect || canvas.remoteUserLogin)
{
+ if (canvas.isinitRoomDirect || canvas.remoteUserLogin |
| canvas.secureRemoteUserLogin) {
if ($debug) Debug.write("this mbarcontent ",this);
parent._exitbtn.destroy();
}
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Configurationmanagement.java
Mon Oct 26 08:27:13 2009
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Configurationmanagement.java
Tue Oct 27 12:27:49 2009
@@ -216,10 +216,14 @@
return this.addConfig(conf);
} else {
log.info("update Configuration ID:
"+conf.getConfiguration_id());
- conf.setUser_id(users_id);
- conf.setDeleted("false");
- conf.setUpdatetime(new Date());
- return this.updateConfig(conf);
+ Configuration conf2 =
this.getConfByConfigurationId(3L,
conf.getConfiguration_id());
+ conf2.setComment(conf.getComment());
+ conf2.setConf_key(conf.getConf_key());
+
conf2.setConf_value(conf.getConf_value());
+ conf2.setUser_id(users_id);
+ conf2.setDeleted("false");
+ conf2.setUpdatetime(new Date());
+ return this.updateConfig(conf2);
}
} else {
log.error("[saveOrUpdateConfByConfigurationId]
Error: Permission
denied");
@@ -274,7 +278,16 @@
conf.setUsers(UsersDaoImpl.getInstance().getUser(users_id));
conf.setUpdatetime(new Date());
conf.setDeleted("true");
- this.updateConfig(conf);
+
+ Configuration conf2 =
this.getConfByConfigurationId(3L,
conf.getConfiguration_id());
+ conf2.setComment(conf.getComment());
+ conf2.setConf_key(conf.getConf_key());
+ conf2.setConf_value(conf.getConf_value());
+ conf2.setUser_id(users_id);
+ conf2.setDeleted("true");
+ conf2.setUpdatetime(new Date());
+
+ this.updateConfig(conf2);
return new Long(1);
} else {
log.error("Error: Permission denied");
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/dao/SOAPLoginDAO.java
Tue Oct 27 06:35:26 2009
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/dao/SOAPLoginDAO.java
Tue Oct 27 12:27:49 2009
@@ -72,8 +72,8 @@
public SOAPLogin getSOAPLoginByHash(String hash) {
try {
- String hql = "select c from SOAPLogin as sl " +
- "WHERE c.hash != :hash";
+ String hql = "select sl from SOAPLogin as sl " +
+ "WHERE sl.hash LIKE
:hash";
Object idf = HibernateUtil.createSession();
Session session = HibernateUtil.getSession();
Transaction tx = session.beginTransaction();
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
Tue Oct 27 06:35:26 2009
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
Tue Oct 27 12:27:49 2009
@@ -299,7 +299,7 @@
SOAPLogin soapLogin =
SOAPLoginDAO.getInstance().getSOAPLoginByHash(secureHash);
- if (!soapLogin.getUsed()) {
+ if (soapLogin.getUsed()) {
return -42L;
} else {
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
