svn commit: r1572926 - /openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/MainService.java

[vdegtyarev]

Author: vdegtyarev
Date: Fri Feb 28 11:46:16 2014
New Revision: 1572926

URL: http://svn.apache.org/r1572926
Log:
OOPENMEETINGS-932 is fixed. "Show sip dialer" menu item is not available

Modified:
    
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/MainService.java

Modified: 
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/MainService.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/MainService.java?rev=1572926&r1=1572925&r2=1572926&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/MainService.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/MainService.java
 Fri Feb 28 11:46:16 2014
@@ -21,6 +21,7 @@ package org.apache.openmeetings.remote;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MAX_UPLOAD_SIZE_KEY;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -175,7 +176,6 @@ public class MainService implements IPen
                                currentClient.setRoom_id(wicketroomid);
                                
SessionVariablesUtil.setUserId(current.getClient(), u.getUser_id());
                        
-                               currentClient.setUsername(u.getLogin());
                                currentClient.setFirstname(u.getFirstname());
                                currentClient.setLastname(u.getLastname());
                                currentClient.setPicture_uri(u.getPictureuri());
@@ -463,8 +463,13 @@ public class MainService implements IPen
 
        public List<Configuration> getGeneralOptions(String SID) {
                try {
-                       return configurationDao.get("exclusive.audio.keycode", 
"red5sip.enable", CONFIG_MAX_UPLOAD_SIZE_KEY,
-                                       "mute.keycode", 
CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY);
+                       List<Configuration> result = new 
ArrayList<Configuration>();
+                       
result.add(configurationDao.forceGet("exclusive.audio.keycode"));
+                       result.add(configurationDao.forceGet("red5sip.enable"));
+                       
result.add(configurationDao.forceGet(CONFIG_MAX_UPLOAD_SIZE_KEY));
+                       result.add(configurationDao.forceGet("mute.keycode"));
+                       
result.add(configurationDao.forceGet(CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY));
+                       return result;
                } catch (Exception err) {
                        log.error("[getLoginOptions]",err);
                }