Revision: 3747 Author: seba.wagner Date: Tue Apr 26 02:04:46 2011 Log: [No log message] http://code.google.com/p/openmeetings/source/detail?r=3747
Modified:/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
/trunk/singlewebapp/WebContent/openmeetings/base/mainAttributes.lzx/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserService.java
=======================================--- /trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx Wed Apr 20 04:02:07 2011 +++ /trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx Tue Apr 26 02:04:46 2011
@@ -357,6 +357,8 @@//Somehow this leads to a bug in the implementation of the secure User Login
canvas.setAttribute('user_id',value.user_id);
+
+
canvas.setAttribute('allowRecording',value.allowRecording);
canvas.setAttribute('firstName',value.firstname);
canvas.setAttribute('lastName',value.lastname);
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/base/mainAttributes.lzx Wed
Apr 20 05:32:18 2011
+++ /trunk/singlewebapp/WebContent/openmeetings/base/mainAttributes.lzx Tue
Apr 26 02:04:46 2011
@@ -373,4 +373,7 @@ <attribute name="currentFileExplorer" value="null"/> +<attribute name="allowRecording" value="true" type="boolean" /> + + </library> =======================================--- /trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserService.java Mon Apr 18 11:24:35 2011 +++ /trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserService.java Tue Apr 26 02:04:46 2011
@@ -348,7 +348,8 @@
false, //allowSameURLMultipleTimes
null, //recording_id
false, //showNickNameDialogAsInt
-
"room" //LandingZone
+
"room", //LandingZone,
+
true //allowRecording
);
if (hash != null) {
@@ -411,7 +412,8 @@
true, //allowSameURLMultipleTimes
null, //recording_id
false, //showNickNameDialogAsInt
-
"room" //LandingZone
+
"room", //LandingZone,
+
true //allowRecording
);
if (hash != null) {
@@ -426,6 +428,74 @@
}
return ""+new Long(-1);
}
+
+ public String setUserObjectAndGenerateRoomHashByURLAndRecFlag(String SID,
String username, String firstname, String lastname,
+ String profilePictureUrl, String email, Long externalUserId, String
externalUserType,
+ Long room_id, int becomeModeratorAsInt, int showAudioVideoTestAsInt,
int allowRecording){
+ log.debug("UserService.setUserObject");
+
+ try {
+ Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
+ Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)){
+
+ RemoteSessionObject remoteSessionObject = new
RemoteSessionObject(username, firstname, lastname,
+ profilePictureUrl, email,
externalUserId, externalUserType);
+
+ log.debug("username "+username);
+ log.debug("firstname "+firstname);
+ log.debug("lastname "+lastname);
+ log.debug("profilePictureUrl
"+profilePictureUrl);
+ log.debug("email "+email);
+ log.debug("externalUserId "+externalUserId);
+ log.debug("externalUserType "
+externalUserType);
+ log.debug("allowRecording " +allowRecording);
+
+ //XStream xStream = new XStream(new
XppDriver());
+ XStream xStream = new XStream(new
DomDriver("UTF-8"));
+ xStream.setMode(XStream.NO_REFERENCES);
+ String xmlString =
xStream.toXML(remoteSessionObject);
+
+ log.debug("xmlString "+xmlString);
+
+ Sessionmanagement.getInstance().updateUserRemoteSession(SID,
xmlString);
+
+ boolean becomeModerator = false;
+ if (becomeModeratorAsInt != 0) {
+ becomeModerator = true;
+ }
+
+ boolean showAudioVideoTest = false;
+ if (showAudioVideoTestAsInt != 0) {
+ showAudioVideoTest = true;
+ }
+
+ boolean allowRecordingBool = false;
+ if (allowRecording != 0) {
+ allowRecordingBool = true;
+ }
+
+ String hash =
SOAPLoginDaoImpl.getInstance().addSOAPLogin(SID, room_id,
+
becomeModerator,showAudioVideoTest,
+
true, //allowSameURLMultipleTimes
+
null, //recording_id
+
false, //showNickNameDialogAsInt
+
"room", //LandingZone,
+
allowRecordingBool //allowRecording
+
);
+
+ if (hash != null) {
+ return hash;
+ }
+
+ } else {
+ return ""+new Long(-26);
+ }
+ } catch (Exception err){
+ log.error("setUserObjectWithAndGenerateRoomHash",err);
+ }
+ return ""+new Long(-1);
+ }
public String setUserObjectMainLandingZone(String SID, String username,
String firstname, String lastname,
String profilePictureUrl, String email, Long externalUserId, String
externalUserType){
@@ -461,7 +531,8 @@
true, //allowSameURLMultipleTimes
null, //recording_id
false, //showNickNameDialogAsInt
-
"dashboard" //LandingZone
+
"dashboard", //LandingZone,
+
true //allowRecording
);
if (hash != null) {
@@ -531,7 +602,8 @@
String hash =
SOAPLoginDaoImpl.getInstance().addSOAPLogin(SID, room_id,
becomeModerator,showAudioVideoTest,true, null,
showNickNameDialog,
-
"room" //LandingZone
+
"room", //LandingZone,
+
true //allowRecording
);
if (hash != null) {
@@ -582,7 +654,8 @@
true, //allowSameURLMultipleTimes
recording_id, //recording_id
false, //showNickNameDialogAsInt
-
"room" //LandingZone
+
"room", //LandingZone,
+
true //allowRecording
);
if (hash != 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.
