Accept the old option squidguard_log_format but display a warning if it is used.

Replace squidguard_ignore_date by redirector_ignore_date but keep the old option with a warning.

diff --git a/getconf.c b/getconf.c
index 51eaf8ba239050aa9d1ed610ceffa857cbc6411d..86f3a195404d4b1ae7619066d13c455731ba51aa 100644 (file)
--- a/getconf.c
+++ b/getconf.c
@@ -585,8 +585,16 @@ static void parmtest(char *buf)
    if (getparam_string("graph_days_bytes_bar_color",buf,GraphDaysBytesBarColor,sizeof(GraphDaysBytesBarColor))>0) return;
 
    if (getparam_string("redirector_log_format",buf,RedirectorLogFormat,sizeof(RedirectorLogFormat))>0) return;
+   if (getparam_string("squidguard_log_format",buf,RedirectorLogFormat,sizeof(RedirectorLogFormat))>0) {
+      debuga(_("squidguard_log_format is deprecated and has been replaced by redirector_log_format. Please update your configuration file.\n"));
+      return;
+   }
 
-   if (getparam_bool("squidguard_ignore_date",buf,&SquidguardIgnoreDate)>0) return;
+   if (getparam_bool("redirector_ignore_date",buf,&RedirectorIgnoreDate)>0) return;
+   if (getparam_bool("squidguard_ignore_date",buf,&RedirectorIgnoreDate)>0) {
+      debuga(_("squidguard_ignore_date is deprecated and has been replaced by redirector_ignore_date. Please update your configuration file.\n"));
+      return;
+   }
 
    if (getparam_bool("dansguardian_ignore_date",buf,&DansguardianIgnoreDate)>0) return;
 

diff --git a/include/conf.h b/include/conf.h
index 88f22cdb574814f0e9f95d597fe24162ec9de60a..9dec56985bde1090e72bf3a07c3792f839268087 100755 (executable)
--- a/include/conf.h
+++ b/include/conf.h
@@ -344,7 +344,7 @@ char RedirectorLogFormat[4096];
 int NRedirectorLogs;
 char RedirectorLogs[MAX_REDIRECTOR_LOGS][MAX_REDIRECTOR_FILELEN];
 int RedirectorLogFromCmdLine;
-bool SquidguardIgnoreDate;
+bool RedirectorIgnoreDate;
 bool ShowSargInfo;
 bool BytesInSitesUsersReport;
 bool ShowSargLogo;

diff --git a/log.c b/log.c
index 0390afdbdd32e82107c601b7313f47e7f41dfe09..66ad4551e86f2f7f558ec18ea102730058e9c215 100644 (file)
--- a/log.c
+++ b/log.c
@@ -266,8 +266,8 @@ int main(int argc,char *argv[])
    IndexTree=INDEX_TREE_FILE;
    strcpy(RealtimeTypes,"GET,PUT,CONNECT");
    strcpy(RealtimeUnauthRec,"show");
-   SquidguardIgnoreDate=0;
-   DansguardianIgnoreDate=0;
+   RedirectorIgnoreDate=false;
+   DansguardianIgnoreDate=false;
    DataFileUrl=DATAFILEURL_IP;
    strcpy(MaxElapsed,"28800000");
    BytesInSitesUsersReport=0;

diff --git a/po/bg.po b/po/bg.po
index 6b5c78ef913f9caf67b57b860c94bbdb9e05b1b1..7f11f2a3dd2281c7da52ab09e1f6cea03ae03a4c 100644 (file)
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sarg 2.3\n"
 "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 14:03+0200\n"
+"POT-Creation-Date: 2010-05-11 08:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -565,22 +565,36 @@ msgstr ""
 msgid "Template file name is too long in parameter \"AuthUserTemplateFile\"\n"
 msgstr ""
 
-#: getconf.c:631 getconf.c:636
+#: getconf.c:589
+#, c-format
+msgid ""
+"squidguard_log_format is deprecated and has been replaced by "
+"redirector_log_format. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:595
+#, c-format
+msgid ""
+"squidguard_ignore_date is deprecated and has been replaced by "
+"redirector_ignore_date. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:639 getconf.c:644
 #, c-format
 msgid "The \"byte_cost\" parameter of the configuration file is invalid\n"
 msgstr ""
 
-#: getconf.c:643
+#: getconf.c:651
 #, fuzzy, c-format
 msgid "SARG: Unknown option %s\n"
 msgstr "Unknown option"
 
-#: getconf.c:653
+#: getconf.c:661
 #, fuzzy, c-format
 msgid "Loading configuration from %s\n"
 msgstr "Зарежда файла с изключенията от"
 
-#: getconf.c:656
+#: getconf.c:664
 #, fuzzy, c-format
 msgid "(getconf) Cannot open file %s\n"
 msgstr "Не мога да намеря файла"

