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.setTimeZoneId(jName == null ?
null : tzUtil.getTimezoneByInternalJName(jName).getID());
}
item2 = listNode2.getNext(); //HACK to
handle old om_time_zone
} while (item2 != null &&
!"user".equals(item2.getName()));
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/TimezoneUtil.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/TimezoneUtil.java?rev=1526115&r1=1526114&r2=1526115&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/TimezoneUtil.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/TimezoneUtil.java
Wed Sep 25 06:21:46 2013
@@ -147,10 +147,6 @@ public class TimezoneUtil {
* @return
*/
public TimeZone getTimezoneByInternalJName(String jName) {
- return getTimezoneByInternalJName(jName, false);
- }
-
- public TimeZone getTimezoneByInternalJName(String jName, boolean
shouldThrow) {
if (ICAL_TZ_MAP.isEmpty()) {
initTimeZones();
}
@@ -159,17 +155,14 @@ public class TimezoneUtil {
if (omTimeZone == null) {
String err = String.format("There is not omTimeZone for
this jName: '%s'", jName);
log.error(err);
- if (shouldThrow) {
- throw new RuntimeException(err);
- }
+ throw new RuntimeException(err);
}
-
+
TimeZone timeZone = TimeZone.getTimeZone(omTimeZone);
if (timeZone != null) {
return timeZone;
}
-
// if user has not time zone get one from the server
configuration
return getDefaultTimeZone();
}
