Subversion Repositories bacoAlunos

Rev

Rev 512 | Rev 810 | Go to most recent revision | Details | Compare with Previous | Last modification | View Log | RSS feed

Rev Author Line No. Line
29 jmachado 1
package pt.estgp.estgweb.services.email;
2
 
236 jmachado 3
import jomm.utils.TemplateUtils;
4
import org.apache.log4j.Logger;
5
import pt.estgp.estgweb.Globals;
751 jmachado 6
import pt.estgp.estgweb.utils.ConfigProperties;
358 jmachado 7
import pt.estgp.estgweb.web.utils.DatesUtils;
236 jmachado 8
import pt.estgp.estgweb.services.expceptions.ServiceException;
9
import pt.estgp.estgweb.domain.enums.LangEnum;
363 jmachado 10
import pt.estgp.estgweb.domain.*;
236 jmachado 11
import pt.estgp.estgweb.utils.Email;
12
import pt.utl.ist.berserk.logic.serviceManager.IService;
13
 
14
import javax.mail.MessagingException;
15
import javax.mail.Session;
16
import javax.mail.Message;
17
import javax.mail.Transport;
18
import javax.mail.internet.MimeMessage;
19
import javax.mail.internet.InternetAddress;
20
import java.util.ArrayList;
29 jmachado 21
import java.util.List;
236 jmachado 22
import java.util.Properties;
440 jmachado 23
import java.util.Date;
236 jmachado 24
import java.text.MessageFormat;
29 jmachado 25
 
26
/**
27
 * @author Jorge Machado
28
 * @date 20/Mar/2008
29
 * @time 18:31:00
30
 * @see pt.estgp.estgweb.services.email
31
 */
