addons

properties-templates/naviox.properties

@@ -7,7 +7,7 @@ initialPasswordForAdmin=admin
 # There are many more password options in Configuration module of XavaPro (http://www.openxava.org/xavapro)
 
 # Navigation options
-startInLastVisitedModule=true
+startInLastVisitedModule=false
 rememberVisitedModules=false
 showModulesMenuWhenNotLogged=true
 

src/com/openxava/naviox/LDAPAuthenticator.java

@@ -0,0 +1,38 @@
+package com.openxava.naviox;
+
+import java.util.*;
+
+import javax.naming.*;
+import javax.naming.directory.*;
+
+import com.openxava.naviox.util.*;
+
+public class LDAPAuthenticator {
+
+	public boolean authenticateUser(String username, String password, String userType) {
+
+		String ldapURL = (String)NaviOXPreferences.getInstance().getLDAPConfiguration(userType).get("ldapURL");
+		String ldapBase = (String)NaviOXPreferences.getInstance().getLDAPConfiguration(userType).get("ldapBase");
+		String dn = "uid=" + username + "," + ldapBase;
+		Hashtable<String, String> environment = new Hashtable<String, String>();
+		environment.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
+		environment.put(Context.PROVIDER_URL, ldapURL);
+		environment.put(Context.SECURITY_AUTHENTICATION, "simple");
+		environment.put(Context.SECURITY_PRINCIPAL, dn);
+		environment.put(Context.SECURITY_CREDENTIALS, password);
+
+		try {
+			DirContext authContext = new InitialDirContext(environment);
+			return true;
+
+		} catch (AuthenticationException ex) {
+			ex.printStackTrace();
+			return false;
+		}
+
+		catch (NamingException ex) {
+			ex.printStackTrace();
+			return false;
+		}
+	}
+}

src/com/openxava/naviox/Modules.java