diff --git a/po/ca.po b/po/ca.po
index 0a48c918b2ef527f7c561e3958722c48e856c21e..384ae9718ec03d1100a1496aa271fa43d154a7ff 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sarg 2.3\n"
 "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 14:03+0200\n"
+"POT-Creation-Date: 2010-05-11 08:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -565,22 +565,36 @@ msgstr ""
 msgid "Template file name is too long in parameter \"AuthUserTemplateFile\"\n"
 msgstr ""
 
-#: getconf.c:631 getconf.c:636
+#: getconf.c:589
+#, c-format
+msgid ""
+"squidguard_log_format is deprecated and has been replaced by "
+"redirector_log_format. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:595
+#, c-format
+msgid ""
+"squidguard_ignore_date is deprecated and has been replaced by "
+"redirector_ignore_date. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:639 getconf.c:644
 #, c-format
 msgid "The \"byte_cost\" parameter of the configuration file is invalid\n"
 msgstr ""
 
-#: getconf.c:643
+#: getconf.c:651
 #, fuzzy, c-format
 msgid "SARG: Unknown option %s\n"
 msgstr "Unknown option"
 
-#: getconf.c:653
+#: getconf.c:661
 #, fuzzy, c-format
 msgid "Loading configuration from %s\n"
 msgstr "Llegint log de l'agent d'usuari"
 
-#: getconf.c:656
+#: getconf.c:664
 #, fuzzy, c-format
 msgid "(getconf) Cannot open file %s\n"
 msgstr "reports"

diff --git a/po/cs.po b/po/cs.po
index 797383c6123477adb7a3604a133c2b58081b2aed..914b71826394c0e5af3b4c67112732d35fd44640 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sarg 2.3\n"
 "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 14:03+0200\n"
+"POT-Creation-Date: 2010-05-11 08:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -565,22 +565,36 @@ msgstr ""
 msgid "Template file name is too long in parameter \"AuthUserTemplateFile\"\n"
 msgstr ""
 
-#: getconf.c:631 getconf.c:636
+#: getconf.c:589
+#, c-format
+msgid ""
+"squidguard_log_format is deprecated and has been replaced by "
+"redirector_log_format. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:595
+#, c-format
+msgid ""
+"squidguard_ignore_date is deprecated and has been replaced by "
+"redirector_ignore_date. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:639 getconf.c:644
 #, c-format
 msgid "The \"byte_cost\" parameter of the configuration file is invalid\n"
 msgstr ""
 
-#: getconf.c:643
+#: getconf.c:651
 #, fuzzy, c-format
 msgid "SARG: Unknown option %s\n"
 msgstr "Unknown option"
 
-#: getconf.c:653
+#: getconf.c:661
 #, fuzzy, c-format
 msgid "Loading configuration from %s\n"
 msgstr "Načítám soubor vyjímek z"
 
-#: getconf.c:656
+#: getconf.c:664
 #, fuzzy, c-format
 msgid "(getconf) Cannot open file %s\n"
 msgstr "Nemohu otevřít soubor"

diff --git a/po/de.po b/po/de.po
index 2172c49469953cbc036fc8d79ab94e8fc208c5aa..0c877a1a6beca413171116d9778bfdf99db62f84 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sarg 2.3\n"
 "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 14:03+0200\n"
+"POT-Creation-Date: 2010-05-11 08:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -565,22 +565,36 @@ msgstr ""
 msgid "Template file name is too long in parameter \"AuthUserTemplateFile\"\n"
 msgstr ""
 
-#: getconf.c:631 getconf.c:636
+#: getconf.c:589
+#, c-format
+msgid ""
+"squidguard_log_format is deprecated and has been replaced by "
+"redirector_log_format. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:595
+#, c-format
+msgid ""
+"squidguard_ignore_date is deprecated and has been replaced by "
+"redirector_ignore_date. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:639 getconf.c:644
 #, c-format
 msgid "The \"byte_cost\" parameter of the configuration file is invalid\n"
 msgstr ""
 
-#: getconf.c:643
+#: getconf.c:651
 #, fuzzy, c-format
 msgid "SARG: Unknown option %s\n"
 msgstr "Unknown option"
 
-#: getconf.c:653
+#: getconf.c:661
 #, fuzzy, c-format
 msgid "Loading configuration from %s\n"
 msgstr "Lade Ausschlussdatei aus"
 
-#: getconf.c:656
+#: getconf.c:664
 #, fuzzy, c-format
 msgid "(getconf) Cannot open file %s\n"
 msgstr "Kann Datei nicht oeffnen"

diff --git a/po/el.po b/po/el.po
index f9235bd9e1fe64500342fc9efef1802f25f0ea8d..21451126f48689d2307c1ec979b527e6d8601fd2 100644 (file)
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sarg 2.3\n"
 "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 14:03+0200\n"
