[jira] [Commented] (OPENMEETINGS-762) Callers of TimezoneUtil.getTimezoneByInternalJName should be checked to work as expected
[ https://issues.apache.org/jira/browse/OPENMEETINGS-762?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13777194#comment-13777194 ] Vasiliy Degtyarev commented on OPENMEETINGS-762: LDAP ligin is fixed: revision 1526115 > Callers of TimezoneUtil.getTimezoneByInternalJName should be checked to work > as expected > > > Key: OPENMEETINGS-762 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-762 > Project: Openmeetings > Issue Type: Sub-task > Components: HTML5 >Affects Versions: 3.0.0 Apache Release >Reporter: Maxim Solodovnik > Fix For: 3.0.0 Apache Release > > > The following methods calling > org.apache.openmeetings.utils.TimezoneUtil.getTimezoneByInternalJName(String) > should be checked to work as expected > org.apache.openmeetings.remote.UserService.addAppointmentToUser(String, > String, User, List, Room, Date, Date, Boolean, Boolean, String) > org.apache.openmeetings.data.user.UserManager.addUserWithExternalKey(long, > int, int, String, String, String, long, boolean, String, Address, Date, > String, String, String, boolean, String, String, String) > org.apache.openmeetings.ldap.LdapLoginManagement.createUserFromLdapData(HashMap String>, String, String, HashMap) > org.apache.openmeetings.utils.BackupImport.readUserList(InputSource, String) > org.apache.openmeetings.data.user.UserManager.registerUserInit(long, long, > int, int, String, String, String, String, String, Date, String, String, > String, String, long, String, long, boolean, List, String, boolean, > String, Boolean, String, Boolean, String, String, Boolean, Boolean) > org.apache.openmeetings.data.calendar.management.AppointmentLogic.saveAppointment(String, > Long, String, String, Date, Date, Boolean, Boolean, Boolean, Boolean, Long, > Long, List, Long, String, Long, Boolean, String, long) > org.apache.openmeetings.data.calendar.daos.AppointmentDao.updateAppointment(Long, > String, String, Date, Date, Boolean, Boolean, Boolean, Boolean, Long, Long, > List, Long, String, Long, Boolean, String, String) > org.apache.openmeetings.ldap.LdapLoginManagement.updateUserFromLdap(HashMap String>, HashMap, User) > org.apache.openmeetings.remote.UserService.updateUserSelfTimeZone(String, > String) -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
svn commit: r1526115 - in /openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings: ldap/LdapLoginManagement.java utils/BackupImport.java utils/TimezoneUtil.java
Author: vdegtyarev
Date: Wed Sep 25 06:21:46 2013
New Revision: 1526115
URL: http://svn.apache.org/r1526115
Log:
OPENMEETINGS-762: Ldap login is fixed. JName time zone is removed from ldap.
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupImport.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/TimezoneUtil.java
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java?rev=1526115&r1=1526114&r2=1526115&view=diff
==
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java
Wed Sep 25 06:21:46 2013
@@ -662,15 +662,12 @@ public class LdapLoginManagement {
&& userdata.get(ldapAttrs.get("pictureUri")) !=
null)
pictureUri = userdata.get(ldapAttrs.get("pictureUri"));
- String jName_timeZone = "";
- if (userdata.containsKey(ldapAttrs.get("timezoneAttr"))
- && userdata.get(ldapAttrs.get("timezoneAttr"))
!= null)
- jName_timeZone =
userdata.get(ldapAttrs.get("timezoneAttr"));
-
- if (timezoneUtil.getTimezoneByInternalJName(jName_timeZone) ==
null) {
- jName_timeZone = configurationDao.getConfValue(
- "default.timezone", String.class,
"Europe/Berlin");
+ String iCalTz = "";
+ if (userdata.containsKey(ldapAttrs.get("timezoneAttr")) &&
userdata.get(ldapAttrs.get("timezoneAttr")) != null) {
+ iCalTz = userdata.get(ldapAttrs.get("timezoneAttr"));
}
+
+ iCalTz = timezoneUtil.getTimeZone(iCalTz).getID();
String town = "town";
if (userdata.containsKey(ldapAttrs.get("townAttr"))
@@ -703,7 +700,7 @@ public class LdapLoginManagement {
false,
"",// BaseURL is empty as we do not
send an Email here
false,// send verification code
- jName_timeZone,
+ iCalTz,
false, // forceTimeZoneCheck
"", //userOffers
"", //userSearchs
@@ -820,13 +817,13 @@ public class LdapLoginManagement {
user.setPictureuri(userdata.get(ldapAttrs.get("pictureUri")));
}
- String jName_timeZone = "";
- if (userdata.containsKey(ldapAttrs.get("timezoneAttr"))
- && userdata.get(ldapAttrs.get("timezoneAttr"))
!= null) {
- jName_timeZone =
userdata.get(ldapAttrs.get("timezoneAttr"));
-
user.setTimeZoneId(timezoneUtil.getTimezoneByInternalJName(jName_timeZone).getID());
+ String iCalTz = "";
+ if (userdata.containsKey(ldapAttrs.get("timezoneAttr")) &&
userdata.get(ldapAttrs.get("timezoneAttr")) != null) {
+ iCalTz = userdata.get(ldapAttrs.get("timezoneAttr"));
}
-
+
+ iCalTz = timezoneUtil.getTimeZone(iCalTz).getID();
+ user.setTimeZoneId(iCalTz);
}
}
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupImport.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupImport.java?rev=1526115&r1=1526114&r2=1526115&view=diff
==
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupImport.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupImport.java
Wed Sep 25 06:21:46 2013
@@ -813,7 +813,7 @@ public class BackupImport {
do {
if (u.getTimeZoneId() == null &&
"omTimeZone".equals(item2.getName())) {
String jName = item2.getValue();
- u.setTimeZoneId(jName == null ?
null : tzUtil.getTimezoneByInternalJName(jName, true).getID());
+ u.s
[jira] [Resolved] (OPENMEETINGS-804) updateRoomWithModerationQuestionsAudioTypeAndHideOptions sets isAudioOnly always to true
[ https://issues.apache.org/jira/browse/OPENMEETINGS-804?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik resolved OPENMEETINGS-804. --- Resolution: Fixed Fix Version/s: 2.2.0 Apache Release 3.0.0 Apache Release Assignee: Maxim Solodovnik revision 1526101 Thanks for the detailed report > updateRoomWithModerationQuestionsAudioTypeAndHideOptions sets isAudioOnly > always to true > > > Key: OPENMEETINGS-804 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-804 > Project: Openmeetings > Issue Type: Bug > Components: SOAP/REST API >Affects Versions: 2.1.1 Apache Release > Environment: all >Reporter: Uwe Kohnle >Assignee: Maxim Solodovnik > Fix For: 3.0.0 Apache Release, 2.2.0 Apache Release > > Original Estimate: 0.25h > Remaining Estimate: 0.25h > > i mentioned a bug in RoomWebService.java in public Long > updateRoomWithModerationQuestionsAudioTypeAndHideOptions. > Boolean isAudioOnly is not in roomManager.updateRoomInternal. This is the > reason why updateRoomWithModerationQuestionsAudioTypeAndHideOptions sets > isAudioOnly always to true. > roomManager.updateRoomInternal(room_id, roomtypes_id, > name, ispublic, comment, numberOfPartizipants, null, > appointment, isDemoRoom, demoTime, isModeratedRoom, > null, allowUserQuestions, true, true, false, "", "", > Last line should be changed to: > null, allowUserQuestions, isAudioOnly, true, false, "", "", -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
svn commit: r1526101 - in /openmeetings: branches/2.x/src/org/apache/openmeetings/axis/services/RoomWebService.java trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/RoomWebServic
Author: solomax
Date: Wed Sep 25 03:56:28 2013
New Revision: 1526101
URL: http://svn.apache.org/r1526101
Log:
[OPENMEETINGS-804] isAudioOnly parameter passed correctly
Modified:
openmeetings/branches/2.x/src/org/apache/openmeetings/axis/services/RoomWebService.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/RoomWebService.java
Modified:
openmeetings/branches/2.x/src/org/apache/openmeetings/axis/services/RoomWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.x/src/org/apache/openmeetings/axis/services/RoomWebService.java?rev=1526101&r1=1526100&r2=1526101&view=diff
==
---
openmeetings/branches/2.x/src/org/apache/openmeetings/axis/services/RoomWebService.java
(original)
+++
openmeetings/branches/2.x/src/org/apache/openmeetings/axis/services/RoomWebService.java
Wed Sep 25 03:56:28 2013
@@ -1359,7 +1359,7 @@ public class RoomWebService {
return roomManager.updateRoomInternal(room_id,
roomtypes_id,
name, ispublic, comment,
numberOfPartizipants, null,
appointment, isDemoRoom,
demoTime, isModeratedRoom,
- null, allowUserQuestions, true,
true, false, "", "",
+ null, allowUserQuestions,
isAudioOnly, true, false, "", "",
null, null, null, hideTopBar,
hideChat,
hideActivitiesAndActions,
hideFilesExplorer,
hideActionsMenu,
hideScreenSharing, hideWhiteboard,
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/RoomWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/RoomWebService.java?rev=1526101&r1=1526100&r2=1526101&view=diff
==
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/RoomWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/RoomWebService.java
Wed Sep 25 03:56:28 2013
@@ -49,9 +49,9 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.record.FlvRecording;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.room.Invitation;
+import org.apache.openmeetings.db.entity.room.Invitation.Valid;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.RoomType;
-import org.apache.openmeetings.db.entity.room.Invitation.Valid;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.remote.ConferenceService;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
@@ -1375,7 +1375,7 @@ public class RoomWebService {
return roomManager.updateRoomInternal(room_id,
roomtypes_id,
name, ispublic, comment,
numberOfPartizipants, null,
appointment, isDemoRoom,
demoTime, isModeratedRoom,
- null, allowUserQuestions, true,
true, false, "", "",
+ null, allowUserQuestions,
isAudioOnly, true, false, "", "",
null, null, null, hideTopBar,
hideChat,
hideActivitiesAndActions,
hideFilesExplorer,
hideActionsMenu,
hideScreenSharing, hideWhiteboard,
[jira] [Created] (OPENMEETINGS-804) updateRoomWithModerationQuestionsAudioTypeAndHideOptions sets isAudioOnly always to true
Uwe Kohnle created OPENMEETINGS-804: --- Summary: updateRoomWithModerationQuestionsAudioTypeAndHideOptions sets isAudioOnly always to true Key: OPENMEETINGS-804 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-804 Project: Openmeetings Issue Type: Bug Components: SOAP/REST API Affects Versions: 2.1.1 Apache Release Environment: all Reporter: Uwe Kohnle i mentioned a bug in RoomWebService.java in public Long updateRoomWithModerationQuestionsAudioTypeAndHideOptions. Boolean isAudioOnly is not in roomManager.updateRoomInternal. This is the reason why updateRoomWithModerationQuestionsAudioTypeAndHideOptions sets isAudioOnly always to true. roomManager.updateRoomInternal(room_id, roomtypes_id, name, ispublic, comment, numberOfPartizipants, null, appointment, isDemoRoom, demoTime, isModeratedRoom, null, allowUserQuestions, true, true, false, "", "", Last line should be changed to: null, allowUserQuestions, isAudioOnly, true, false, "", "", -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Resolved] (OPENMEETINGS-795) #build 595 languages/languages.xml (No such file or directory)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-795?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jarosław Maciejewski resolved OPENMEETINGS-795. --- Resolution: Fixed > #build 595 languages/languages.xml (No such file or directory) > -- > > Key: OPENMEETINGS-795 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-795 > Project: Openmeetings > Issue Type: Bug >Affects Versions: 3.0.0 Apache Release >Reporter: Jarosław Maciejewski >Assignee: Maxim Solodovnik >Priority: Minor > Labels: newbie > > When I'm trying to display http://IP_SERVER:5080/openmeetings/install I see > error: > http://pastebin.com/HyvmM93H > Log red5.log http://pastebin.com/sXmAW2V2 > Log openmeetings.log http://pastebin.com/sxPvc6jb > With stable 2.x version I don't have any problems. > I'm using a .tar.gz 'ready-to-use' package > I'm using Ubuntu, Oracle Java, JDK 8 -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (OPENMEETINGS-795) #build 595 languages/languages.xml (No such file or directory)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-795?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13776310#comment-13776310 ] Jarosław Maciejewski commented on OPENMEETINGS-795: --- uhhh.. it's working.. thank you very much... I let you know, what I detected errors > #build 595 languages/languages.xml (No such file or directory) > -- > > Key: OPENMEETINGS-795 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-795 > Project: Openmeetings > Issue Type: Bug >Affects Versions: 3.0.0 Apache Release >Reporter: Jarosław Maciejewski >Assignee: Maxim Solodovnik >Priority: Minor > Labels: newbie > > When I'm trying to display http://IP_SERVER:5080/openmeetings/install I see > error: > http://pastebin.com/HyvmM93H > Log red5.log http://pastebin.com/sXmAW2V2 > Log openmeetings.log http://pastebin.com/sxPvc6jb > With stable 2.x version I don't have any problems. > I'm using a .tar.gz 'ready-to-use' package > I'm using Ubuntu, Oracle Java, JDK 8 -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (OPENMEETINGS-803) Image files are not visible for attendees on whiteboard
[ https://issues.apache.org/jira/browse/OPENMEETINGS-803?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13776091#comment-13776091 ] Vasiliy Degtyarev commented on OPENMEETINGS-803: At revision: 1525808 for 2.2.0 At revision: 1525809 for 3.0.0 > Image files are not visible for attendees on whiteboard > --- > > Key: OPENMEETINGS-803 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-803 > Project: Openmeetings > Issue Type: Bug > Components: SWF10Video >Affects Versions: 3.0.0 Apache Release, 2.2.0 Apache Release >Reporter: Vasiliy Degtyarev >Assignee: Vasiliy Degtyarev > > If load image file to whiteboard on the localhost server then this image is > not visible for attendees -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Resolved] (OPENMEETINGS-803) Image files are not visible for attendees on whiteboard
[ https://issues.apache.org/jira/browse/OPENMEETINGS-803?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Vasiliy Degtyarev resolved OPENMEETINGS-803. Resolution: Fixed Fix Version/s: 2.2.0 Apache Release 3.0.0 Apache Release > Image files are not visible for attendees on whiteboard > --- > > Key: OPENMEETINGS-803 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-803 > Project: Openmeetings > Issue Type: Bug > Components: SWF10Video >Affects Versions: 3.0.0 Apache Release, 2.2.0 Apache Release >Reporter: Vasiliy Degtyarev >Assignee: Vasiliy Degtyarev > Fix For: 3.0.0 Apache Release, 2.2.0 Apache Release > > > If load image file to whiteboard on the localhost server then this image is > not visible for attendees -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
svn commit: r1525809 - /openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx
Author: vdegtyarev
Date: Tue Sep 24 07:55:27 2013
New Revision: 1525809
URL: http://svn.apache.org/r1525809
Log:
OPENMEETINGS-803 is fixed. Image file is visible for attendees.
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx?rev=1525809&r1=1525808&r2=1525809&view=diff
==
---
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx
Tue Sep 24 07:55:27 2013
@@ -76,7 +76,8 @@
//if ($debug) Debug.write("addImageToLayer
",obj,nameing,urlname,posx,posy,width,height,alterModus,baseurl,fileName,moduleName,parentPath,room,domain);
//if ($debug) Debug.write("addImageToLayer posx ",posx);
- var src = baseurl+'?fileName=' +
encodeURIComponent(fileName) +
+ if ($debug) Debug.write("addImageToLayer urlname : ",
canvas.getUrl() + 'DownloadHandler');
+ var src = canvas.getUrl() + 'DownloadHandler' +
'?fileName=' + encodeURIComponent(fileName) +
'&moduleName=' + moduleName +
'&parentPath=' + encodeURIComponent(parentPath)
+
'&room_id=' + room +
svn commit: r1525808 - /openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx
Author: vdegtyarev
Date: Tue Sep 24 07:50:51 2013
New Revision: 1525808
URL: http://svn.apache.org/r1525808
Log:
OPENMEETINGS-803 is fixed. Image file is visible for attendees.
Modified:
openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx
Modified:
openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx?rev=1525808&r1=1525807&r2=1525808&view=diff
==
---
openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx
(original)
+++
openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx
Tue Sep 24 07:50:51 2013
@@ -39,7 +39,7 @@
- if ($debug) Debug.write("urlname: ",urlname);
+ if ($debug) Debug.write("urlname: ",canvas.getUrl());
var now = new Date();
//This invokes a Method which is in the remoteWhiteboard.lzx
this.startNewObjectSyncProcess.isStarting = true;
@@ -76,7 +76,8 @@
//if ($debug) Debug.write("addImageToLayer
",obj,nameing,urlname,posx,posy,width,height,alterModus,baseurl,fileName,moduleName,parentPath,room,domain);
//if ($debug) Debug.write("addImageToLayer posx ",posx);
- var src = baseurl+'?fileName=' +
encodeURIComponent(fileName) +
+ if ($debug) Debug.write("addImageToLayer urlname : ",
canvas.getUrl() + 'DownloadHandler');
+ var src = canvas.getUrl() + 'DownloadHandler' +
'?fileName=' + encodeURIComponent(fileName) +
'&moduleName=' + moduleName +
'&parentPath=' + encodeURIComponent(parentPath)
+
'&room_id=' + room +
[jira] [Created] (OPENMEETINGS-803) Image files are not visible for attendees on whiteboard
Vasiliy Degtyarev created OPENMEETINGS-803: -- Summary: Image files are not visible for attendees on whiteboard Key: OPENMEETINGS-803 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-803 Project: Openmeetings Issue Type: Bug Components: SWF10Video Affects Versions: 3.0.0 Apache Release, 2.2.0 Apache Release Reporter: Vasiliy Degtyarev Assignee: Vasiliy Degtyarev If load image file to whiteboard on the localhost server then this image is not visible for attendees -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
