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, master has been updated via 96d0fe52aca3d937ff2746efde573266b6d90813 (commit) via d39287de761337f4601aef02409527ff0a6abe63 (commit) via 97c3590c6faaea8c31ae5d4139e98cbecb22fd49 (commit) via a2ee81406ff7e6847ad17670c7b11766da6c5ce3 (commit) from caf4eb1adc5c18fb54a5296e85e3726439b34abe (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 96d0fe52aca3d937ff2746efde573266b6d90813 Merge: d39287d caf4eb1 Author: Jan Paul Tuecking earl@ipfire.org Date: Sat Oct 9 17:45:21 2010 +0200

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

commit d39287de761337f4601aef02409527ff0a6abe63 Author: Jan Paul Tuecking earl@ipfire.org Date: Sat Oct 9 16:41:26 2010 +0200

Fixes bug #000697 added example for whitelist.

commit 97c3590c6faaea8c31ae5d4139e98cbecb22fd49 Author: Jan Paul Tuecking earl@ipfire.org Date: Sat Oct 9 16:38:00 2010 +0200

Fixes bug #0000697 added example for blacklist

commit a2ee81406ff7e6847ad17670c7b11766da6c5ce3 Author: Jan Paul Tuecking earl@ipfire.org Date: Sat Oct 9 16:08:33 2010 +0200

Fixes bug #0000722 pre-shared key is now a password field.

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

Summary of changes: html/cgi-bin/urlfilter.cgi | 8 ++++++++ html/cgi-bin/vpnmain.cgi | 4 ++-- langs/de/cgi-bin/de.pl | 2 ++ langs/en/cgi-bin/en.pl | 2 ++ langs/es/cgi-bin/es.pl | 2 ++ langs/fr/cgi-bin/fr.pl | 2 ++ 6 files changed, 18 insertions(+), 2 deletions(-)

Difference in files: diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi index eea32bf..1bfc039 100644 --- a/html/cgi-bin/urlfilter.cgi +++ b/html/cgi-bin/urlfilter.cgi @@ -1214,6 +1214,10 @@ print <<END <td colspan='2'>$Lang::tr{'urlfilter blocked urls'}&nbsp;<img src='/blob.gif' alt='*' /></td> </tr> <tr> + <td colspan='2'>$Lang::tr{'urlfilter example'}</td> + <td colspan='2'>$Lang::tr{'urlfilter example ads'}</td> +</tr> +<tr> <td colspan='2' width='50%'><textarea name='CUSTOM_BLACK_DOMAINS' cols='32' rows='6' wrap='off'> END ; @@ -1253,6 +1257,10 @@ print <<END <td colspan='2'>$Lang::tr{'urlfilter allowed urls'}&nbsp;<img src='/blob.gif' alt='*' /></td> </tr> <tr> + <td colspan='2'>$Lang::tr{'urlfilter example'}</td> + <td colspan='2'>$Lang::tr{'urlfilter example ads'}</td> +</tr> +<tr> <td colspan='2' width='50%'><textarea name='CUSTOM_WHITE_DOMAINS' cols='32' rows='6' wrap='off'> END ; diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 8a74063..f303cfb 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -1988,7 +1988,7 @@ END print <<END <table width='100%' cellpadding='0' cellspacing='5' border='0'> <tr><td class='base' width='50%'>$Lang::tr{'use a pre-shared key'}</td> - <td class='base' width='50%'><input type='text' name='PSK' size='30' value='$cgiparams{'PSK'}' /></td> + <td class='base' width='50%'><input type='password' name='PSK' size='30' value='$cgiparams{'PSK'}' /></td> </tr> </table> END @@ -2006,7 +2006,7 @@ END <table width='100%' cellpadding='0' cellspacing='5' border='0'> <tr><td width='5%'><input type='radio' name='AUTH' value='psk' $checked{'AUTH'}{'psk'} $pskdisabled/></td> <td class='base' width='55%'>$Lang::tr{'use a pre-shared key'}</td> - <td class='base' width='40%'><input type='text' name='PSK' size='30' value='$cgiparams{'PSK'}' $pskdisabled/></td></tr> + <td class='base' width='40%'><input type='password' name='PSK' size='30' value='$cgiparams{'PSK'}' $pskdisabled/></td></tr> <tr><td colspan='3' bgcolor='#000000'></td></tr> <tr><td><input type='radio' name='AUTH' value='certreq' $checked{'AUTH'}{'certreq'} $cakeydisabled /></td> <td class='base'><hr />$Lang::tr{'upload a certificate request'}</td> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 6b01831..0936af0 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1886,6 +1886,8 @@ 'urlfilter enable log' => 'Aktiviere Protokoll', 'urlfilter enable rewrite rules' => 'Aktiviere lokale Dateiumleitung', 'urlfilter enabled' => 'Aktiviert:', +'urlfilter example' => 'Beispiel: www.domain.com', +'urlfilter example ads' => 'Beispiel: www.domain.com/ads/', 'urlfilter export blacklist' => 'Blacklist exportieren', 'urlfilter export error' => 'Kann Exportdatei nicht erstellen', 'urlfilter expressions' => 'Ausdrücke (einen pro Zeile)', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 907de5d..b35a23a 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1920,6 +1920,8 @@ 'urlfilter enable log' => 'Enable log', 'urlfilter enable rewrite rules' => 'Enable local file redirection', 'urlfilter enabled' => 'Enabled:', +'urlfilter example' => 'Example: www.domain.com', +'urlfilter example ads' => 'Example: www.domain.com/ads/', 'urlfilter export blacklist' => 'Export blacklist', 'urlfilter export error' => 'Unable to create export file', 'urlfilter expressions' => 'Expressions (one per line)', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 8074cd2..ca2b934 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -1907,6 +1907,8 @@ 'urlfilter enable log' => 'Activar registro', 'urlfilter enable rewrite rules' => 'Activar redirección de archivos locales', 'urlfilter enabled' => 'Activado:', +'urlfilter example' => 'Ejemplo: www.domain.com', +'urlfilter example ads' => 'Ejemplo: www.domain.com/ads/', 'urlfilter export blacklist' => 'Exportar lista negra', 'urlfilter export error' => 'Imposible crear archivo de exportación', 'urlfilter expressions' => 'Frases (una por línea)', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 7904bb6..0179e73 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1916,6 +1916,8 @@ 'urlfilter enable log' => 'Activer log', 'urlfilter enable rewrite rules' => 'Activer fichier local de redirection', 'urlfilter enabled' => 'Activé:', +'urlfilter example' => 'Exemple: www.domain.com', +'urlfilter example ads' => 'Exemple: www.domain.com/ads/', 'urlfilter export blacklist' => 'Exporter Blackliste', 'urlfilter export error' => 'Impossible de créer fichier d'exportation', 'urlfilter expressions' => 'Expressions (une par ligne)',

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