Author: solomax
Date: Fri Apr 19 04:25:12 2013
New Revision: 1469684
URL: http://svn.apache.org/r1469684
Log:
[OPENMEETINGS-564] enter the room by invitation was broken with this fix;
code clean up
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/Version.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldValueDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/FeedbackManager.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/InvitationManager.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/EmailManager.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LanguageService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/Version.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/Version.java?rev=1469684&r1=1469683&r2=1469684&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/Version.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/Version.java
Fri Apr 19 04:25:12 2013
@@ -73,7 +73,7 @@ public class Version {
}
private static void getLine(StringBuilder sb, String text, char fill) {
- sb.append('#');
+ sb.append("\t#");
int l = text.length();
int headLength = (startedStringLength - l) / 2;
for (int i = 0; i < headLength; ++i) {
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDao.java?rev=1469684&r1=1469683&r2=1469684&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDao.java
Fri Apr 19 04:25:12 2013
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.data.basic;
+import static
org.apache.openmeetings.persistence.beans.basic.Configuration.DEFAUT_LANG_KEY;
+
import java.util.Date;
import java.util.List;
@@ -52,8 +54,7 @@ public class FieldLanguagesValuesDao imp
* @see org.apache.openmeetings.data.OmDAO#get(int, int)
*/
public List<Fieldlanguagesvalues> get(int first, int count) {
- return get(configurationDao.getConfValue("default_lang_id",
- Long.class, "1"), first, count);
+ return get(configurationDao.getConfValue(DEFAUT_LANG_KEY,
Long.class, "1"), first, count);
}
public List<Fieldlanguagesvalues> get(String search, int start, int
count, String sort) {
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldValueDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldValueDao.java?rev=1469684&r1=1469683&r2=1469684&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldValueDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldValueDao.java
Fri Apr 19 04:25:12 2013
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.data.basic;
+import static
org.apache.openmeetings.persistence.beans.basic.Configuration.DEFAUT_LANG_KEY;
+
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -46,7 +48,7 @@ public class FieldValueDao implements ID
private FieldLanguagesValuesDao flvDaoImpl;
private Long getDefaultLanguage() {
- return configurationDao.getConfValue("default_lang_id",
Long.class, "1");
+ return configurationDao.getConfValue(DEFAUT_LANG_KEY,
Long.class, "1");
}
public Fieldvalues get(long id) {
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java?rev=1469684&r1=1469683&r2=1469684&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
Fri Apr 19 04:25:12 2013
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.data.calendar.management;
+import static
org.apache.openmeetings.persistence.beans.basic.Configuration.DEFAUT_LANG_KEY;
+
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -424,7 +426,7 @@ public class AppointmentLogic {
return;
}
- Long language_id =
configurationDao.getConfValue("default_lang_id", Long.class, "1");
+ Long language_id =
configurationDao.getConfValue(DEFAUT_LANG_KEY, Long.class, "1");
// Get the required labels one time for all meeting members. The
// Language of the email will be the system default language
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/FeedbackManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/FeedbackManager.java?rev=1469684&r1=1469683&r2=1469684&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/FeedbackManager.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/FeedbackManager.java
Fri Apr 19 04:25:12 2013
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.data.conference;
+import static
org.apache.openmeetings.persistence.beans.basic.Configuration.DEFAUT_LANG_KEY;
+
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.FieldManager;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
@@ -42,8 +44,7 @@ public class FeedbackManager {
public String sendFeedback(String username, String email, String
message) {
try {
- Long default_lang_id = configurationDao.getConfValue(
- "default_lang_id", Long.class, "1");
+ Long default_lang_id =
configurationDao.getConfValue(DEFAUT_LANG_KEY, Long.class, "1");
String template =
feedbackTemplate.getFeedBackTemplate(username,
email, message, default_lang_id);
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/InvitationManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/InvitationManager.java?rev=1469684&r1=1469683&r2=1469684&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/InvitationManager.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/InvitationManager.java
Fri Apr 19 04:25:12 2013
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.data.conference;
+import static
org.apache.openmeetings.persistence.beans.basic.Configuration.DEFAUT_LANG_KEY;
+
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
@@ -624,9 +626,6 @@ public class InvitationManager {
invitation_link += "&language=" + language_id.toString();
}
- // Long default_lang_id = Long.valueOf(cfgManagement.
- //
getConfKey(3,"default_lang_id").getConf_value()).longValue();
-
String template =
invitationTemplate.getRegisterInvitationTemplate(
fromUserField, message,
invitation_link, language_id, dStart,
dEnd);
@@ -866,8 +865,6 @@ public class InvitationManager {
invitation_link += "&language=" + language_id.toString();
}
- // Long default_lang_id = Long.valueOf(cfgManagement.
- //
getConfKey(3,"default_lang_id").getConf_value()).longValue();
String template =
invitationTemplate.getRegisterInvitationTemplate(
fromUserField, message,
invitation_link, language_id, starttime,
endtime);
@@ -946,7 +943,7 @@ public class InvitationManager {
+ "&room=" + room +
"&roomtype=" + roomtype + "&email="
+ email + "&roomid=" + room_id;
- Long default_lang_id =
configurationDao.getConfValue("default_lang_id", Long.class, "1");
+ Long default_lang_id =
configurationDao.getConfValue(DEFAUT_LANG_KEY, Long.class, "1");
String template = invitationTemplate
.getRegisterInvitationTemplate(username, message,
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/EmailManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/EmailManager.java?rev=1469684&r1=1469683&r2=1469684&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/EmailManager.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/EmailManager.java
Fri Apr 19 04:25:12 2013
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.data.user;
+import static
org.apache.openmeetings.persistence.beans.basic.Configuration.DEFAUT_LANG_KEY;
+
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
@@ -73,7 +75,7 @@ public class EmailManager {
if (sendEmailAtRegister == 1) {
- Long default_lang_id =
configurationDao.getConfValue("default_lang_id", Long.class, "1");
+ Long default_lang_id =
configurationDao.getConfValue(DEFAUT_LANG_KEY, Long.class, "1");
String template = null;
if (sendEmailWithVerficationCode) {
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java?rev=1469684&r1=1469683&r2=1469684&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java
Fri Apr 19 04:25:12 2013
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.data.user;
+import static
org.apache.openmeetings.persistence.beans.basic.Configuration.DEFAUT_LANG_KEY;
+
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
@@ -1293,7 +1295,7 @@ public class UserManager {
String email = us.getAdresses().getEmail();
- Long default_lang_id =
configurationDao.getConfValue("default_lang_id", Long.class, "1");
+ Long default_lang_id =
configurationDao.getConfValue(DEFAUT_LANG_KEY, Long.class, "1");
String template =
resetPasswordTemplate.getResetPasswordTemplate(
reset_link, default_lang_id);
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java?rev=1469684&r1=1469683&r2=1469684&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
Fri Apr 19 04:25:12 2013
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.data.user.dao;
+import static
org.apache.openmeetings.persistence.beans.basic.Configuration.DEFAUT_LANG_KEY;
+
import java.util.Date;
import java.util.List;
@@ -82,8 +84,7 @@ public class UsersDao implements IDataPr
user.setSalutations_id(1L); // TODO: Fix default selection to be
//
configurable
user.setLevel_id(1L);
- user.setLanguage_id(configurationDao.getConfValue(
- "default_lang_id", Long.class, "1"));
+
user.setLanguage_id(configurationDao.getConfValue(DEFAUT_LANG_KEY, Long.class,
"1"));
user.setOmTimeZone(omTimeZoneDaoImpl.getDefaultOmTimeZone(currentUser));
user.setForceTimeZoneCheck(false);
user.setSendSMS(false);
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1469684&r1=1469683&r2=1469684&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
Fri Apr 19 04:25:12 2013
@@ -19,6 +19,7 @@
package org.apache.openmeetings.installation;
import static
org.apache.openmeetings.persistence.beans.basic.Configuration.CRYPT_KEY;
+import static
org.apache.openmeetings.persistence.beans.basic.Configuration.DEFAUT_LANG_KEY;
import java.io.File;
import java.util.Arrays;
@@ -304,7 +305,7 @@ public class ImportInitvalues {
"Name of the Browser Title window");
// "1" == "EN"
- configurationDao.add("default_lang_id", cfg.defaultLangId,
+ configurationDao.add(DEFAUT_LANG_KEY, cfg.defaultLangId,
null, "Default System Language ID see
language.xml");
configurationDao.add("swftools_zoom", cfg.swfZoom, null,
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java?rev=1469684&r1=1469683&r2=1469684&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
Fri Apr 19 04:25:12 2013
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.ldap;
+import static
org.apache.openmeetings.persistence.beans.basic.Configuration.DEFAUT_LANG_KEY;
+
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
@@ -703,8 +705,7 @@ public class LdapLoginManagement {
new java.util.Date(), //age
street,
additionalname, fax, zip, state_id,
town,
-
configurationDao.getConfValue("default_lang_id",
- Long.class, "0"), //
language_id
+
configurationDao.getConfValue(DEFAUT_LANG_KEY, Long.class, "1"), // language_id
false, // sendWelcomeMessage
Arrays.asList(configurationDao.getConfValue(
"default_domain_id",
Long.class, null)), // organozation
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java?rev=1469684&r1=1469683&r2=1469684&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java
Fri Apr 19 04:25:12 2013
@@ -58,6 +58,8 @@ import org.simpleframework.xml.Root;
public class Configuration implements Serializable, IDataProviderEntity {
private static final long serialVersionUID = -6129473946508963339L;
public static final String CRYPT_KEY = "crypt_ClassName";
+ public static final String DEFAUT_LANG_KEY = "default_lang_id";
+
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java?rev=1469684&r1=1469683&r2=1469684&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
Fri Apr 19 04:25:12 2013
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.remote;
+import static
org.apache.openmeetings.persistence.beans.basic.Configuration.DEFAUT_LANG_KEY;
+
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -31,6 +33,7 @@ import org.apache.openmeetings.Openmeeti
import org.apache.openmeetings.cluster.beans.ServerDTO;
import org.apache.openmeetings.data.basic.AuthLevelUtil;
import org.apache.openmeetings.data.basic.SessiondataDao;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.data.basic.dao.ServerDao;
import org.apache.openmeetings.data.beans.basic.SearchResult;
import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
@@ -85,6 +88,8 @@ public class ConferenceService {
private ISessionManager sessionManager = null;
@Autowired
private ServerDao serverDao;
+ @Autowired
+ private ConfigurationDao cfgDao;
/**
* ( get a List of all available Rooms of this organization
@@ -413,7 +418,8 @@ public class ConferenceService {
Long user_level = userManager.getUserLevelByID(users_id);
if (authLevelUtil.checkUserLevel(user_level)) {
User user = userManager.getUserById(users_id);
- return
roomManager.getAllRoomTypes(user.getLanguage_id());
+ return roomManager.getAllRoomTypes(user == null
+ ? cfgDao.getConfValue(DEFAUT_LANG_KEY,
Long.class, "1") : user.getLanguage_id());
}
return null;
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LanguageService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LanguageService.java?rev=1469684&r1=1469683&r2=1469684&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LanguageService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LanguageService.java
Fri Apr 19 04:25:12 2013
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.remote;
+import static
org.apache.openmeetings.persistence.beans.basic.Configuration.DEFAUT_LANG_KEY;
+
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -81,7 +83,7 @@ public class LanguageService {
}
public Integer getDefaultLanguage() {
- return configurationDao.getConfValue("default_lang_id",
Integer.class, "1");
+ return configurationDao.getConfValue(DEFAUT_LANG_KEY,
Integer.class, "1");
}
/**
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java?rev=1469684&r1=1469683&r2=1469684&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
Fri Apr 19 04:25:12 2013
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.remote;
+import static
org.apache.openmeetings.persistence.beans.basic.Configuration.DEFAUT_LANG_KEY;
+
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
@@ -670,7 +672,7 @@ public class UserService {
Long language_id = userToAdd.getLanguage_id();
if (language_id == null) {
- language_id =
configurationDao.getConfValue("default_lang_id", Long.class, "1");
+ language_id =
configurationDao.getConfValue(DEFAUT_LANG_KEY, Long.class, "1");
}
String message = "";
@@ -898,7 +900,7 @@ public class UserService {
Long language_id =
user.getLanguage_id();
if (language_id == null) {
- language_id =
configurationDao.getConfValue("default_lang_id", Long.class, "1");
+ language_id =
configurationDao.getConfValue(DEFAUT_LANG_KEY, Long.class, "1");
}
String message = "";
@@ -1063,7 +1065,7 @@ public class UserService {
Long language_id =
from.getLanguage_id();
if (language_id == null) {
- language_id =
configurationDao.getConfValue("default_lang_id", Long.class, "1");
+ language_id =
configurationDao.getConfValue(DEFAUT_LANG_KEY, Long.class, "1");
}
String invitation_link = null;
User to =
userManager.getUserByEmail(email);
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java?rev=1469684&r1=1469683&r2=1469684&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java
Fri Apr 19 04:25:12 2013
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.servlet.outputhandler;
+import static
org.apache.openmeetings.persistence.beans.basic.Configuration.DEFAUT_LANG_KEY;
+
import java.util.Date;
import javax.servlet.http.HttpServletRequest;
@@ -52,7 +54,7 @@ public class ActivateUser extends BaseVe
String loginURL = OpenmeetingsVariables.webAppRootPath;
Long default_lang_id = getBean(ConfigurationDao.class)
- .getConfValue("default_lang_id",
Long.class, "1");
+ .getConfValue(DEFAUT_LANG_KEY,
Long.class, "1");
ctx.put("APP_NAME",
getBean(ConfigurationDao.class).getAppName());
if (hash == null) {
// No hash
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java?rev=1469684&r1=1469683&r2=1469684&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
Fri Apr 19 04:25:12 2013
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.web.app;
+import static
org.apache.openmeetings.persistence.beans.basic.Configuration.DEFAUT_LANG_KEY;
+
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Calendar;
@@ -113,7 +115,7 @@ public class WebSession extends Abstract
if (session.isSignedIn()) {
return
Application.getBean(UsersDao.class).get(session.userId).getLanguage_id();
} else {
- return
Application.getBean(ConfigurationDao.class).getConfValue("default_lang_id",
Long.class, "1");
+ return
Application.getBean(ConfigurationDao.class).getConfValue(DEFAUT_LANG_KEY,
Long.class, "1");
}
}
