no message

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

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

@@ -153,7 +153,7 @@ public class MailerServlet extends HttpServlet
 	}
 	
 	protected boolean sendMail( String from, String destination, String subject, String content, boolean html,
-								String filename, byte attachment[] )
+								String filename, byte attachment[], String type )
 	{
 		String smtp_server = "localhost";
 		String mailer = "Evolute Mailer";
@@ -182,11 +182,12 @@ public class MailerServlet extends HttpServlet
 			multipart.addBodyPart(messageBodyPart);
 
 			messageBodyPart = new MimeBodyPart();
-			messageBodyPart.setDataHandler(
-				new DataHandler( new ByteArrayDataSource( attachment, "/siprpWeb/test.txt" )));			
-//			DataSource source = new ByteDataSource(attachment);
 //			messageBodyPart.setDataHandler(
-//			  new DataHandler(source));
+//				new DataHandler( new ByteArrayDataSource( attachment, "/siprpWeb/test.txt" )));
+			messageBodyPart.setContent( attachment, content_type );
+			DataSource source = new ByteArrayDataSource(attachment, type);
+			messageBodyPart.setDataHandler(
+			  new DataHandler(source));
 			messageBodyPart.setFileName(filename);
 			
 			multipart.addBodyPart(messageBodyPart);

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

@@ -37,6 +37,7 @@ public class RecruitServlet extends MailerServlet
 	{
 		Hashtable parameters;
 		String fileName = "";
+		String type = "";
 		byte file[] = new byte[0];
 		boolean isMultipart = FileUpload.isMultipartContent( req );
 		
@@ -75,6 +76,7 @@ public class RecruitServlet extends MailerServlet
 					String fieldName = item.getFieldName();
 					fileName = item.getName();
 					file = item.get();
+					type = item.getContentType();
 				}
 			}
 		}
@@ -84,19 +86,27 @@ public class RecruitServlet extends MailerServlet
 		}
 		String content = createContent( parameters, FORM_FIELDS, "mail/envio_cv.txt" );
 
-		String from = ( String ) parameters.get( REC_EMAIL );
 		String email = DEFAULT_EMAIL;
 		if( PROPERTIES != null && PROPERTIES.containsKey( EMAIL_RECRUTAMENTO ) )
 		{
 			email = ( String ) PROPERTIES.get( EMAIL_RECRUTAMENTO );
 		}
+		String from = email;
 		String destination = email;
 		String subject = "Envio de CV através do site www.siprp.pt";
 		// manda mail
 		boolean success;
-		if( isMultipart )
+		String nome = ( String ) PROPERTIES.get( REC_NOME ); 
+		String telefone = ( String ) PROPERTIES.get( REC_TELEFONE );
+		String mail = ( String ) PROPERTIES.get( REC_EMAIL );
+		if( nome == null || nome.trim().length() == 0 || telefone == null || telefone.trim().length() == 0 ||
+			mail == null || mail.trim().length() == 0 || mail.indexOf( '@' ) == -1 )
+		{
+			success = false;
+		}
+		else if( isMultipart )
 		{
-			success = sendMail( from, destination, subject, content, false, fileName, file );
+			success = sendMail( from, destination, subject, content, false, fileName, file, type );
 		}
 		else
 		{

trunk/html/conteudos/colaboradores_text.html

@@ -25,12 +25,12 @@ Esta página dá acesso a funcionalidades exclusivas e confidenciais
 				</td>
 				<td>
 					<select name='rec_funcao' id='rec_funcao'>
-						<option VALUE='0'>T&eacute;cnico de Higiene e Seguran&ccedil;a</option>
+						<option VALUE='T&eacute;cnico de Higiene e Seguran&ccedil;a'>T&eacute;cnico de Higiene e Seguran&ccedil;a</option>
-						<option VALUE='1'>T&eacute;cnico Superior de Higiene e Seguran&ccedil;a</option>
+						<option VALUE='T&eacute;cnico Superior de Higiene e Seguran&ccedil;a'>T&eacute;cnico Superior de Higiene e Seguran&ccedil;a</option>
-						<option VALUE='2'>M&eacute;dico do Trabalho</option>
+						<option VALUE='M&eacute;dico do Trabalho'>M&eacute;dico do Trabalho</option>
-						<option VALUE='3'>M&eacute;dico Curativa</option>
+						<option VALUE='M&eacute;dico Curativa'>M&eacute;dico Curativa</option>
-						<option VALUE='4'>Enfermeiro</option>
+						<option VALUE='Enfermeiro'>Enfermeiro</option>
-						<option VALUE='5' SELECTED>Outros</option>
+						<option VALUE='Outros' SELECTED>Outros</option>
 					</select>
 				</td>
 			</tr>
@@ -60,7 +60,7 @@ Esta p&aacute;gina d&aacute; acesso a funcionalidades exclusivas e confidenciais
 			</tr>
 			<tr>
 				<td>
-					E-Mail:
+					E-Mail*:
 				</td>
 				<td>
 					<input type='text' id='rec_email' name='rec_email'  size='30'>

trunk/html/mail/cv_enviado.html

@@ -0,0 +1,11 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+	<link rel="stylesheet" href="html/css/style.css" type="text/css">
+	<title>Enviado</title>
+</head>
+<body class="text" style="background-color: transparent;">
+	A sua inform&ccedil;&atilde;o foi enviada com sucesso.
+</body>
+</html>

trunk/html/mail/cv_nao_enviado.html

@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+	<link rel="stylesheet" href="html/css/style.css" type="text/css">
+	<title>Erro a enviar</title>
+</head>
+<body class="text" style="background-color: transparent;">
+	Erro a enviar a sua inform&ccedil;&atilde;o.<br>
+	Verifique que preencheu "Nome Completo", "Telefone" e "E-Mail" com um valor v&aacute;lido.
+</body>
+</html>