From: Frédéric Marchal Date: Tue, 11 May 2010 07:00:43 +0000 (+0000) Subject: Accept the old option squidguard_log_format but display a warning if it is used. X-Git-Tag: v2.3-pre2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=69fa7b486525b24824292f96a8cbd42dc10bf7a4;p=thirdparty%2Fsarg.git 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 51eaf8b..86f3a19 100644 --- 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 88f22cd..9dec569 100755 --- 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 0390afd..66ad455 100644 --- 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 6b5c78e..7f11f2a 100644 --- 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 \n" "Language-Team: LANGUAGE \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 0a48c91..384ae97 100644 --- 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 \n" "Language-Team: LANGUAGE \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 797383c..914b718 100644 --- 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 \n" "Language-Team: LANGUAGE \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 2172c49..0c877a1 100644 --- 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 \n" "Language-Team: LANGUAGE \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 f9235bd..2145112 100644 --- 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 \n" "Language-Team: LANGUAGE \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 a4df42a..a56baaf 100644 --- 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 \n" "Language-Team: LANGUAGE \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 f7a6417..6143061 100644 --- 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 \n" "Language-Team: French \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 8a934f6..6fc86c3 100644 --- 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 \n" "Language-Team: LANGUAGE \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 154691a..4cf426f 100644 --- 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 \n" "Language-Team: LANGUAGE \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 0b01eda..5572626 100644 --- 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 \n" "Language-Team: LANGUAGE \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 dba786d..ea50251 100644 --- 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 \n" "Language-Team: LANGUAGE \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 e2f54a3..9e045c6 100644 --- 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 \n" "Language-Team: Latvian \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 e5fd3e9..054dbb6 100644 --- 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 \n" "Language-Team: LANGUAGE \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 b1fcae1..5ded379 100644 --- 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 \n" "Language-Team: LANGUAGE \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 2b94f0a..ccb712e 100644 --- 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 \n" "Language-Team: LANGUAGE \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 5375d69..6669774 100644 --- 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 \n" "Language-Team: LANGUAGE \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 f42c549..bec3603 100644 --- 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 \n" "Language-Team: LANGUAGE \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 e10d17e..3a8821b 100644 --- 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 \n" "Language-Team: LANGUAGE \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 e9da5d5..53709e7 100644 --- 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 \n" "Language-Team: LANGUAGE \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 4ac98b9..e092a3a 100644 --- 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 \n" "Language-Team: LANGUAGE \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 ef1da4c..04fe31b 100644 --- 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 \n" "Language-Team: LANGUAGE \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 101687d..6056003 100644 --- 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 e276180..19abe1d 100644 --- 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; }