aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <rbgarga@gmail.com>2012-07-24 08:20:19 -0300
committerRenato Botelho <rbgarga@gmail.com>2012-07-24 08:20:19 -0300
commit5b7a1a95cd5a18180cfa3e83e65577a0b30583fa (patch)
treeeacc55aec7799c2c24f1ee3be0099eed0901d9d7
parent65a02542e45c80b37897b37bd3cc704ee76c5782 (diff)
downloadpfsense-packages-5b7a1a95cd5a18180cfa3e83e65577a0b30583fa.tar.gz
pfsense-packages-5b7a1a95cd5a18180cfa3e83e65577a0b30583fa.tar.bz2
pfsense-packages-5b7a1a95cd5a18180cfa3e83e65577a0b30583fa.zip
Remove gettext() calls from log_error(), it makes no sense to translate logs
-rw-r--r--config/snort/snort_check_for_rule_updates.php16
1 files changed, 8 insertions, 8 deletions
diff --git a/config/snort/snort_check_for_rule_updates.php b/config/snort/snort_check_for_rule_updates.php
index 5b357cb7..689b3174 100644
--- a/config/snort/snort_check_for_rule_updates.php
+++ b/config/snort/snort_check_for_rule_updates.php
@@ -78,7 +78,7 @@ if ($snortdownload == 'on') {
@file_put_contents("{$tmpfname}/{$snort_filename_md5}", $image);
if (0 == filesize("{$tmpfname}/{$snort_filename_md5}")) {
update_status(gettext("Please wait... You may only check for New Rules every 15 minutes..."));
- log_error(gettext("Please wait... You may only check for New Rules every 15 minutes..."));
+ log_error("Please wait... You may only check for New Rules every 15 minutes...");
update_output_window(gettext("Rules are released every month from snort.org. You may download the Rules at any time."));
$snortdownload = 'off';
} else
@@ -101,12 +101,12 @@ if ($snortdownload == 'on') {
/* download snortrules file */
if ($snortdownload == 'on') {
update_status(gettext("There is a new set of Snort.org rules posted. Downloading..."));
- log_error(gettext("There is a new set of Snort.org rules posted. Downloading..."));
+ log_error("There is a new set of Snort.org rules posted. Downloading...");
download_file_with_progress_bar("http://www.snort.org/pub-bin/oinkmaster.cgi/{$oinkid}/{$snort_filename}", "{$tmpfname}/{$snort_filename}");
update_status(gettext("Done downloading rules file."));
if (300000 > filesize("{$tmpfname}/$snort_filename")){
update_output_window(gettext("Snort rules file downloaded failed..."));
- log_error(gettext("Snort rules file downloaded failed..."));
+ log_error("Snort rules file downloaded failed...");
$snortdownload = 'off';
}
}
@@ -125,7 +125,7 @@ if ($emergingthreats == 'on') {
$emerg_md5_check_old = file_get_contents("{$snortdir}/{$emergingthreats_filename_md5}");
if ($emerg_md5_check_new == $emerg_md5_check_old) {
update_status(gettext("Emerging threat rules are up to date..."));
- log_error(gettext("Emerging threat rules are up to date..."));
+ log_error("Emerging threat rules are up to date...");
$emergingthreats = 'off';
}
}
@@ -134,7 +134,7 @@ if ($emergingthreats == 'on') {
/* download emergingthreats rules file */
if ($emergingthreats == "on") {
update_status(gettext("There is a new set of Emergingthreats rules posted. Downloading..."));
- log_error(gettext("There is a new set of Emergingthreats rules posted. Downloading..."));
+ log_error("There is a new set of Emergingthreats rules posted. Downloading...");
download_file_with_progress_bar("http://rules.emergingthreats.net/open/snort-{$emerging_threats_version}/emerging.rules.tar.gz", "{$tmpfname}/{$emergingthreats_filename}");
update_status(gettext('Done downloading Emergingthreats rules file.'));
log_error("Emergingthreats rules file update downloaded succsesfully");
@@ -300,7 +300,7 @@ function snort_apply_customizations($snortcfg, $if_real) {
return;
else {
update_status(gettext("Your set of configured rules are being copied..."));
- log_error(gettext("Your set of configured rules are being copied..."));
+ log_error("Your set of configured rules are being copied...");
$enabled_rulesets_array = explode("||", $snortcfg['rulesets']);
foreach($enabled_rulesets_array as $enabled_item) {
@copy("{$snortdir}/rules/{$enabled_item}", "{$snortdir}/snort_{$snortcfg['uuid']}_{$if_real}/rules/{$enabled_item}");
@@ -398,9 +398,9 @@ if ($snortdownload == 'on' || $emergingthreats == 'on') {
if (is_process_running("snort")) {
exec("/bin/sh /usr/local/etc/rc.d/snort.sh restart");
update_output_window(gettext("Snort has restarted with your new set of rules..."));
- log_error(gettext("Snort has restarted with your new set of rules..."));
+ log_error("Snort has restarted with your new set of rules...");
} else
- log_error(gettext("Snort Rules update finished..."));
+ log_error("Snort Rules update finished...");
}
update_status(gettext("The Rules update finished..."));