+"POT-Creation-Date: 2010-05-11 08:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -565,22 +565,36 @@ msgstr ""
 msgid "Template file name is too long in parameter \"AuthUserTemplateFile\"\n"
 msgstr ""
 
-#: getconf.c:631 getconf.c:636
+#: getconf.c:589
+#, c-format
+msgid ""
+"squidguard_log_format is deprecated and has been replaced by "
+"redirector_log_format. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:595
+#, c-format
+msgid ""
+"squidguard_ignore_date is deprecated and has been replaced by "
+"redirector_ignore_date. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:639 getconf.c:644
 #, c-format
 msgid "The \"byte_cost\" parameter of the configuration file is invalid\n"
 msgstr ""
 
-#: getconf.c:643
+#: getconf.c:651
 #, fuzzy, c-format
 msgid "SARG: Unknown option %s\n"
 msgstr "Unknown option"
 
-#: getconf.c:653
+#: getconf.c:661
 #, fuzzy, c-format
 msgid "Loading configuration from %s\n"
 msgstr "Φόρτωση αρχείου εξαιρέσεων από"
 
-#: getconf.c:656
+#: getconf.c:664
 #, fuzzy, c-format
 msgid "(getconf) Cannot open file %s\n"
 msgstr "Δεν μπορώ να διαβάσω το αρχείο"

diff --git a/po/es.po b/po/es.po
index a4df42a38d64fbb9f7157d029fda68ea35b216ef..a56baafacc2cfdbef586496f80511a4e321eeca4 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sarg 2.3\n"
 "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 14:03+0200\n"
+"POT-Creation-Date: 2010-05-11 08:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -566,22 +566,36 @@ msgstr ""
 msgid "Template file name is too long in parameter \"AuthUserTemplateFile\"\n"
 msgstr ""
 
-#: getconf.c:631 getconf.c:636
+#: getconf.c:589
+#, c-format
+msgid ""
+"squidguard_log_format is deprecated and has been replaced by "
+"redirector_log_format. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:595
+#, c-format
+msgid ""
+"squidguard_ignore_date is deprecated and has been replaced by "
+"redirector_ignore_date. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:639 getconf.c:644
 #, c-format
 msgid "The \"byte_cost\" parameter of the configuration file is invalid\n"
 msgstr ""
 
-#: getconf.c:643
+#: getconf.c:651
 #, fuzzy, c-format
 msgid "SARG: Unknown option %s\n"
 msgstr "Unknown option"
 
-#: getconf.c:653
+#: getconf.c:661
 #, fuzzy, c-format
 msgid "Loading configuration from %s\n"
 msgstr "Cargando archivo de exclusiones desde"
 
-#: getconf.c:656
+#: getconf.c:664
 #, fuzzy, c-format
 msgid "(getconf) Cannot open file %s\n"
 msgstr "No se puede abrir archivo"

diff --git a/po/fr.po b/po/fr.po
index f7a641769ab7898885c1530aac955a270f8593ba..61430614b03b00ef5b7e995afa7920e1ed987674 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sarg 2.3-pre2\n"
 "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 14:03+0200\n"
-"PO-Revision-Date: 2010-05-10 14:09+0200\n"
+"POT-Creation-Date: 2010-05-11 08:46+0200\n"
+"PO-Revision-Date: 2010-05-11 08:57+0200\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -557,22 +557,36 @@ msgstr ""
 "Le nom du fichier modèle est trop long pour le paramètre "
 "«AuthUserTemplateFile»\n"
 
-#: getconf.c:631 getconf.c:636
+#: getconf.c:589
+#, c-format
+msgid ""
+"squidguard_log_format is deprecated and has been replaced by "
+"redirector_log_format. Please update your configuration file.\n"
+msgstr "squidguard_log_format est abandonné a été remplacé par redirector_log_format. Veuillez mettre à jour votre fichier de configuration.\n"
+
+#: getconf.c:595
+#, c-format
+msgid ""
+"squidguard_ignore_date is deprecated and has been replaced by "
+"redirector_ignore_date. Please update your configuration file.\n"
+msgstr "squidguard_ignore_date est abandonné a été remplacé par redirector_ignore_date. Veuillez mettre à jour votre fichier de configuration.\n"
+
+#: getconf.c:639 getconf.c:644
 #, c-format
 msgid "The \"byte_cost\" parameter of the configuration file is invalid\n"
 msgstr "Le paramètre «byte_cost» du fichier de configuration est incorrect\n"
 
-#: getconf.c:643
+#: getconf.c:651
 #, c-format
 msgid "SARG: Unknown option %s\n"
 msgstr "SARG: Option inconnue : %s\n"
 
