This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via afd6e1931defb60665b40438d8e54db6de46246f (commit) via 9b94eb8fa6e53c072a60c32153d666eba833bcdf (commit) via 2799b3d9e9ead617d6a652216563e83b8ccc24af (commit) from 18f4c007f132fa809eea7a2bedebb701ac705b84 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit afd6e1931defb60665b40438d8e54db6de46246f Author: Alexander Marx alexander.marx@ipfire.org Date: Wed Aug 26 14:46:58 2015 +0200

dma: change field order of mail.cgi and fix required fields

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 9b94eb8fa6e53c072a60c32153d666eba833bcdf Author: Alexander Marx alexander.marx@ipfire.org Date: Wed Aug 26 14:21:00 2015 +0200

core94: fix rootfile

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 2799b3d9e9ead617d6a652216563e83b8ccc24af Author: Alexander Marx alexander.marx@ipfire.org Date: Wed Aug 26 07:12:17 2015 +0200

dma: fix typo in mail.cgi

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/94/filelists/files | 2 +- html/cgi-bin/mail.cgi | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/94/filelists/files b/config/rootfiles/core/94/filelists/files index d62794d..625b017 100644 --- a/config/rootfiles/core/94/filelists/files +++ b/config/rootfiles/core/94/filelists/files @@ -4,5 +4,5 @@ etc/rc.d/init.d/sshd srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/mail.cgi var/ipfire/langs -var/ipfire/menu/40-services.menu +var/ipfire/menu.d/40-services.menu var/ipfire/network-functions.pl diff --git a/html/cgi-bin/mail.cgi b/html/cgi-bin/mail.cgi index d409a4c..be663a6 100755 --- a/html/cgi-bin/mail.cgi +++ b/html/cgi-bin/mail.cgi @@ -101,8 +101,8 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ #SaveButton on configsite

#clear configfiles open (TXT, ">$dmafile") or die("Could not open /var/ipfire/dma/dma.conf: $!\n"); - open (TXT1, ">$authfile") or die("Could not open /var/ipfire/dma/dma.conf: $!\n"); - open (TXT2, ">$mailfile") or die("Could not open /var/ipfire/dma/dma.conf: $!\n"); + open (TXT1, ">$authfile") or die("Could not open /var/ipfire/dma/auth.conf: $!\n"); + open (TXT2, ">$mailfile") or die("Could not open /var/ipfire/dma/mail.conf: $!\n"); close TXT2;

#Fill hashes with actual values @@ -204,33 +204,33 @@ END <div class="MAILSRV"> <table style='width:100%;'> <tr> - <td style='width:24em'>$Lang::tr{'email mailaddr'}</td> + <td>$Lang::tr{'email mailsender'}<img src='/blob.gif' alt='*' /></td> + <td><input type='text' name='txt_mailsender' value='$mail{'SENDER'}' style='width:22em;'></td> + </tr> + <tr> + <td>$Lang::tr{'email mailrcpt'}<img src='/blob.gif' alt='*' /></td> + <td><input type='text' name='txt_recipient' value='$mail{'RECIPIENT'}' style='width:22em;'></td> + </tr> + <tr> + <td style='width:24em'>$Lang::tr{'email mailaddr'}<img src='/blob.gif' alt='*' /></td> <td><input type='text' name='txt_mailserver' value='$dma{'SMARTHOST'}' style='width:22em;'></td> </tr> <tr> - <td>$Lang::tr{'email mailport'}</td> + <td>$Lang::tr{'email mailport'}<img src='/blob.gif' alt='*' /></td> <td><input type='text' name='txt_mailport' value='$dma{'PORT'}' size='3'></td> </tr> <tr> - <td>$Lang::tr{'email mailuser'}<img src='/blob.gif' alt='*' /></td> + <td>$Lang::tr{'email mailuser'}</td> <td><input type='text' name='txt_mailuser' value='$auth{'AUTHNAME'}' style='width:22em;'></td> </tr> <tr> - <td>$Lang::tr{'email mailpass'}<img src='/blob.gif' alt='*' /></td> + <td>$Lang::tr{'email mailpass'}</td> <td><input type='password' name='txt_mailpass' value='$auth{'AUTHPASS'}' style='width:22em;' ></td> </tr> <tr> <td>$Lang::tr{'email tls'}</td> <td><input type='checkbox' name='mail_tls' $checked{'mail_tls'}{'on'}></td> </tr> - <tr> - <td>$Lang::tr{'email mailsender'}</td> - <td><input type='text' name='txt_mailsender' value='$mail{'SENDER'}' style='width:22em;'></td> - </tr> - <tr> - <td>$Lang::tr{'email mailrcpt'}</td> - <td><input type='text' name='txt_recipient' value='$mail{'RECIPIENT'}' style='width:22em;'></td> - </tr> END if (! -z $dmafile && $mail{'USEMAIL'} eq 'on'){ print "<tr>";

hooks/post-receive -- IPFire 2.x development tree