no message

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

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

@@ -19,4 +19,6 @@ public interface GlobalConstants
     public static final String bdPassword = "";
     public static final String bdDriver = "org.postgresql.Driver";
     public static final String bdUrl = "jdbc:postgresql://" + bdHost + ":" + bdPort + "/siprp";
+	
+	public static final String DEFAULT_EMAIL = "fpalma@evolute.pt";
 }

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

@@ -13,15 +13,23 @@ import javax.mail.*;
 import javax.mail.internet.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
+import java.sql.*;
 
 import org.apache.velocity.*;
 import org.apache.velocity.app.*;
+
+import com.evolute.utils.arrays.*;
 /**
  *
  * @author  psantos
  */
 public class MailerServlet extends HttpServlet
+	implements GlobalConstants
 {
+	public static final String EMAIL = "email";
+	
+	protected static Hashtable PROPERTIES;
+	
 	public void init()
 	{
 
@@ -32,6 +40,19 @@ public class MailerServlet extends HttpServlet
 			Properties props = new Properties();
 			props.setProperty( "file.resource.loader.path", TEMPLATE_DIR );
 			Velocity.init( props );
+			if( PROPERTIES == null )
+			{
+				Class.forName(bdDriver);
+				Connection con = DriverManager.getConnection( bdUrl, bdUsername, bdPassword );
+				Statement stmt = con.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
+				ResultSet2DArray array = new ResultSet2DArray( 
+					stmt.executeQuery( "Select name, value FROM properties;" ) );
+				PROPERTIES = new Hashtable();
+				for( int n = 0; n < array.columnLength(); n++ )
+				{
+					PROPERTIES.put( array.get( n, 0 ), array.get( n, 1 ) );
+				}
+			}
 		}
 		catch( Exception e )
 		{
@@ -113,7 +134,7 @@ public class MailerServlet extends HttpServlet
 			msg.setContent( content.toString(), content_type );
 
 			msg.setHeader( "X-Mailer", mailer );
-			msg.setSentDate( new Date() );
+			msg.setSentDate( new java.util.Date() );
 			Transport.send( msg );
 
 			return true;

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

@@ -71,8 +71,17 @@ public class RelatorioServlet extends MailerServlet
 		parameters.put( EMPRESA, session.getAttribute( siprpServlet.sessionCompanyName ) );
 		String from = ( String ) session.getAttribute( siprpServlet.sessionCompanyEmail );
 		
-		String destination = "fpalma@evolute.pt";
-		String subject = "Pedido de envio de relatório via web";
+		String email = DEFAULT_EMAIL;
+		if( PROPERTIES != null && PROPERTIES.containsKey( EMAIL ) )
+		{
+			email = ( String ) PROPERTIES.get( EMAIL );
+		}
+		String destination = email;
+		String subject = "Pedido de envio de relatorio via web";
+		if( parameters.get( ANO ) == null )
+		{
+			parameters.put( ANO, "corrente" );
+		}
 		String content = createContent( parameters, FORM_FIELDS, "relatorio/pedido.html" );
 		// manda mail
 		boolean success = sendMail( from, destination, subject, content, true );

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

@@ -47,7 +47,12 @@ public class RequestServlet extends MailerServlet
 		String content = createContent( parameters, FORM_FIELDS, "mail/pedido_informacao.txt" );
 
 		String from = ( String ) parameters.get( REQUEST_EMAIL );
-		String destination = "psantos@evolute.pt";
+		String email = DEFAULT_EMAIL;
+		if( PROPERTIES != null && PROPERTIES.containsKey( EMAIL ) )
+		{
+			email = ( String ) PROPERTIES.get( EMAIL );
+		}
+		String destination = email;
 		String subject = "Pedido de informação através do site www.siprp.pt";
 		// manda mail
 		boolean success = sendMail( from, destination, subject, content, false );

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

@@ -96,7 +96,12 @@ public class ScheduleServlet extends MailerServlet
 
 		String marcacao_tipo = ( String )parameters.get( MARCACAO_TIPO );
 		
-		String destination = "fpalma@evolute.pt";
+		String email = DEFAULT_EMAIL;
+		if( PROPERTIES != null && PROPERTIES.containsKey( EMAIL ) )
+		{
+			email = ( String ) PROPERTIES.get( EMAIL );
+		}
+		String destination = email;
 		String subject = "Pedido de marcação de " + marcacao_tipo + " via web";
 		String content = createContent( parameters, FORM_FIELDS, "marcacao/marcacao.html" );
 		// manda mail