Revision: 5483
http://ipcop.svn.sourceforge.net/ipcop/?rev=5483&view=rev
Author: dotzball
Date: 2011-02-23 06:31:28 +0000 (Wed, 23 Feb 2011)
Log Message:
-----------
Test email function enabled.
Modified Paths:
--------------
ipcop/trunk/html/cgi-bin/email.cgi
Modified: ipcop/trunk/html/cgi-bin/email.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/email.cgi 2011-02-23 06:31:02 UTC (rev 5482)
+++ ipcop/trunk/html/cgi-bin/email.cgi 2011-02-23 06:31:28 UTC (rev 5483)
@@ -82,33 +82,43 @@
# overwrite users input
unless ($saveerror) {
- $cgiparams{'EMAIL_TO'} = $settings{'EMAIL_TO'};
- $cgiparams{'EMAIL_FROM'} = $settings{'EMAIL_FROM'};
- $cgiparams{'EMAIL_USR'} = $settings{'EMAIL_USR'};
- $cgiparams{'EMAIL_PW'} = $settings{'EMAIL_PW'};
- $cgiparams{'EMAIL_SERVER'} = $settings{'EMAIL_SERVER'};
- $cgiparams{'EMAIL_SERVER_PORT'} = $settings{'EMAIL_SERVER_PORT'};
+ $cgiparams{'EMAIL_TO'} = $settings{'EMAIL_TO'};
+ $cgiparams{'EMAIL_FROM'} = $settings{'EMAIL_FROM'};
+ $cgiparams{'EMAIL_USR'} = $settings{'EMAIL_USR'};
+ $cgiparams{'EMAIL_PW'} = $settings{'EMAIL_PW'};
+ $cgiparams{'EMAIL_SERVER'} = $settings{'EMAIL_SERVER'};
+ $cgiparams{'EMAIL_SERVER_PORT'} = $settings{'EMAIL_SERVER_PORT'};
} # end unless ($saveerror)
-#~ if ($cgiparams{'ACTION'} eq $Lang::tr{'send test mail'})
-#~ {
-#~ # send test email
-#~ my $return = `/usr/local/bin/monitorTraff --testEmail`;
+if ($cgiparams{'ACTION'} eq $Lang::tr{'send test mail'}) {
-#~ if($return =~ /Email was sent successfully!/)
-#~ {
-#~ $infomessage = "$Lang::tr{'test email was sent'}<br/>";
-#~ }
-#~ else
-#~ {
-#~ $errormessage = "$Lang::tr{'test email could not be
sent'}:<br/>";
-#~ $errormessage .= "$return <br />";
-#~ }
+ my $template = "/var/ipcop/email/templates/test";
-#~ } # end if ($cgiparams{'ACTION'} eq $Lang::tr{'send test mail'})
+ if(-e "$template.${Lang::language}.tpl") {
+ $template .= ".${Lang::language}.tpl";
+ }
+ else {
+ $template .= ".en.tpl";
+ }
+ # send test email
+ my $cmd = "/usr/local/bin/emailhelper ";
+ $cmd .= " -s \"$Lang::tr{'subject test'}\" ";
+ $cmd .= " -m \"$template\" ";
+ my $return = `$cmd`;
+
+ if($return =~ /Email was sent successfully!/) {
+ $infomessage = "$Lang::tr{'test email was sent'}<br/>";
+ }
+ else {
+ $errormessage = "$Lang::tr{'test email could not be sent'}:<br/>";
+ $errormessage .= "$return <br />";
+ }
+} # end if ($cgiparams{'ACTION'} eq $Lang::tr{'send test mail'})
+
+
&Header::openpage($Lang::tr{'email settings'}, 1, '');
&Header::openbigbox('100%', 'left');
@@ -193,7 +203,7 @@
</tr>
<tr>
<td align='left' class='base' colspan="2">
- <input type='submit' name='ACTION' value='$Lang::tr{'send test
mail'}' disabled='disabled' />
+ <input type='submit' name='ACTION' value='$Lang::tr{'send test
mail'}' />
</td>
</tr>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in
Real-Time with Splunk. Collect, index and harness all the fast moving IT data
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business
insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