-#: getconf.c:653
+#: getconf.c:661
 #, c-format
 msgid "Loading configuration from %s\n"
 msgstr "Lecture du fichier de configuration %s\n"
 
-#: getconf.c:656
+#: getconf.c:664
 #, c-format
 msgid "(getconf) Cannot open file %s\n"
 msgstr "(getconf) Impossible d'ouvrir le fichier %s\n"

diff --git a/po/hu.po b/po/hu.po
index 8a934f67231058d54e50ea12a0eb6054c1f2a630..6fc86c3b67d57a2b2661f6e7a7fe30a9d20ff58e 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sarg 2.3\n"
 "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 14:03+0200\n"
+"POT-Creation-Date: 2010-05-11 08:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -565,22 +565,36 @@ msgstr ""
 msgid "Template file name is too long in parameter \"AuthUserTemplateFile\"\n"
 msgstr ""
 
-#: getconf.c:631 getconf.c:636
+#: getconf.c:589
+#, c-format
+msgid ""
+"squidguard_log_format is deprecated and has been replaced by "
+"redirector_log_format. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:595
+#, c-format
+msgid ""
+"squidguard_ignore_date is deprecated and has been replaced by "
+"redirector_ignore_date. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:639 getconf.c:644
 #, c-format
 msgid "The \"byte_cost\" parameter of the configuration file is invalid\n"
 msgstr ""
 
-#: getconf.c:643
+#: getconf.c:651
 #, fuzzy, c-format
 msgid "SARG: Unknown option %s\n"
 msgstr "Unknown option"
 
-#: getconf.c:653
+#: getconf.c:661
 #, fuzzy, c-format
 msgid "Loading configuration from %s\n"
 msgstr "Kizaró file beolvasása a"
 
-#: getconf.c:656
+#: getconf.c:664
 #, fuzzy, c-format
 msgid "(getconf) Cannot open file %s\n"
 msgstr "Megnyithatatlan file"

diff --git a/po/id.po b/po/id.po
index 154691a3bb892e7cb7d0b265bde9e974f972506e..4cf426f381ebf31d1358866e4e2cd5e876f35c7b 100644 (file)
--- a/po/id.po
+++ b/po/id.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sarg 2.3\n"
 "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 14:03+0200\n"
+"POT-Creation-Date: 2010-05-11 08:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -565,22 +565,36 @@ msgstr ""
 msgid "Template file name is too long in parameter \"AuthUserTemplateFile\"\n"
 msgstr ""
 
-#: getconf.c:631 getconf.c:636
+#: getconf.c:589
+#, c-format
+msgid ""
+"squidguard_log_format is deprecated and has been replaced by "
+"redirector_log_format. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:595
+#, c-format
+msgid ""
+"squidguard_ignore_date is deprecated and has been replaced by "
+"redirector_ignore_date. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:639 getconf.c:644
 #, c-format
 msgid "The \"byte_cost\" parameter of the configuration file is invalid\n"
 msgstr ""
 
-#: getconf.c:643
+#: getconf.c:651
 #, fuzzy, c-format
 msgid "SARG: Unknown option %s\n"
 msgstr "Unknown option"
 
-#: getconf.c:653
+#: getconf.c:661
 #, fuzzy, c-format
 msgid "Loading configuration from %s\n"
 msgstr "Menyertakan file exclude dari"
 
-#: getconf.c:656
+#: getconf.c:664
 #, fuzzy, c-format
 msgid "(getconf) Cannot open file %s\n"
 msgstr "Tak bisa buka file"

diff --git a/po/it.po b/po/it.po
index 0b01eda9a21da7b3d18a3a92d87702ff05c79b43..5572626da294781c0780c7d6aecf8de88a2a0c91 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sarg 2.3\n"
 "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 14:03+0200\n"
+"POT-Creation-Date: 2010-05-11 08:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -565,22 +565,36 @@ msgstr ""
 msgid "Template file name is too long in parameter \"AuthUserTemplateFile\"\n"
 msgstr ""
 
-#: getconf.c:631 getconf.c:636
+#: getconf.c:589
+#, c-format
+msgid ""
+"squidguard_log_format is deprecated and has been replaced by "
+"redirector_log_format. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:595
+#, c-format
+msgid ""
+"squidguard_ignore_date is deprecated and has been replaced by "
+"redirector_ignore_date. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:639 getconf.c:644
 #, c-format
 msgid "The \"byte_cost\" parameter of the configuration file is invalid\n"
 msgstr ""
 
-#: getconf.c:643
+#: getconf.c:651
 #, fuzzy, c-format
 msgid "SARG: Unknown option %s\n"
 msgstr "Unknown option"
 
-#: getconf.c:653
+#: getconf.c:661
 #, fuzzy, c-format
 msgid "Loading configuration from %s\n"
 msgstr "Caricamento exclude file da"
 
