diff options
| author | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-01-28 17:32:17 -0200 |
|---|---|---|
| committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-01-28 17:32:17 -0200 |
| commit | 9d3d8d005ec74d6108aa423c7ad09e0b58951127 (patch) | |
| tree | f765cfb57d7d75ac2af8fa6b975ea953b557bdfc /etc/inc/easyrule.inc | |
| parent | b638ef519a8e1ad3e843c55e091fc2649e834797 (diff) | |
| parent | 1596d9c17349f47ef06defa5c44333db0158a110 (diff) | |
| download | pfsense-9d3d8d005ec74d6108aa423c7ad09e0b58951127.zip pfsense-9d3d8d005ec74d6108aa423c7ad09e0b58951127.tar.gz | |
Merge branch 'master' into inc
Conflicts:
etc/inc/captiveportal.inc
etc/inc/config.console.inc
etc/inc/config.lib.inc
etc/inc/easyrule.inc
etc/inc/filter.inc
etc/inc/ipsec.inc
etc/inc/pkg-utils.inc
etc/inc/shaper.inc
etc/inc/system.inc
etc/inc/voucher.inc
Diffstat (limited to 'etc/inc/easyrule.inc')
| -rw-r--r-- | etc/inc/easyrule.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/easyrule.inc b/etc/inc/easyrule.inc index da1377d..96864b1 100644 --- a/etc/inc/easyrule.inc +++ b/etc/inc/easyrule.inc @@ -164,9 +164,9 @@ function easyrule_block_alias_add($host, $int = 'wan') { $alias['detail'] = $a_aliases[$id]['detail'] . gettext('Entry added') . ' ' . date('r') . '||'; } else { /* Create a new alias with all the proper information */ - $alias['name'] = $blockaliasname . strtoupper($int); - $alias['type'] = 'network'; - $alias['descr'] = mb_convert_encoding(gettext("Hosts blocked from Firewall Log view"),"HTML-ENTITIES","auto"); + $alias['name'] = $blockaliasname . strtoupper($int); + $alias['type'] = 'network'; + $alias['descr'] = gettext("Hosts blocked from Firewall Log view"); $alias['address'] = $host . '/32'; $alias['detail'] = gettext('Entry added') . ' ' . date('r') . '||'; |
