From: Guido Serassio Date: Sat, 5 Nov 2005 13:57:36 +0000 (+0000) Subject: Imported sarg 2.0.9 X-Git-Tag: v2_2_6~95 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94ff9470def23029000c8dc1e0aa0eba7c88a919;p=thirdparty%2Fsarg.git Imported sarg 2.0.9 --- diff --git a/ChangeLog b/ChangeLog index 7c1c55a..32ac15a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,21 @@ SARG ChangeLog +Aug/04/2005 version 2.0.9 + - dansguardian_report_limit missing in sarg.conf file. + - ntlm domain+user format added. + - index date sort fixed by Olivier JAVAUX. Thanks + - Improve broken record detection + Thanks to Artem Korneev + - sort open failed causing an empty topuser report + - sarg losslessly size optimized images + Thanks to Tonda Mí¿ek and Luigi Gangitano. + - sarg calling sort without quoting filenames + Thanks to Luigi Gangitano. + - download_report_limit tag added. + Thanks to Leonardo Rodrigues + - logo css class defined but never used. + Thanks to Roger Favero + May/29/2005 version 2.0.8 - verdana.ttf font removed to avoid patent infringement issues. Now sarg uses a GPL FreeSans font from http://savannah.gnu.org diff --git a/DONATIONS b/DONATIONS index 6b678e9..a5eb96c 100644 --- a/DONATIONS +++ b/DONATIONS @@ -1,3 +1,3 @@ -If you like SARG and want to contribute, please email me: orso@brturbo.com +If you like SARG and want to contribute, please go to http://sarg.sourceforge.net Thank you diff --git a/README b/README index 34aa3da..6ca44b8 100644 --- a/README +++ b/README @@ -30,11 +30,13 @@ Roman Vynar - Ukrainian_windows1251 language Andreu Sanchez - Catalan language Antonis Maglaras - Greek language Dusan Woletz - Slovak Language +Jose Luis Hernandez - Spanish language fix +Theo kastermans - Dutch language fix Translating . Copy include/English to YourLanguage . Translate YourLanguage - . Send YourLanguage to orso@brturbo.com to implement + . Send YourLanguage to orso@penguintech.com.br to be implemented. If you use native squid log format, the elapsed time will be in reports (emulate_httpd_log off). @@ -71,4 +73,4 @@ Usage: sarg -h Source: http://www.sarg-squid.org -Any suggests and/or comments, please: orso@brturbo.com +Any suggests and/or comments, please: orso@penguintech.com.br diff --git a/auth.c b/auth.c index a1906f2..7aad8ba 100644 --- a/auth.c +++ b/auth.c @@ -1,7 +1,7 @@ /* - * AUTHOR: Pedro Lineu Orso orso@brturbo.com.br + * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br * 1998, 2005 - * SARG Squid Analysis Report Generator http://sarg-squid.org + * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: * please look at http://sarg.sourceforge.net/donations.php diff --git a/authfail.c b/authfail.c index b73d262..84fc03d 100644 --- a/authfail.c +++ b/authfail.c @@ -1,7 +1,10 @@ /* - * AUTHOR: Pedro Lineu Orso orso@brturbo.com - * 1998, 2004 - * SARG Squid Analysis Report Generator http://sarg-squid.org + * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br + * 1998, 2005 + * SARG Squid Analysis Report Generator http://sarg.sourceforge.net + * + * SARG donations: + * please look at http://sarg.sourceforge.net/donations.php * --------------------------------------------------------------------- * * This program is free software; you can redistribute it and/or modify @@ -61,7 +64,7 @@ void authfail_report() sprintf(per,"%s/periodo",dirname); sprintf(report,"%s/authfail.html",dirname); - sprintf(csort,"sort -b -T %s -k 3,3 -k 5,5 -o %s %s", TempDir, authfail_in, tmp4); + sprintf(csort,"sort -b -T %s -k 3,3 -k 5,5 -o '%s' '%s'", TempDir, authfail_in, tmp4); system(csort); unlink(tmp4); @@ -101,9 +104,10 @@ void authfail_report() fputs(url,fp_ou); if(strlen(LogoImage) > 0) { - fputs("
\n",fp_ou); - sprintf(url,"
%s\n",LogoImage,Width,Height,LogoTextColor,LogoText); + fputs("
\n",fp_ou); + sprintf(url,"\n",LogoImage,Width,Height,LogoText); fputs(url,fp_ou); + fputs("\n",fp_ou); fputs("
 %s
\n",fp_ou); } @@ -169,6 +173,11 @@ void authfail_report() } else strcpy(name,user); } else strcpy(name,user); + if(dotinuser && strstr(name,"_")) { + str2=(char *)subs(name,"_","."); + strcpy(name,str2); + } + if(AuthfailReportLimit) { if(strcmp(ouser2,name) == 0) { count++; diff --git a/charset.c b/charset.c index 7b54ab6..4a08deb 100644 --- a/charset.c +++ b/charset.c @@ -1,7 +1,7 @@ /* - * AUTHOR: Pedro Lineu Orso orso@brturbo.com.br + * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br * 1998, 2005 - * SARG Squid Analysis Report Generator http://sarg-squid.org + * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: * please look at http://sarg.sourceforge.net/donations.php diff --git a/convlog.c b/convlog.c index dd1b918..f0deeda 100644 --- a/convlog.c +++ b/convlog.c @@ -1,7 +1,7 @@ /* - * AUTHOR: Pedro Lineu Orso orso@brturbo.com.br + * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br * 1998, 2005 - * SARG Squid Analysis Report Generator http://sarg-squid.org + * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: * please look at http://sarg.sourceforge.net/donations.php diff --git a/css.c b/css.c index 28ea8a9..cfa8d76 100644 --- a/css.c +++ b/css.c @@ -1,7 +1,7 @@ /* - * AUTHOR: Pedro Lineu Orso orso@brturbo.com.br + * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br * 1998, 2005 - * SARG Squid Analysis Report Generator http://sarg-squid.org + * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: * please look at http://sarg.sourceforge.net/donations.php @@ -44,7 +44,9 @@ int css(FILE *fp_css) } fputs("