no message

git-svn-id: https://svn.coded.pt/svn/SIPRP@462 bb69d46d-e84e-40c8-a05a-06db0d633741

trunk/WEB-INF/classes/siprp/pagina/doPostLogin.java

@@ -43,9 +43,9 @@ System.out.println( "doPostLogin()" );
                 
                     stmt = con.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
                     rs = new ResultSet2DArray( stmt.executeQuery( dbQuery.toString()) );
-                
-                
-                    if ( password.equals((String)rs.get(0,0)))
+					
+					
+                    if ( rs.columnLength() > 0 && password.equals((String)rs.get(0,0)))
                     {
                         // Obter Role
                     

trunk/WEB-INF/classes/siprp/pagina/siprpServlet.java

@@ -14,18 +14,18 @@ import org.apache.velocity.app.*;
 public class siprpServlet extends HttpServlet
 {
     // MSG
-    public static final String msgErroNoUser = "Tem de especificar um utilizador";
-    public static final String msgErroAuthFail = "Utilizador inexistente e/ou Password errada";
-    public static final String msgErroBd = "Erro na liga\u00E7\u00E3o \u00E0 base de dados";
+    public static final String msgErroNoUser = "Tem+de+especificar+um+utilizador.";
+    public static final String msgErroAuthFail = "Utilizador+inexistente+e/ou+Password+errada.";
+    public static final String msgErroBd = "Erro+na+ligaç&atiolde;o+à+base+de+dados.";
     public static final String msgGenericError = "Erro";
     public static final String msgListaEmpresas = "Empresas";
-    public static final String msgAcessoNegado = "Acesso Negado";
-    public static final String msgLinkFormatError ="URL inv\u00E1lido";
+    public static final String msgAcessoNegado = "Acesso+Negado.";
+    public static final String msgLinkFormatError ="URL+inválido.";
     public static final String msgLogin = "Login";
-    public static final String msgNovaPasswordErrada="Erro ao criar a nova password, nova password inv\u00E1lida";
-    public static final String msgButtonNotSuported = "funcionalidade ainda n\u00E3o suportada" ;
-    public static final String msgSessionTimeout = "ERRO Por raz&otilde;es de seguran&ccedil;a o tempo da sua sess&atilde;o expirou<br>" 
-													+ "Por favor efectue novamente o seu login.<br>";
+    public static final String msgNovaPasswordErrada="Erro+ao+criar+a+nova+password,+nova+password+inv&aacute;lida.";
+    public static final String msgButtonNotSuported = "funcionalidade+ainda+n&atilde;o+suportada.";
+    public static final String msgSessionTimeout = "Por+raz&otilde;es+de+seguran&ccedil;a+o+tempo+da+sua+sess&atilde;o+expirou<br>" 
+													+ "Por+favor+efectue+novamente+o+seu+login.<br>";
     
     // Templates - Nomes e valores
     //public static final String loginTemplate = "login.html";
@@ -33,6 +33,7 @@ public class siprpServlet extends HttpServlet
 	public static final String indexTemplate = "index.html";
 	public static final String authenticatedUserTemplate = "user.html";
 	public static final String errorTemplate = "frame_erro.html";
+	public static final String innerErrorTemplate = "erro.html";
 
     public static final String mainTemplate = "main.html";
     //public static final String criticalErrorTemplate = "critical.html";
@@ -45,6 +46,7 @@ public class siprpServlet extends HttpServlet
     public static final String buttonPressedTemplate ="buttonPressed";
     
     // Query Strings , usadas para na template do velocity saber o que mostar
+	public static final String queryStringErro = "erro";  
     public static final String queryStringEmpresas = "empresas";  
     public static final String queryStringEstabelecimentos="estabelecimentos";
     public static final String queryStringTrabalhadores ="trabalhadores";
@@ -126,6 +128,7 @@ System.out.println( "DIR: " + TEMPLATE_DIR );
         res.setContentType( "text/html" );
         try
         {
+System.out.println( "query: " + queryString );			
             HttpSession session = req.getSession(true);
             session.setMaxInactiveInterval(sessionTimeout);
             
@@ -142,6 +145,11 @@ System.out.println( "DIR: " + TEMPLATE_DIR );
             else if ( queryString.equals(queryStringEmpresas) ) // Listar Empresas
             {
                 new doGetListaEmpresas(req,res);
+            }
+			else if ( queryString.indexOf(queryStringErro) == 0 ) // Listar Empresas
+            {
+	System.out.println( "entrou" );
+                doErro(queryString, out);
             }
             else // interpretar query string
             {
@@ -163,7 +171,7 @@ System.out.println( "DIR: " + TEMPLATE_DIR );
                     }  
                 }
                 
-		if ( estabelecimento == null ) // empresa query
+				if ( estabelecimento == null ) // empresa query
                 {
                     session.setAttribute(sessionEmpresaId, empresa); // update HTTP Session
                     
@@ -555,6 +563,22 @@ System.out.println( "DIR: " + TEMPLATE_DIR );
         }
         return null;
     }
-    
+	
+	public void doErro( String queryString, ServletOutputStream out )
+		throws Exception
+	{
+		String split[] = queryString.split( "=" );
+		String err;
+		if( split.length > 1 )
+		{
+			err = split[ 1 ];
+		}
+		else
+		{
+			err = "Erro";
+		}
+		err = err.replace( '+', ' ' );
+		out.println( mergeTemplate( err, innerErrorTemplate) );
+	}
 }
 

trunk/html/erro.html

@@ -9,7 +9,7 @@
  cellpadding="0" cellspacing="0">
   <tbody>
     <tr>
-      <td class="title" style="background: transparent url(images/texto_topo.gif) no-repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; width: 588px; height: 29px; vertical-align: top;">&nbsp;&nbsp;erro<br>
+      <td class="title" style="background: transparent url(html/images/texto_topo.gif) no-repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; width: 588px; height: 29px; vertical-align: top;">&nbsp;&nbsp;erro<br>
       </td>
     </tr>
     <tr>
@@ -34,7 +34,7 @@
       </td>
     </tr>
     <tr>
-      <td style="width: 588px; height: 13px; vertical-align: top; background-image: url(images/texto_base.gif); background-repeat: no-repeat;"><br>
+      <td style="width: 588px; height: 13px; vertical-align: top; background-image: url(html/images/texto_base.gif); background-repeat: no-repeat;"><br>
       </td>
     </tr>
   </tbody>

trunk/html/frame_erro.html

@@ -71,7 +71,7 @@ class="menu" href="html/links.html" target="_ifrm">links</a></td>
           <tr>
             <td colspan="1" rowspan="3" style="vertical-align: top;"><!-- INICIO -->
 <!-- $!msg --> 
-<table style="width: 588px; text-align: left;" border="0"
+<!--<table style="width: 588px; text-align: left;" border="0"
  cellpadding="0" cellspacing="0">
   <tbody>
     <tr>
@@ -105,9 +105,10 @@ class="menu" href="html/links.html" target="_ifrm">links</a></td>
     </tr>
   </tbody>
 </table>
-<!--<iframe name="_ifrm" src="html/erro.html" marginwidth="0" marginheight="0"
+-->
+<iframe name="_ifrm" src="/siprpWeb/?erro=$msg" marginwidth="0" marginheight="0"
  frameborder="0" height="100%" width="588" allowtransparency='true'>
- </iframe>--><!--
+ </iframe><!--
 						<table style="width: 588px; text-align: left;" border="0" cellpadding="0" cellspacing="0">
 							<tbody>
 							<tr>