-#: getconf.c:656
+#: getconf.c:664
 #, fuzzy, c-format
 msgid "(getconf) Cannot open file %s\n"
 msgstr "Non riesco ad aprire il file"

diff --git a/po/ja.po b/po/ja.po
index dba786d8a3dbf7973bee9542395005d43b3ae135..ea5025105de034e5607deb650db6cac8ac46fd30 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sarg 2.3\n"
 "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 14:03+0200\n"
+"POT-Creation-Date: 2010-05-11 08:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -565,22 +565,36 @@ msgstr ""
 msgid "Template file name is too long in parameter \"AuthUserTemplateFile\"\n"
 msgstr ""
 
-#: getconf.c:631 getconf.c:636
+#: getconf.c:589
+#, c-format
+msgid ""
+"squidguard_log_format is deprecated and has been replaced by "
+"redirector_log_format. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:595
+#, c-format
+msgid ""
+"squidguard_ignore_date is deprecated and has been replaced by "
+"redirector_ignore_date. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:639 getconf.c:644
 #, c-format
 msgid "The \"byte_cost\" parameter of the configuration file is invalid\n"
 msgstr ""
 
-#: getconf.c:643
+#: getconf.c:651
 #, fuzzy, c-format
 msgid "SARG: Unknown option %s\n"
 msgstr "Unknown option"
 
-#: getconf.c:653
+#: getconf.c:661
 #, fuzzy, c-format
 msgid "Loading configuration from %s\n"
 msgstr "以下から排除するファイルを読み込んでいます"
 
-#: getconf.c:656
+#: getconf.c:664
 #, fuzzy, c-format
 msgid "(getconf) Cannot open file %s\n"
 msgstr "ファイルをオープンできません"

diff --git a/po/lv.po b/po/lv.po
index e2f54a36ceadfaeea7800ab6f9248017781bf557..9e045c6f6d5fbdffeabb5f62a31f70bd24adacdc 100644 (file)
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sarg 2.3-pre1\n"
 "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 14:03+0200\n"
+"POT-Creation-Date: 2010-05-11 08:46+0200\n"
 "PO-Revision-Date: 2010-04-25 20:35+0300\n"
 "Last-Translator: Juris Valdovskis <juris@dc.lv>\n"
 "Language-Team: Latvian <translation-team-lv@lists.sourceforge.net>\n"
@@ -566,22 +566,36 @@ msgstr ""
 msgid "Template file name is too long in parameter \"AuthUserTemplateFile\"\n"
 msgstr ""
 
-#: getconf.c:631 getconf.c:636
+#: getconf.c:589
+#, c-format
+msgid ""
+"squidguard_log_format is deprecated and has been replaced by "
+"redirector_log_format. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:595
+#, c-format
+msgid ""
+"squidguard_ignore_date is deprecated and has been replaced by "
+"redirector_ignore_date. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:639 getconf.c:644
 #, c-format
 msgid "The \"byte_cost\" parameter of the configuration file is invalid\n"
 msgstr ""
 
-#: getconf.c:643
+#: getconf.c:651
 #, fuzzy, c-format
 msgid "SARG: Unknown option %s\n"
 msgstr "Unknown option"
 
-#: getconf.c:653
+#: getconf.c:661
 #, fuzzy, c-format
 msgid "Loading configuration from %s\n"
 msgstr "Ielādēju izņēmumu failu no"
 
-#: getconf.c:656
+#: getconf.c:664
 #, fuzzy, c-format
 msgid "(getconf) Cannot open file %s\n"
 msgstr "Nevar atvērt failu"

diff --git a/po/nl.po b/po/nl.po
index e5fd3e9df7d23557a0efdadcdf9e09288ae0b903..054dbb66a44b4de680e81cadf7f0d6aed4ea5f8b 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sarg 2.3\n"
 "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 14:03+0200\n"
+"POT-Creation-Date: 2010-05-11 08:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -567,22 +567,36 @@ msgstr ""
 msgid "Template file name is too long in parameter \"AuthUserTemplateFile\"\n"
 msgstr ""
 
-#: getconf.c:631 getconf.c:636
+#: getconf.c:589
+#, c-format
+msgid ""
+"squidguard_log_format is deprecated and has been replaced by "
+"redirector_log_format. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:595
+#, c-format
+msgid ""
+"squidguard_ignore_date is deprecated and has been replaced by "
+"redirector_ignore_date. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:639 getconf.c:644
 #, c-format
 msgid "The \"byte_cost\" parameter of the configuration file is invalid\n"
 msgstr ""
 
-#: getconf.c:643
+#: getconf.c:651
 #, fuzzy, c-format
 msgid "SARG: Unknown option %s\n"
 msgstr "Unknown option"
 