@@ -63,6 +63,9 @@ public void reset() {
 		if (!NaviOXPreferences.getInstance().isStartInLastVisitedModule()) {
 			try {
 				getPreferences().remove("current");
+//				Preferences preferences = getPreferences();
+//		        preferences.remove("current");
+//		        preferences.flush();
 			} catch (BackingStoreException ex) {
 				log.warn(XavaResources.getString("current_module_problem"), ex);
 			}
@@ -313,7 +316,7 @@ private void storeModulesInPreferences(Collection<MetaModule> modules, String pr
 				preferences.remove(prefix + "module." + i);
 			}
 			if (storeCurrent && !"SignIn".equals(current.getName())) {
-				preferences.put("current", current.getName());
+				// Consultorio Juridico preferences.put("current", current.getName());
 			}
 
 			preferences.flush();

src/com/openxava/naviox/impl/SignInHelper.java

@@ -33,6 +33,12 @@ public static void signIn(HttpSession session, String userName, String userType)
 		session.setAttribute("naviox.user", userName);
 		session.setAttribute("naviox.userType", userType);
 		Modules modules = (Modules) session.getAttribute("modules");
+		modules.reset();
+	}
+
+	public static void signIn(HttpSession session, String userName) {
+		session.setAttribute("naviox.user", userName);
+		Modules modules = (Modules) session.getAttribute("modules");
 		modules.reset();		
 	}
 

src/com/openxava/naviox/util/NaviOXPreferences.java

@@ -123,7 +123,7 @@ public boolean isShowOrganizationOnSignIn() {
 	 * @since 5.3
 	 */
 	public boolean isStartInLastVisitedModule() { 
-		return "true".equalsIgnoreCase(getProperties().getProperty("startInLastVisitedModule", "true").trim());
+		return "true".equalsIgnoreCase(getProperties().getProperty("startInLastVisitedModule", "false").trim());
 	}
 
 	/**

src/com/openxava/naviox/web/NaviOXFilter.java

@@ -38,7 +38,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
 				String autologinUser = NaviOXPreferences.getInstance().getAutologinUser();
 				if (!Is.emptyString(autologinUser)) {
 					if (SignInHelper.isAuthorized(autologinUser, NaviOXPreferences.getInstance().getAutologinPassword())) {
-						SignInHelper.signIn(session, autologinUser, null);
+						SignInHelper.signIn(session, autologinUser);
 					}					
 				}
 			}

src/com/openxava/naviox/web/NaviOXServlet.java

@@ -25,7 +25,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 		}
 		String url = Browsers.isMobile(request)?"/p/" + uri[3]:"/naviox/index.jsp?application=" + uri[1] + "&module=" + uri[3];
 		RequestDispatcher dispatcher = request.getRequestDispatcher(url);		
-
+		response.setBufferSize(8192 * 16);
 		Style.setPotalInstance(NaviOXStyle.getInstance()); // We manage style in NaviOX as in the portal case, to override the style defined in xava.properties and by device 
 		dispatcher.forward(request, response);		
 	}

src/com/openxava/naviox/web/SecureRequest.java

@@ -12,6 +12,7 @@ public SecureRequest(ServletRequest request) {
 		super( (HttpServletRequest) request);
 	}
 
+
 	public String getRemoteUser() {			
 		return (String) ((HttpServletRequest) getRequest()).getSession().getAttribute("naviox.user");
 	}

web/index.jsp

@@ -1,14 +1,41 @@
+<%-- <%@page import="com.openxava.phone.web.Browsers"%> --%>
+<%-- <%@page import="org.openxava.util.Users"%> --%>
+
+<%-- <jsp:useBean id="modules" class="com.openxava.naviox.Modules" scope="session"/> --%>
+
+<%--
+Users.setCurrent(request); 
+// String module = Users.getCurrent() == null?"SignIn":modules.getCurrent(request);
+// String url = Browsers.isMobile(request)?"phone":"m/" + module;
+--%>
+
+<!-- <script type="text/javascript"> -->
+<%-- window.location="<%=url%>"; --%>
+<!-- </script> -->
+
+<%@page import="com.openxava.naviox.util.Organizations"%> 
 <%@page import="com.openxava.phone.web.Browsers"%>
 <%@page import="org.openxava.util.Users"%>
 
 <jsp:useBean id="modules" class="com.openxava.naviox.Modules" scope="session"/>
 
 <%
 Users.setCurrent(request); 
-String module = Users.getCurrent() == null?"SignIn":modules.getCurrent(request);
-String url = Browsers.isMobile(request)?"phone":"m/" + module;
+if (Users.getCurrent() != null || Organizations.getCurrent(request) != null) {
+	String module = Users.getCurrent() == null?"SignIn":modules.getCurrent(request);
+	String url = Browsers.isMobile(request) && !"Index".equals(modules.getCurrent(request))?"phone":"m/" + module;
 %>
 
 <script type="text/javascript">
 window.location="<%=url%>";
 </script>
+
+<%
+}
+else {
+%>
+<jsp:include page="naviox/welcome.jsp"/>
+<%
+}
+%>
+

web/naviox/firstSteps.jsp

@@ -1,15 +1 @@
-<%@include file="../xava/imports.jsp"%>
-
-<%-- To put your own text add entries in the i18n messages files of your project --%>
-
-<%
-String language = "es".equals(request.getLocale().getLanguage()) || "ca".equals(request.getLocale().getLanguage())?"es":"en";
-%>
-
-<div id="first_steps">
-<p><xava:message key="first_steps_p1"/></p>
-<p class="screenshot"><img src="../naviox/images/modules-screenshot_<%=language%>.png"/></p>
-<p><xava:message key="first_steps_p2"/></p>
-<p class="screenshot"><img src="../naviox/images/list-mode-screenshot_<%=language%>.png"/></p>
-<p><xava:message key="first_steps_p3"/></p>
-</div>
+<jsp:forward page="/m/TodayAgendaRequest"></jsp:forward>