236 jmachado 32
public class SendEmailService implements IService
29 jmachado 33
{
236 jmachado 34
    private static final 1.5.0/docs/api/java/util/logging/Logger.html">Logger logger = 1.5.0/docs/api/java/util/logging/Logger.html">Logger.getLogger(SendEmailService.class);
35
 
36
    private static final 1.5.0/docs/api/java/lang/String.html">String gradeUnitTemplate = Globals.TEMPLATE_EMAIL_PATH + "/" + Globals.EMAIL_GRADE_UNIT_TEMPLATE;
37
 
38
    public void sendEmail(Email email) throws ServiceException
29 jmachado 39
    {
236 jmachado 40
        try{
41
 
42
            // Set up properties for mail session
43
            1.5.0/docs/api/java/util/Properties.html">Properties props = 1.5.0/docs/api/java/lang/System.html">System.getProperties();
44
            props.put("mail.smtp.host", Globals.EMAIL_SERVER_HOST);
45
 
46
            // Get session
47
            Session session = Session.getDefaultInstance(props, null);
48
 
49
            // Create message
50
            MimeMessage message = new MimeMessage(session);
51
            // Set the recipients of the message
298 jmachado 52
            boolean valid = false;
53
            for (1.5.0/docs/api/java/lang/String.html">String recipient : email.getRecipients())
54
            {
55
                if(Email.validEmail(recipient))
56
                {
57
                    valid=true;
419 jmachado 58
                    message.addRecipient(email.getType(),new InternetAddress(recipient));
298 jmachado 59
                }
236 jmachado 60
            }
298 jmachado 61
            if(valid)
62
            {
63
                1.5.0/docs/api/java/lang/String.html">String content = TemplateUtils.getOrLoadTemplate(Globals.TEMPLATE_EMAIL_PATH + "/" + email.getEmailTemplateName());
64
                // Format the mail message
65
                1.5.0/docs/api/java/lang/String.html">String fullMessage = 1.5.0/docs/api/java/text/MessageFormat.html">MessageFormat.format(content, email.getArguments().toArray());
236 jmachado 66
 
298 jmachado 67
                message.setFrom(new InternetAddress(email.getFrom()));
68
                message.setSubject(email.getSubject());
492 jmachado 69
                message.setText(fullMessage,"utf-8");
236 jmachado 70
 
490 jmachado 71
 
512 jmachado 72
                if(email.isHtml())
73
                    message.setHeader("Content-Type","text/html; charset=\"utf-8\"");
74
                else
75
                    message.setHeader("Content-Type","text/plain; charset=\"utf-8\"");
490 jmachado 76
                message.setHeader("Content-Transfer-Encoding", "quoted-printable");
492 jmachado 77
 
298 jmachado 78
                Transport.send(message);
79
            }
236 jmachado 80
        }
81
        catch(MessagingException e)
82
        {
83
            logger.error(e,e);
84
            throw new ServiceException(e.toString());
85
        }
29 jmachado 86
    }
236 jmachado 87
 
88
    public Email getSendUrlToFriendEmail(1.5.0/docs/api/java/lang/String.html">String url, 1.5.0/docs/api/java/lang/String.html">String from, LangEnum langEnum, List<String> recipients)
89
    {
90
        List<String> arguments = new ArrayList<String>();
91
        arguments.add(from);
92
        arguments.add(url);
93
        1.5.0/docs/api/java/lang/String.html">String subjectTxt;
94
        1.5.0/docs/api/java/lang/String.html">String template;
95
 
96
        if(langEnum == LangEnum.PORTUGUESE)
97
        {
98
            template = Globals.EMAIL_SEND_URL_FRIEND_TEMPLATE_PT;
237 jmachado 99
            subjectTxt = Globals.EMAIL_SEND_URL_FRIEND_SUBJECT_PT;
236 jmachado 100
        }
101
        else
102
        {
103
            template = Globals.EMAIL_SEND_URL_FRIEND_TEMPLATE_EN;
237 jmachado 104
            subjectTxt = Globals.EMAIL_SEND_URL_FRIEND_SUBJECT_EN;
236 jmachado 105
        }
106
 
107
        1.5.0/docs/api/java/lang/String.html">String subject = java.text.1.5.0/docs/api/java/text/MessageFormat.html">MessageFormat.format(subjectTxt,new 1.5.0/docs/api/java/lang/String.html">String[]{from});
108
        return new Email(subject ,recipients, Globals.SYSTEM_EMAIL_BOX,template,arguments);
109
    }
110
 
111
    public boolean sendUrlToFriend(1.5.0/docs/api/java/lang/String.html">String url, 1.5.0/docs/api/java/lang/String.html">String from, LangEnum langEnum, List<String> recipients)
112
    {
113
        try
114
        {
115
            sendEmail(getSendUrlToFriendEmail(url,from,langEnum,recipients));
116
            return true;
117
        }
118
        catch (ServiceException e)
119
        {
120
            return false;
121
        }
122
    }
123
 
237 jmachado 124
    public boolean sendCourseUnitAnnouncement(CourseUnitAnnouncement announcement, LangEnum langEnum, 1.5.0/docs/api/java/lang/String.html">String from,  List<User> users)
125
    {
126
        try
127
        {
128
            sendEmail(getCourseUnitAnnouncementEmail(announcement,langEnum,from,users));
129
            return true;
130
        }
131
        catch (ServiceException e)
132
        {
133
            return false;
134
        }
135
    }
236 jmachado 136
 
512 jmachado 137
    public Email getMessageEmail(1.5.0/docs/api/java/lang/String.html">String from, 1.5.0/docs/api/java/lang/String.html">String subject,1.5.0/docs/api/java/lang/String.html">String text, LangEnum langEnum, 1.5.0/docs/api/java/lang/String.html">String target, List<User> users, User user)
138
    {
139
//        # 0 : From
140
//        # 1 : Subject
141
//        # 2 : Text
142
//        # 3 : person
143
//        # 4 : target
144
        List<String> arguments = new ArrayList<String>();
145
        arguments.add(from);
146
        arguments.add(subject);
147
        arguments.add(text);
148
        arguments.add(user.getName());
149
        arguments.add(target);
150
 
151
        1.5.0/docs/api/java/lang/String.html">String template;
152
 
153
        if(langEnum == LangEnum.PORTUGUESE)
154
        {
155
            template = Globals.EMAIL_MESSAGE_TEMPLATE_PT;
156
        }
157
        else
158
        {
159
            template = Globals.EMAIL_MESSAGE_TEMPLATE_EN;
160
        }
161
 
162
        List<String> recipients = new ArrayList<String>();
163
        for(User u: users)
164
        {
165
            if(Email.validEmail(u.getEmail()))
166
                recipients.add(u.getEmail());
167
            if(Email.validEmail(u.getOutEmail()))
168
                recipients.add(u.getOutEmail());
169
        }
170
 
171
        return new Email(subject ,recipients,user.getEmail(),template,arguments,Message.RecipientType.BCC);
172
    }
173
 
237 jmachado 174
    public Email getCourseUnitAnnouncementEmail(CourseUnitAnnouncement announcement, LangEnum langEnum, 1.5.0/docs/api/java/lang/String.html">String from,  List<User> users)
175
    {
176
        List<String> arguments = new ArrayList<String>();
177
        arguments.add(announcement.getCourseUnit().getName());
178
        arguments.add(announcement.getTitle());
179
        arguments.add(announcement.getText());
180
        arguments.add(from);
181
 
182
        1.5.0/docs/api/java/lang/String.html">String subjectTxt;
183
        1.5.0/docs/api/java/lang/String.html">String template;
184
 
185
        if(langEnum == LangEnum.PORTUGUESE)
186
        {
187
            template = Globals.EMAIL_COURSEUNIT_ANNOUNCEMENT_TEMPLATE_PT;
188
            subjectTxt = Globals.EMAIL_COURSEUNIT_ANNOUNCEMENT_SUBJECT_PT;
189
        }
190
        else
191
        {
192
            template = Globals.EMAIL_COURSEUNIT_ANNOUNCEMENT_TEMPLATE_EN;
193
            subjectTxt = Globals.EMAIL_COURSEUNIT_ANNOUNCEMENT_SUBJECT_EN;
194
        }
195
 
196
        List<String> recipients = new ArrayList<String>();
197
        for(User u: users)
198
        {
298 jmachado 199
            if(Email.validEmail(u.getEmail()))
200
                recipients.add(u.getEmail());
419 jmachado 201
            if(Email.validEmail(u.getOutEmail()))
202
                recipients.add(u.getOutEmail());
237 jmachado 203
        }
204
 
205
        1.5.0/docs/api/java/lang/String.html">String subject = java.text.1.5.0/docs/api/java/text/MessageFormat.html">MessageFormat.format(subjectTxt,new 1.5.0/docs/api/java/lang/String.html">String[]{announcement.getCourseUnit().getNormalizedName(),announcement.getTitle()});
419 jmachado 206
        1.5.0/docs/api/java/lang/String.html">String fromEmail = Globals.SYSTEM_EMAIL_BOX;
207
        if(announcement.getOwner() != null && Email.validEmail(announcement.getOwner().getEmail()))
208
            fromEmail = announcement.getOwner().getEmail();
209
        return new Email(subject ,recipients,fromEmail,template,arguments,Message.RecipientType.BCC);
237 jmachado 210
    }
211
 
363 jmachado 212
    public Email getCourseUnitBlogPostEmail(BlogPost post, LangEnum langEnum, 1.5.0/docs/api/java/lang/String.html">String from,  List<User> users)
213
    {
214
        List<String> arguments = new ArrayList<String>();
215
        arguments.add(((CourseUnitBlog)post.getBlog()).getCourseUnit().getName());
216
        arguments.add(post.getTitle());
217
        arguments.add(post.getText());
218
        arguments.add(from);
237 jmachado 219
 
363 jmachado 220
        1.5.0/docs/api/java/lang/String.html">String subjectTxt;
221
        1.5.0/docs/api/java/lang/String.html">String template;
222
 
223
        if(langEnum == LangEnum.PORTUGUESE)
224
        {
225
            template = Globals.EMAIL_COURSEUNIT_BLOGPOST_TEMPLATE_PT;
226
            subjectTxt = Globals.EMAIL_COURSEUNIT_BLOGPOST_SUBJECT_PT;
227
        }
228
        else
229
        {
230
            template = Globals.EMAIL_COURSEUNIT_BLOGPOST_TEMPLATE_EN;
231
            subjectTxt = Globals.EMAIL_COURSEUNIT_BLOGPOST_SUBJECT_EN;
232
        }
233
 
234
        List<String> recipients = new ArrayList<String>();
235
        for(User u: users)
236
        {
237
            if(Email.validEmail(u.getEmail()))
238
                recipients.add(u.getEmail());
419 jmachado 239
            if(Email.validEmail(u.getOutEmail()))
240
                recipients.add(u.getOutEmail());
363 jmachado 241
        }
242
 
243
        1.5.0/docs/api/java/lang/String.html">String subject = java.text.1.5.0/docs/api/java/text/MessageFormat.html">MessageFormat.format(subjectTxt,new 1.5.0/docs/api/java/lang/String.html">String[]{((CourseUnitBlog)post.getBlog()).getCourseUnit().getNormalizedName(),post.getTitle()});
419 jmachado 244
        1.5.0/docs/api/java/lang/String.html">String fromEmail = Globals.SYSTEM_EMAIL_BOX;
245
        if(post.getOwner() != null && Email.validEmail(post.getOwner().getEmail()))
246
            fromEmail = post.getOwner().getEmail();
247
        return new Email(subject ,recipients, fromEmail, template,arguments,Message.RecipientType.BCC);
363 jmachado 248
    }
249
 
440 jmachado 250
    public Email getCourseUnitWorkEmail(CourseUnitAssignement assignement, LangEnum langEnum, UserSession userSession,  List<User> users, boolean newWork)
419 jmachado 251
    {
252
        List<String> arguments = new ArrayList<String>();
253
        arguments.add(assignement.getCourseUnit().getName());
254
        arguments.add(assignement.getTitle());
255
        arguments.add(assignement.getDescription());
440 jmachado 256
 
419 jmachado 257
        if(userSession != null && userSession.getName() != null)
258
            arguments.add(userSession.getName());
259
        else
260
            arguments.add("unknown");
363 jmachado 261
 
440 jmachado 262
        arguments.add( DatesUtils.getStringFromDate(assignement.getDeliverDate()));
492 jmachado 263
 
419 jmachado 264
        1.5.0/docs/api/java/lang/String.html">String subjectTxt;
265
        1.5.0/docs/api/java/lang/String.html">String template;
266
 
267
        if(langEnum == LangEnum.PORTUGUESE)
268
        {
440 jmachado 269
            if(newWork)
270
                template = Globals.EMAIL_COURSEUNIT_WORK_TEMPLATE_PT;
271
            else
272
                template = Globals.EMAIL_COURSEUNIT_WORK_CHANGE_TEMPLATE_PT;
419 jmachado 273
            subjectTxt = Globals.EMAIL_COURSEUNIT_WORK_SUBJECT_PT;
274
        }
275
        else
276
        {
440 jmachado 277
            if(newWork)
278
                template = Globals.EMAIL_COURSEUNIT_WORK_TEMPLATE_EN;
279
            else
280
                template = Globals.EMAIL_COURSEUNIT_WORK_CHANGE_TEMPLATE_EN;
419 jmachado 281
            subjectTxt = Globals.EMAIL_COURSEUNIT_WORK_SUBJECT_EN;
282
        }
283
 
284
        List<String> recipients = new ArrayList<String>();
285
        for(User u: users)
286
        {
287
            if(Email.validEmail(u.getEmail()))
288
                recipients.add(u.getEmail());
289
            if(Email.validEmail(u.getOutEmail()))
290
                recipients.add(u.getOutEmail());
291
        }
292
 
293
        1.5.0/docs/api/java/lang/String.html">String subject = java.text.1.5.0/docs/api/java/text/MessageFormat.html">MessageFormat.format(subjectTxt,new 1.5.0/docs/api/java/lang/String.html">String[]{assignement.getCourseUnit().getNormalizedName(),assignement.getTitle()});
294
 
295
        1.5.0/docs/api/java/lang/String.html">String fromEmail = Globals.SYSTEM_EMAIL_BOX;
296
        if(userSession!= null && userSession.getUser() != null && Email.validEmail(userSession.getUser().getEmail()))
297
            fromEmail = userSession.getUser().getEmail();
298
        return new Email(subject ,recipients,fromEmail,template,arguments,Message.RecipientType.BCC);
299
    }
300
 
301
 
302
 
236 jmachado 303
    public Email getNewGradesEmail(List<String[]> grades, LangEnum langEnum, 1.5.0/docs/api/java/lang/String.html">String studentEmail, 1.5.0/docs/api/java/lang/String.html">String studentName)
304
    {
305
        List<String> arguments = new ArrayList<String>();
306
 
307
        1.5.0/docs/api/java/lang/String.html">String subject;
308
        1.5.0/docs/api/java/lang/String.html">String template;
309
 
310
        if(langEnum == LangEnum.PORTUGUESE)
311
        {
312
            template = Globals.EMAIL_NEW_GRADES_TEMPLATE_PT;
237 jmachado 313
            subject = Globals.EMAIL_NEW_GRADES_SUBJECT_PT;
236 jmachado 314
        }
315
        else
316
        {
317
            template = Globals.EMAIL_NEW_GRADES_TEMPLATE_EN;
237 jmachado 318
            subject = Globals.EMAIL_NEW_GRADES_SUBJECT_EN;
236 jmachado 319
        }
320
 
321
        1.5.0/docs/api/java/lang/StringBuilder.html">StringBuilder gradesBuilder = new 1.5.0/docs/api/java/lang/StringBuilder.html">StringBuilder();
322
        for(1.5.0/docs/api/java/lang/String.html">String[] grade:  grades)
323
        {
324
            1.5.0/docs/api/java/lang/String.html">String gradeTxt = TemplateUtils.formatMessageTemplate(gradeUnitTemplate,grade);
325
            gradesBuilder.append(gradeTxt);
326
        }
327
 
328
        arguments.add(studentName);
329
        arguments.add(gradesBuilder.toString());
330
 
331
        List<String> recipients = new ArrayList<String>();
332
        recipients.add(studentEmail);
333
        return new Email(subject ,recipients, Globals.SYSTEM_EMAIL_BOX,template,arguments);
334
    }
335
 
358 jmachado 336
    public Email getSummaryEmail(List<String> emails, CourseUnitSummary cUS, CourseUnit c, LangEnum langEnum)
337
    {
338
        List<String> arguments = new ArrayList<String>();
339
 
340
        1.5.0/docs/api/java/lang/String.html">String data = DatesUtils.getStringFromDate(cUS.getDataAula());
341
        1.5.0/docs/api/java/lang/String.html">String subject;
342
        1.5.0/docs/api/java/lang/String.html">String template;
343
 
344
        if(langEnum == LangEnum.PORTUGUESE)
345
        {
346
            template = Globals.EMAIL_SUMMARY_TEMPLATE_PT;
347
            subject = Globals.EMAIL_SUMMARY_SUBJECT_PT;
348
        }
349
        else
350
        {
351
            template = Globals.EMAIL_SUMMARY_TEMPLATE_EN;
352
            subject = Globals.EMAIL_SUMMARY_SUBJECT_EN;
353
        }
354
        subject = TemplateUtils.formatMessageTemplate(subject,new 1.5.0/docs/api/java/lang/String.html">String[]{c.getName()});
355
 
356
        arguments.add(c.getName());
357
        arguments.add(""+cUS.getNumeroAula());
358
        arguments.add(data);
359
        arguments.add(cUS.getTitulo());
360
        arguments.add(cUS.getDescricao());
361
 
362
        List<String> recipients = new ArrayList<String>();
363
        for(1.5.0/docs/api/java/lang/String.html">String email:emails)
364
            recipients.add(email);
365
        return new Email(subject ,recipients, Globals.SYSTEM_EMAIL_BOX,template,arguments);
366
    }
367
 
751 jmachado 368
    public Email getUnidadeEdicaoEmail(List<String> emails, CourseUnit c, LangEnum langEnum)
369
    {
370
        List<String> arguments = new ArrayList<String>();
371
 
372
 
373
        1.5.0/docs/api/java/lang/String.html">String subject;
374
        1.5.0/docs/api/java/lang/String.html">String template;
375
 
376
        if(langEnum == LangEnum.PORTUGUESE)
377
        {
378
            template = Globals.EMAIL_UNDADE_EDICAO_TEMPLATE_PT;
379
            subject = Globals.EMAIL_UNDADE_EDICAO_SUBJECT_PT;
380
        }
381
        else
382
        {
383
            template = Globals.EMAIL_UNDADE_EDICAO_TEMPLATE_EN;
384
            subject = Globals.EMAIL_UNDADE_EDICAO_SUBJECT_EN;
385
        }
386
        subject = 1.5.0/docs/api/java/text/MessageFormat.html">MessageFormat.format(ConfigProperties.getProperty(subject),new 1.5.0/docs/api/java/lang/String.html">String[]{c.getName()});
387
 
388
        arguments.add(c.getName());
389
 
390
        List<String> recipients = new ArrayList<String>();
391
        for(1.5.0/docs/api/java/lang/String.html">String email:emails)
392
            recipients.add(email);
393
        return new Email(subject ,recipients, Globals.SYSTEM_EMAIL_BOX,template,arguments);
394
    }
395
 
396
     public Email getUnidadeValidadaEmail(List<String> emails, CourseUnit c, LangEnum langEnum)
397
    {
398
        List<String> arguments = new ArrayList<String>();
399
 
400
 
401
        1.5.0/docs/api/java/lang/String.html">String subject;
402
        1.5.0/docs/api/java/lang/String.html">String template;
403
 
404
        if(langEnum == LangEnum.PORTUGUESE)
405
        {
406
            template = Globals.EMAIL_UNDADE_VALIDADA_TEMPLATE_PT;
407
            subject = Globals.EMAIL_UNDADE_VALIDADA_SUBJECT_PT;
408
        }
409
        else
410
        {
411
            template = Globals.EMAIL_UNDADE_VALIDADA_TEMPLATE_EN;
412
            subject = Globals.EMAIL_UNDADE_VALIDADA_SUBJECT_EN;
413
        }
414
        subject = 1.5.0/docs/api/java/text/MessageFormat.html">MessageFormat.format(ConfigProperties.getProperty(subject),new 1.5.0/docs/api/java/lang/String.html">String[]{c.getName()});
415
 
416
        arguments.add(c.getName());
417
 
418
        List<String> recipients = new ArrayList<String>();
419
        for(1.5.0/docs/api/java/lang/String.html">String email:emails)
420
            recipients.add(email);
421
        return new Email(subject ,recipients, Globals.SYSTEM_EMAIL_BOX,template,arguments);
422
    }
423
 
424
    public Email getUnidadeEditadaEmail(List<String> emails, CourseUnit c, LangEnum langEnum)
425
    {
426
        List<String> arguments = new ArrayList<String>();
427
 
428
 
429
        1.5.0/docs/api/java/lang/String.html">String subject;
430
        1.5.0/docs/api/java/lang/String.html">String template;
431
 
432
        if(langEnum == LangEnum.PORTUGUESE)
433
        {
434
            template = Globals.EMAIL_UNDADE_EDITADA_TEMPLATE_PT;
435
            subject = Globals.EMAIL_UNDADE_EDITADA_SUBJECT_PT;
436
        }
437
        else
438
        {
439
            template = Globals.EMAIL_UNDADE_EDITADA_TEMPLATE_EN;
440
            subject = Globals.EMAIL_UNDADE_EDITADA_SUBJECT_EN;
441
        }
442
        subject = 1.5.0/docs/api/java/text/MessageFormat.html">MessageFormat.format(ConfigProperties.getProperty(subject),new 1.5.0/docs/api/java/lang/String.html">String[]{c.getName()});
443
 
444
        arguments.add(c.getCourseName());
445
        arguments.add(c.getName());
446
 
447
        List<String> recipients = new ArrayList<String>();
448
        for(1.5.0/docs/api/java/lang/String.html">String email:emails)
449
            recipients.add(email);
450
        return new Email(subject ,recipients, Globals.SYSTEM_EMAIL_BOX,template,arguments);
451
    }
452
 
236 jmachado 453
    public boolean sendNewGrades(List<String[]> grades, LangEnum langEnum, 1.5.0/docs/api/java/lang/String.html">String studentEmail, 1.5.0/docs/api/java/lang/String.html">String studentName)
454
    {
455
        try
456
        {
457
            sendEmail(getNewGradesEmail(grades,langEnum,studentEmail,studentName));
458
            return true;
459
        }
460
        catch (ServiceException e)
461
        {
462
            return false;
463
        }
464
 
465
    }
466
 
467
    public static void main(1.5.0/docs/api/java/lang/String.html">String [] args)
468
    {
440 jmachado 469
        1.5.0/docs/api/java/lang/System.html">System.out.println( DatesUtils.getStringFromDate(new 5+0%2Fdocs%2Fapi+Date">Date()));
470
//        List<String[]> grades = new ArrayList<String[]>();
471
//        grades.add(new String[]{"Teste","3"});
472
//        grades.add(new String[]{"Teste2","4"});
473
//        new SendEmailService().sendNewGrades(grades,LangEnum.PORTUGUESE,"jmachado@estgp.pt","jorge Machado");
236 jmachado 474
    }
475
 
29 jmachado 476
}