-#: getconf.c:653
+#: getconf.c:661
 #, fuzzy, c-format
 msgid "Loading configuration from %s\n"
 msgstr "Laden uitzondering bestand uit"
 
-#: getconf.c:656
+#: getconf.c:664
 #, fuzzy, c-format
 msgid "(getconf) Cannot open file %s\n"
 msgstr "Kan bestand niet openen"

diff --git a/po/pl.po b/po/pl.po
index b1fcae179f95467827a0987ec4e2fabdb475de5b..5ded379d8d67ec11b5a1118a4e7ab89a63579ae1 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sarg 2.3\n"
 "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 14:03+0200\n"
+"POT-Creation-Date: 2010-05-11 08:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -565,22 +565,36 @@ msgstr ""
 msgid "Template file name is too long in parameter \"AuthUserTemplateFile\"\n"
 msgstr ""
 
-#: getconf.c:631 getconf.c:636
+#: getconf.c:589
+#, c-format
+msgid ""
+"squidguard_log_format is deprecated and has been replaced by "
+"redirector_log_format. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:595
+#, c-format
+msgid ""
+"squidguard_ignore_date is deprecated and has been replaced by "
+"redirector_ignore_date. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:639 getconf.c:644
 #, c-format
 msgid "The \"byte_cost\" parameter of the configuration file is invalid\n"
 msgstr ""
 
-#: getconf.c:643
+#: getconf.c:651
 #, fuzzy, c-format
 msgid "SARG: Unknown option %s\n"
 msgstr "Unknown option"
 
-#: getconf.c:653
+#: getconf.c:661
 #, fuzzy, c-format
 msgid "Loading configuration from %s\n"
 msgstr "Czytam plik wykluczenia z"
 
-#: getconf.c:656
+#: getconf.c:664
 #, fuzzy, c-format
 msgid "(getconf) Cannot open file %s\n"
 msgstr "Nie moїna otworzyж pliku"

diff --git a/po/pt.po b/po/pt.po
index 2b94f0a8d36aebcf771aacb67b81d3d0e295bb0c..ccb712ef322cc1202e940be352c517ade460f855 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sarg 2.3\n"
 "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 14:03+0200\n"
+"POT-Creation-Date: 2010-05-11 08:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -565,22 +565,36 @@ msgstr ""
 msgid "Template file name is too long in parameter \"AuthUserTemplateFile\"\n"
 msgstr ""
 
-#: getconf.c:631 getconf.c:636
+#: getconf.c:589
+#, c-format
+msgid ""
+"squidguard_log_format is deprecated and has been replaced by "
+"redirector_log_format. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:595
+#, c-format
+msgid ""
+"squidguard_ignore_date is deprecated and has been replaced by "
+"redirector_ignore_date. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:639 getconf.c:644
 #, c-format
 msgid "The \"byte_cost\" parameter of the configuration file is invalid\n"
 msgstr ""
 
-#: getconf.c:643
+#: getconf.c:651
 #, fuzzy, c-format
 msgid "SARG: Unknown option %s\n"
 msgstr "Unknown option"
 
-#: getconf.c:653
+#: getconf.c:661
 #, fuzzy, c-format
 msgid "Loading configuration from %s\n"
 msgstr "Carregando arquivo de exclusao"
 
-#: getconf.c:656
+#: getconf.c:664
 #, fuzzy, c-format
 msgid "(getconf) Cannot open file %s\n"
 msgstr "Erro no open do arquivo"

diff --git a/po/ro.po b/po/ro.po
index 5375d69b1d8dee63b5bee4231b411999622b0eab..66697748b26d204e7d6d63f5377e9a86b314b204 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sarg 2.3\n"
 "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 14:03+0200\n"
+"POT-Creation-Date: 2010-05-11 08:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -565,22 +565,36 @@ msgstr ""
 msgid "Template file name is too long in parameter \"AuthUserTemplateFile\"\n"
 msgstr ""
 
-#: getconf.c:631 getconf.c:636
+#: getconf.c:589
+#, c-format
+msgid ""
+"squidguard_log_format is deprecated and has been replaced by "
+"redirector_log_format. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:595
+#, c-format
+msgid ""
+"squidguard_ignore_date is deprecated and has been replaced by "
+"redirector_ignore_date. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:639 getconf.c:644
 #, c-format
 msgid "The \"byte_cost\" parameter of the configuration file is invalid\n"
 msgstr ""
 
-#: getconf.c:643
+#: getconf.c:651
 #, fuzzy, c-format
 msgid "SARG: Unknown option %s\n"
 msgstr "Unknown option"
 
-#: getconf.c:653
+#: getconf.c:661
 #, fuzzy, c-format
 msgid "Loading configuration from %s\n"
 msgstr "Se incarca fisierul de excluderi din"
 
