no message

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

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

@@ -6,6 +6,7 @@
 
 package siprp.pagina;
 
+import javax.activation.*;
 import java.io.*;
 import java.util.*;
 
@@ -15,6 +16,7 @@ import javax.servlet.*;
 import javax.servlet.http.*;
 import java.sql.*;
 
+import org.apache.commons.mail.*;
 import org.apache.velocity.*;
 import org.apache.velocity.app.*;
 
@@ -180,6 +182,8 @@ 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));

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

@@ -12,6 +12,8 @@ import java.util.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
 
+import org.apache.commons.fileupload.*;
+
 /**
  *
  * @author  psantos
@@ -33,11 +35,53 @@ public class RecruitServlet extends MailerServlet
 	public void doPost( HttpServletRequest req, HttpServletResponse res )
 		throws IOException
 	{
+		Hashtable parameters;
+		String fileName = "";
+		byte file[] = new byte[0];
+		boolean isMultipart = FileUpload.isMultipartContent( req );
+		
 		ServletOutputStream out = res.getOutputStream();
 		res.setContentType( "text/html" );
 		
-		Hashtable parameters = parseParameters( new Hashtable( req.getParameterMap() ) );
+		if( isMultipart )
+		{
+			parameters = new Hashtable();
+			DiskFileUpload upload = new DiskFileUpload();
+			upload.setSizeThreshold(1000000);
+			upload.setSizeMax(1000000);
+			List items;
+			try
+			{
+				items = upload.parseRequest(req);
+			}
+			catch( FileUploadException ex )
+			{
+				out.println( showResultPage( false, "mail/pedido_enviado.html", "mail/pedido_nao_enviado.html" ) );
+				return;
+			}
+			Iterator iter = items.iterator();
+			while( iter.hasNext() )
+			{
+				FileItem item = (FileItem) iter.next();
 
+				if (item.isFormField())
+				{
+					String name = item.getFieldName();
+					String value = item.getString();
+					parameters.put( name, value );
+				}
+				else
+				{
+					String fieldName = item.getFieldName();
+					fileName = item.getName();
+					file = item.get();
+				}
+			}
+		}
+		else
+		{
+			parameters = parseParameters( new Hashtable( req.getParameterMap() ) );
+		}
 		String content = createContent( parameters, FORM_FIELDS, "mail/envio_cv.txt" );
 
 		String from = ( String ) parameters.get( REC_EMAIL );
@@ -49,9 +93,18 @@ public class RecruitServlet extends MailerServlet
 		String destination = email;
 		String subject = "Envio de CV através do site www.siprp.pt";
 		// manda mail
-		boolean success = sendMail( from, destination, subject, content, false );
+		boolean success;
+		if( isMultipart )
+		{
+			success = sendMail( from, destination, subject, content, false, fileName, file );
+		}
+		else
+		{
+			success = sendMail( from, destination, subject, content, false );
+		}
 
 		// mostra pagina correspondente
+		
 		out.println( showResultPage( success, "mail/pedido_enviado.html", "mail/pedido_nao_enviado.html" ) );
 	}
 }

trunk/html/conteudos/colaboradores_text.html

@@ -16,7 +16,7 @@ Esta página dá acesso a funcionalidades exclusivas e confidenciais
 		<span id='span_recrut_id' style="font-weight: bold; text-decoration: underline; cursor: pointer" onmousedown="return false;" onclick="showhide('recrut_id')">Junte-se a N&oacute;s</span><br>
 		<br>
 		<div id='recrut_id' style="display: none">
-			<form method='post' action='/siprpWeb/schedule' name='recrutamento' id='recrutamento' enctype='multipart/form-data'>
+			<form method='post' action='/siprpWeb/recruit' name='recrutamento' id='recrutamento' enctype='multipart/form-data'>
 			<table border='0' class='text'>
 			<tbody>
 			<tr>
@@ -79,7 +79,7 @@ Esta p&aacute;gina d&aacute; acesso a funcionalidades exclusivas e confidenciais
 					&nbsp;
 				</td>
 				<td align='right'>
-					<input type='submit' value='Marcar' onclick='return validateForm()'>
+					<input type='submit' value='Enviar' onclick='return validateForm()'>
 				</td>
 			</tr>
 			<tr>

trunk/html/frame_erro.html

@@ -57,7 +57,7 @@ class="menu" href="html/siprp.html" target="_ifrm">a SIPRP</a></td>
             <td style="width: 120px; vertical-align: top;"><a
 class="menu"  href="html/servicos.html" target="_ifrm">servi&ccedil;os</a></td>
             <td style="width: 120px; vertical-align: top;"><a
-class="menu" href="html/clientes.html" target="_ifrm">clientes</a></td>
+class="menu" href="html/colaboradores.html" target="_ifrm">colaboradores</a></td>
             <td style="width: 120px; vertical-align: top;"><a
 class="menu" href="html/contactos.html" target="_ifrm">contactos</a></td>
             <td style="width: 120px; vertical-align: top;"><a