-#: getconf.c:656
+#: getconf.c:664
 #, fuzzy, c-format
 msgid "(getconf) Cannot open file %s\n"
 msgstr "Nu poate fi deshis fisierul"

diff --git a/po/ru.po b/po/ru.po
index f42c549819d7c013f8e8834088e5345bed97b599..bec36034f34743d4691461aff887433cc96a62b7 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sarg 2.3\n"
 "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 14:03+0200\n"
+"POT-Creation-Date: 2010-05-11 08:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -565,22 +565,36 @@ msgstr ""
 msgid "Template file name is too long in parameter \"AuthUserTemplateFile\"\n"
 msgstr ""
 
-#: getconf.c:631 getconf.c:636
+#: getconf.c:589
+#, c-format
+msgid ""
+"squidguard_log_format is deprecated and has been replaced by "
+"redirector_log_format. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:595
+#, c-format
+msgid ""
+"squidguard_ignore_date is deprecated and has been replaced by "
+"redirector_ignore_date. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:639 getconf.c:644
 #, c-format
 msgid "The \"byte_cost\" parameter of the configuration file is invalid\n"
 msgstr ""
 
-#: getconf.c:643
+#: getconf.c:651
 #, fuzzy, c-format
 msgid "SARG: Unknown option %s\n"
 msgstr "Unknown option"
 
-#: getconf.c:653
+#: getconf.c:661
 #, fuzzy, c-format
 msgid "Loading configuration from %s\n"
 msgstr "Загрузка исключений из"
 
-#: getconf.c:656
+#: getconf.c:664
 #, fuzzy, c-format
 msgid "(getconf) Cannot open file %s\n"
 msgstr "Не могу открыть файл"

diff --git a/po/sk.po b/po/sk.po
index e10d17e7a96d5b3c8bbd7dcc0d9a55e9baca51a1..3a8821bbc5c8a8651b49236de67a2a3e8c4bfef0 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sarg 2.3\n"
 "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 14:03+0200\n"
+"POT-Creation-Date: 2010-05-11 08:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -565,22 +565,36 @@ msgstr ""
 msgid "Template file name is too long in parameter \"AuthUserTemplateFile\"\n"
 msgstr ""
 
-#: getconf.c:631 getconf.c:636
+#: getconf.c:589
+#, c-format
+msgid ""
+"squidguard_log_format is deprecated and has been replaced by "
+"redirector_log_format. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:595
+#, c-format
+msgid ""
+"squidguard_ignore_date is deprecated and has been replaced by "
+"redirector_ignore_date. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:639 getconf.c:644
 #, c-format
 msgid "The \"byte_cost\" parameter of the configuration file is invalid\n"
 msgstr ""
 
-#: getconf.c:643
+#: getconf.c:651
 #, fuzzy, c-format
 msgid "SARG: Unknown option %s\n"
 msgstr "Unknown option"
 
-#: getconf.c:653
+#: getconf.c:661
 #, fuzzy, c-format
 msgid "Loading configuration from %s\n"
 msgstr "Načítávam súbor výnimok z"
 
-#: getconf.c:656
+#: getconf.c:664
 #, fuzzy, c-format
 msgid "(getconf) Cannot open file %s\n"
 msgstr "Nedá sa otvoriť súbor"

diff --git a/po/sr.po b/po/sr.po
index e9da5d50e43bff9a4034c09d04bbe30164bc93ad..53709e7105343abdc8f01ea5740ee53b8252541e 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sarg 2.3\n"
 "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 14:03+0200\n"
+"POT-Creation-Date: 2010-05-11 08:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -565,22 +565,36 @@ msgstr ""
 msgid "Template file name is too long in parameter \"AuthUserTemplateFile\"\n"
 msgstr ""
 
-#: getconf.c:631 getconf.c:636
+#: getconf.c:589
+#, c-format
+msgid ""
+"squidguard_log_format is deprecated and has been replaced by "
+"redirector_log_format. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:595
+#, c-format
+msgid ""
+"squidguard_ignore_date is deprecated and has been replaced by "
+"redirector_ignore_date. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:639 getconf.c:644
 #, c-format
 msgid "The \"byte_cost\" parameter of the configuration file is invalid\n"
 msgstr ""
 
-#: getconf.c:643
+#: getconf.c:651
 #, fuzzy, c-format
 msgid "SARG: Unknown option %s\n"
 msgstr "Unknown option"
 
-#: getconf.c:653
+#: getconf.c:661
 #, fuzzy, c-format
 msgid "Loading configuration from %s\n"
 msgstr "Ucitavanje exclude datoteke iz"
 
-#: getconf.c:656
+#: getconf.c:664
 #, fuzzy, c-format
 msgid "(getconf) Cannot open file %s\n"
 msgstr "Nemoguce otvoriti datoteku ili je los putokaz"

diff --git a/po/tr.po b/po/tr.po
index 4ac98b97c8c2dacd434abb6527754328380da51d..e092a3a54e879e9b59b4e891426713e562b12170 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sarg 2.3\n"
 "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 14:03+0200\n"
+"POT-Creation-Date: 2010-05-11 08:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -565,22 +565,36 @@ msgstr ""
 msgid "Template file name is too long in parameter \"AuthUserTemplateFile\"\n"
 msgstr ""
 
-#: getconf.c:631 getconf.c:636
+#: getconf.c:589
+#, c-format
+msgid ""
+"squidguard_log_format is deprecated and has been replaced by "
+"redirector_log_format. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:595
+#, c-format
+msgid ""
+"squidguard_ignore_date is deprecated and has been replaced by "
+"redirector_ignore_date. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:639 getconf.c:644
 #, c-format
 msgid "The \"byte_cost\" parameter of the configuration file is invalid\n"
 msgstr ""
 
-#: getconf.c:643
+#: getconf.c:651
 #, fuzzy, c-format
 msgid "SARG: Unknown option %s\n"
 msgstr "Unknown option"
 
-#: getconf.c:653
+#: getconf.c:661
 #, fuzzy, c-format
 msgid "Loading configuration from %s\n"
 msgstr "Exclude dosyasi okunuyor"
 
-#: getconf.c:656
+#: getconf.c:664
 #, fuzzy, c-format
 msgid "(getconf) Cannot open file %s\n"
 msgstr "Dosya acilamiyor"

diff --git a/po/uk.po b/po/uk.po
index ef1da4c21fd7171ab2e3fe674ff9a124fb1eb2f3..04fe31b234c32a49b32e97e20107b5fbecc79787 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sarg 2.3\n"
 "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 14:03+0200\n"
+"POT-Creation-Date: 2010-05-11 08:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -564,22 +564,36 @@ msgstr ""
 msgid "Template file name is too long in parameter \"AuthUserTemplateFile\"\n"
 msgstr ""
 
-#: getconf.c:631 getconf.c:636
+#: getconf.c:589
+#, c-format
+msgid ""
+"squidguard_log_format is deprecated and has been replaced by "
+"redirector_log_format. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:595
+#, c-format
+msgid ""
+"squidguard_ignore_date is deprecated and has been replaced by "
+"redirector_ignore_date. Please update your configuration file.\n"
+msgstr ""
+
+#: getconf.c:639 getconf.c:644
 #, c-format
 msgid "The \"byte_cost\" parameter of the configuration file is invalid\n"
 msgstr ""
 
-#: getconf.c:643
+#: getconf.c:651
 #, fuzzy, c-format
 msgid "SARG: Unknown option %s\n"
 msgstr "Unknown option"
 
-#: getconf.c:653
+#: getconf.c:661
 #, fuzzy, c-format
 msgid "Loading configuration from %s\n"
 msgstr "Завантаження виключень їз"
 
-#: getconf.c:656
+#: getconf.c:664
 #, fuzzy, c-format
 msgid "(getconf) Cannot open file %s\n"
 msgstr "Не можу відкрити файл"

diff --git a/sarg.conf b/sarg.conf
index 101687d6ad6617ff6b5a03e3de499b24365ae142..60560031f22af64ddbffac0610a028bed13e6cb9 100644 (file)
--- a/sarg.conf
+++ b/sarg.conf
@@ -496,11 +496,12 @@
 #
 #redirector_log /usr/local/squidGuard/var/logs/urls.log
 
-# TAG: squidguard_ignore_date on|off
-#      Use 'on'  use the record even the date range is different from the used squid access.log file.
-#      Use 'off' use the record only if the date range is in the used squid access.log file.
+# TAG: redirector_ignore_date on|off
+#      was named squidguard_ignore_date before sarg 2.3 but was renamed as it is not specific to squidGuard.
+#      Set to 'on' to use the record even if the date is different from the date in the access log file.
+#      Set to 'off' to use the record only if the date is within the range found in the access log file.
 #
-#squidguard_ignore_date off
+#redirector_ignore_date off
 
 # TAG: redirector_log_format
 #      Format string for web proxy redirector logs.

diff --git a/squidguard_log.c b/squidguard_log.c
index e2761804da45f7e26a3afbd6fb297807c8e57765..19abe1da0159a54834a94ae11149fcfc02760e89 100644 (file)
--- a/squidguard_log.c
+++ b/squidguard_log.c
@@ -194,7 +194,7 @@ static void read_log(const char *wentp, FILE *fp_ou,int dfrom,int duntil)
       sprintf(wdata,"%s%s%s",year,mon,day);
       idata = atoi(wdata);
 
-      if(SquidguardIgnoreDate) {
+      if(RedirectorIgnoreDate) {
          if(idata < dfrom || idata > duntil)
             continue;
       }