From b18ce4a02d83786517da1b7e2771963ec7ab1d20 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Marchal?= Date: Tue, 2 Feb 2010 13:35:05 +0000 Subject: [PATCH] Clarification of labels for header style --- authfail.c | 6 ++--- css.c | 30 +++++++++++++++--------- dansguardian_report.c | 6 ++--- denied.c | 6 ++--- download.c | 6 ++--- html.c | 54 +++++++++++++++++++++---------------------- index.c | 8 +++---- realtime.c | 2 +- repday.c | 14 +++++------ report.c | 10 ++++---- siteuser.c | 8 +++---- squidguard_report.c | 6 ++--- topsites.c | 10 ++++---- topuser.c | 50 +++++++++++++++++++-------------------- useragent.c | 6 ++--- 15 files changed, 115 insertions(+), 107 deletions(-) diff --git a/authfail.c b/authfail.c index 7ad02e1..601ab8e 100644 --- a/authfail.c +++ b/authfail.c @@ -108,15 +108,15 @@ void authfail_report(void) fputs("
\n",fp_ou); fprintf(fp_ou,"\n",Title); - fprintf(fp_ou,"\n",text[89],period); - fprintf(fp_ou,"\n",text[117]); + fprintf(fp_ou,"\n",text[89],period); + fprintf(fp_ou,"\n",text[117]); fputs("
%s
%s: %s
%s
%s: %s
%s
\n",fp_ou); fputs("
\n",fp_ou); fputs("\n",fp_ou); fputs("\n",fp_ou); fputs("\n",fp_ou); - fprintf(fp_ou,"\n",text[98],text[111],text[110],text[91]); + fprintf(fp_ou,"\n",text[98],text[111],text[110],text[91]); while(fgets(buf,sizeof(buf),fp_in)!=NULL) { getword_start(&gwarea,buf); diff --git a/css.c b/css.c index adc984a..702eda9 100644 --- a/css.c +++ b/css.c @@ -30,15 +30,17 @@ void css(FILE *fp_css) { FILE *fp_in; + char buf[MAXLEN]; + size_t nbytes; - if(strlen(ExternalCSSFile) > 0) { + if(ExternalCSSFile[0] != '\0') { if((fp_in=fopen(ExternalCSSFile,"r"))==NULL) { fprintf(stderr, "SARG: (css) %s: %s\n",text[45],ExternalCSSFile); exit(1); } - fputs("\n",fp_css); return; @@ -51,20 +53,26 @@ void css(FILE *fp_css) fprintf(fp_css,".body {font-family:%s;color:%s;background-color:%s;}\n",FontFace,TxColor,BgColor); fprintf(fp_css,".info {font-family:%s;font-size:10px;}\n", FontFace); fprintf(fp_css,".info a:link,a:visited {font-family:%s;color:#0000FF;font-size:10px;text-decoration:none;}\n", FontFace); - fprintf(fp_css,".title {font-family:%s;font-size:%s;color:%s;background-color:%s;}\n",FontFace,TitleFontSize,TiColor,BgColor); + + fprintf(fp_css,".title {font-family:%s;font-size:%s;color:%s;background-color:%s;text-align:center;}\n",FontFace,TitleFontSize,TiColor,BgColor); fprintf(fp_css,".title2 {font-family:%s;font-size:%s;color:%s;background-color:%s;text-align:left;}\n",FontFace,TitleFontSize,TiColor,BgColor); fprintf(fp_css,".title3 {font-family:%s;font-size:%s;color:%s;background-color:%s;text-align:right;}\n",FontFace,TitleFontSize,TiColor,BgColor); - fprintf(fp_css,".header {font-family:%s;font-size:%s;color:%s;background-color:%s;text-align:left;border-right:1px solid #666666;border-bottom:1px solid #666666;}\n",FontFace,HeaderFontSize,HeaderColor,HeaderBgColor); - fprintf(fp_css,".header2 {font-family:%s;font-size:%s;color:%s;background-color:%s;text-align:right;border-right:1px solid #666666;border-bottom:1px solid #666666;}\n",FontFace,HeaderFontSize,HeaderColor,HeaderBgColor); - fprintf(fp_css,".header3 {font-family:%s;font-size:%s;color:%s;background-color:%s;text-align:center;border-right:1px solid #666666;border-bottom:1px solid #666666;}\n",FontFace,HeaderFontSize,HeaderColor,HeaderBgColor); - fprintf(fp_css,".text {font-family:%s;color:%s;font-size:%s;}\n", FontFace, TxColor, FontSize); + + fprintf(fp_css,".header_l {font-family:%s;font-size:%s;color:%s;background-color:%s;text-align:left;border-right:1px solid #666666;border-bottom:1px solid #666666;}\n",FontFace,HeaderFontSize,HeaderColor,HeaderBgColor); + fprintf(fp_css,".header_r {font-family:%s;font-size:%s;color:%s;background-color:%s;text-align:right;border-right:1px solid #666666;border-bottom:1px solid #666666;}\n",FontFace,HeaderFontSize,HeaderColor,HeaderBgColor); + fprintf(fp_css,".header_c {font-family:%s;font-size:%s;color:%s;background-color:%s;text-align:center;border-right:1px solid #666666;border-bottom:1px solid #666666;}\n",FontFace,HeaderFontSize,HeaderColor,HeaderBgColor); + fprintf(fp_css,".data {font-family:%s;color:%s;font-size:%s;background-color:%s;text-align:right;border-right:1px solid #6A5ACD;border-bottom:1px solid #6A5ACD;}\n", FontFace, TxColor, FontSize, TxBgColor); fprintf(fp_css,".data a:link,a:visited {font-family:%s;color:#0000FF;font-size:%s;background-color:%s;text-align:right;text-decoration:none;}\n", FontFace, FontSize, TxBgColor); - fprintf(fp_css,".data2 {font-family:%s;color:%s;font-size:%s;background-color:%s;border-right:1px solid #6A5ACD;border-bottom:1px solid #6A5ACD;text-align:left;}\n", FontFace, TxColor, FontSize, TxBgColor); + + fprintf(fp_css,".data2 {font-family:%s;color:%s;font-size:%s;background-color:%s;text-align:left;border-right:1px solid #6A5ACD;border-bottom:1px solid #6A5ACD;text-align:left;}\n", FontFace, TxColor, FontSize, TxBgColor); fprintf(fp_css,".data2 a:link,a:visited {font-family:%s;color:#0000FF;font-size:%s;background-color:%s;text-decoration:none;}\n", FontFace, FontSize, TxBgColor); - fprintf(fp_css,".data3 {font-family:%s;color:%s;font-size:%s;text-align:center;background-color:%s;border-right:1px solid #6A5ACD;border-bottom:1px solid #6A5ACD;}\n", FontFace, TxColor, FontSize, TxBgColor); + + fprintf(fp_css,".data3 {font-family:%s;color:%s;font-size:%s;background-color:%s;text-align:center;border-right:1px solid #6A5ACD;border-bottom:1px solid #6A5ACD;}\n", FontFace, TxColor, FontSize, TxBgColor); fprintf(fp_css,".data3 a:link,a:visited {font-family:%s;color:#0000FF;font-size:%s;text-align:center;background-color:%s;text-decoration:none;}\n", FontFace, FontSize, TxBgColor); + fprintf(fp_css,".text {font-family:%s;color:%s;font-size:%s;background-color:%s;text-align:right;}\n", FontFace, TxColor, FontSize, TxBgColor); + fprintf(fp_css,".link {font-family:%s;font-size:%s;color:#0000FF;}\n", FontFace, FontSize); fprintf(fp_css,".link a:link,a:visited {font-family:%s;font-size:%s;color:#0000FF;text-decoration:none;}\n\n", FontFace, FontSize); } diff --git a/dansguardian_report.c b/dansguardian_report.c index 63cb53b..226b0c8 100644 --- a/dansguardian_report.c +++ b/dansguardian_report.c @@ -96,13 +96,13 @@ void dansguardian_report(void) fputs("
%s%s%s%s
%s%s%s%s
\n",fp_ou); fprintf(fp_ou,"\n",Title); - fprintf(fp_ou,"\n",text[89],period); - fprintf(fp_ou,"\n",text[128]); + fprintf(fp_ou,"\n",text[89],period); + fprintf(fp_ou,"\n",text[128]); fputs("
%s
%s: %s
%s
%s: %s
%s
\n",fp_ou); fputs("
\n",fp_ou); fputs("\n",fp_ou); - fprintf(fp_ou,"\n",text[98],text[111],text[110],text[91],text[129]); + fprintf(fp_ou,"\n",text[98],text[111],text[110],text[91],text[129]); while(fgets(buf,sizeof(buf),fp_in)!=NULL) { getword_start(&gwarea,buf); diff --git a/denied.c b/denied.c index 09ff69b..710a146 100644 --- a/denied.c +++ b/denied.c @@ -96,13 +96,13 @@ void gen_denied_report(void) fputs("
%s%s%s%s%s
%s%s%s%s%s
\n",fp_ou); fprintf(fp_ou,"\n",Title); - fprintf(fp_ou,"\n",text[89],period); - fprintf(fp_ou,"\n",text[46]); + fprintf(fp_ou,"\n",text[89],period); + fprintf(fp_ou,"\n",text[46]); fputs("
%s
%s: %s
%s
%s: %s
%s
\n",fp_ou); fputs("
\n",fp_ou); fputs("\n",fp_ou); - fprintf(fp_ou,"\n",text[98],text[111],text[110],text[91]); + fprintf(fp_ou,"\n",text[98],text[111],text[110],text[91]); while(fgets(buf,sizeof(buf),fp_in)!=NULL) { getword_start(&gwarea,buf); diff --git a/download.c b/download.c index 12982b3..0630780 100644 --- a/download.c +++ b/download.c @@ -103,13 +103,13 @@ void download_report(void) fputs("
%s%s%s%s
%s%s%s%s
\n",fp_ou); fprintf(fp_ou,"\n",Title); - fprintf(fp_ou,"\n",text[89],period); - fprintf(fp_ou,"\n",text[125]); + fprintf(fp_ou,"\n",text[89],period); + fprintf(fp_ou,"\n",text[125]); fputs("
%s
%s: %s
%s
%s: %s
%s
\n",fp_ou); fputs("
\n",fp_ou); fputs("\n",fp_ou); - fprintf(fp_ou,"\n",text[98],text[111],text[110],text[91]); + fprintf(fp_ou,"\n",text[98],text[111],text[110],text[91]); while(fgets(buf,sizeof(buf),fp_in)!=NULL) { getword_start(&gwarea,buf); diff --git a/html.c b/html.c index 5420e70..108bca7 100644 --- a/html.c +++ b/html.c @@ -255,35 +255,35 @@ void htmlrel(void) fputs("
%s%s%s%s
%s%s%s%s
\n",fp_ou); fprintf(fp_ou,"\n",Title); - fprintf(fp_ou,"\n",text[89],period); - fprintf(fp_ou,"\n",text[90],name2); - fprintf(fp_ou,"\n",text[104],UserSortField,UserSortOrder); - fprintf(fp_ou,"\n",text[32],text[55]); + fprintf(fp_ou,"\n",text[89],period); + fprintf(fp_ou,"\n",text[90],name2); + fprintf(fp_ou,"\n",text[104],UserSortField,UserSortOrder); + fprintf(fp_ou,"\n",text[32],text[55]); fputs("\n",fp_ou); fputs("
%s
%s: %s
%s: %s
%s: %s, %s
%s %s
%s: %s
%s: %s
%s: %s, %s
%s %s
\n",fp_ou); fputs("
\n",fp_ou); if(denied_report[0]!='\0') { - fprintf(fp_ou,"\n",denied_report,text[116],text[55]); + fprintf(fp_ou,"\n",denied_report,text[116],text[55]); } - fprintf(fp_ou,"",text[91]); + fprintf(fp_ou,"",text[91]); if((UserReportFields & USERREPORTFIELDS_CONNECT) != 0) - fprintf(fp_ou,"",text[92]); + fprintf(fp_ou,"",text[92]); if((UserReportFields & USERREPORTFIELDS_BYTES) != 0) - fprintf(fp_ou,"",text[93]); + fprintf(fp_ou,"",text[93]); if((UserReportFields & USERREPORTFIELDS_SETYB) != 0) - fprintf(fp_ou,"",text[93]); + fprintf(fp_ou,"",text[93]); if((UserReportFields & USERREPORTFIELDS_IN_CACHE_OUT) != 0) - fprintf(fp_ou,"",text[113],text[114],text[112]); + fprintf(fp_ou,"",text[113],text[114],text[112]); if((UserReportFields & USERREPORTFIELDS_USED_TIME) != 0) - fprintf(fp_ou,"",text[94]); + fprintf(fp_ou,"",text[94]); if((UserReportFields & USERREPORTFIELDS_MILISEC) != 0) - fprintf(fp_ou,"",text[95]); + fprintf(fp_ou,"",text[95]); if((UserReportFields & USERREPORTFIELDS_PTIME) != 0) - fprintf(fp_ou,"",text[99]); + fprintf(fp_ou,"",text[99]); fputs("\n",fp_ou); @@ -506,27 +506,27 @@ void htmlrel(void) unlink(arqin); if((UserReportFields & USERREPORTFIELDS_TOTAL) != 0) { - fprintf(fp_ou,"",text[107]); + fprintf(fp_ou,"",text[107]); if((UserReportFields & USERREPORTFIELDS_CONNECT) != 0) - fprintf(fp_ou,"",fixnum(tnacc,1)); + fprintf(fp_ou,"",fixnum(tnacc,1)); if((UserReportFields & USERREPORTFIELDS_BYTES) != 0) - fprintf(fp_ou,"",fixnum(tnbytes,1)); + fprintf(fp_ou,"",fixnum(tnbytes,1)); if((UserReportFields & USERREPORTFIELDS_SETYB) != 0) { perc=(totbytes) ? tnbytes *100. / totbytes :0.; - fprintf(fp_ou,"",perc); + fprintf(fp_ou,"",perc); } if((UserReportFields & USERREPORTFIELDS_IN_CACHE_OUT) != 0) { inperc=(tnbytes) ? tnincache * 100. / tnbytes : 0.; ouperc=(tnbytes) ? tnoucache * 100. / tnbytes : 0.; - fprintf(fp_ou,"",inperc,ouperc); + fprintf(fp_ou,"",inperc,ouperc); } if((UserReportFields & USERREPORTFIELDS_USED_TIME) != 0) - fprintf(fp_ou,"",buildtime(tnelap)); + fprintf(fp_ou,"",buildtime(tnelap)); if((UserReportFields & USERREPORTFIELDS_MILISEC) != 0) - fprintf(fp_ou,"",fixnum2(tnelap,1)); + fprintf(fp_ou,"",fixnum2(tnelap,1)); if((UserReportFields & USERREPORTFIELDS_PTIME) != 0) { perc2=(totelap) ? tnelap * 100. / totelap : 0.; - fprintf(fp_ou,"",perc2); + fprintf(fp_ou,"",perc2); } fputs("\n",fp_ou); } @@ -572,19 +572,19 @@ void htmlrel(void) totbytes2=totbytes/ntotuser; totelap2=totelap/ntotuser; - fprintf(fp_ou,"",text[96]); + fprintf(fp_ou,"",text[96]); if((UserReportFields & USERREPORTFIELDS_CONNECT) != 0) - fprintf(fp_ou,"",fixnum(ttnacc/ntotuser,1)); + fprintf(fp_ou,"",fixnum(ttnacc/ntotuser,1)); if((UserReportFields & USERREPORTFIELDS_BYTES) != 0) - fprintf(fp_ou,"",fixnum(totbytes2,1)); + fprintf(fp_ou,"",fixnum(totbytes2,1)); fprintf(fp_ou,""); if((UserReportFields & USERREPORTFIELDS_USED_TIME) != 0) - fprintf(fp_ou,"",buildtime(totelap2)); + fprintf(fp_ou,"",buildtime(totelap2)); if((UserReportFields & USERREPORTFIELDS_MILISEC) != 0) - fprintf(fp_ou,"",fixnum2(totelap2,1)); + fprintf(fp_ou,"",fixnum2(totelap2,1)); if((UserReportFields & USERREPORTFIELDS_PTIME) != 0) { perc2 = (totelap) ? totelap2 * 100. / totelap : 0.; - fprintf(fp_ou,"",perc2); + fprintf(fp_ou,"",perc2); } fputs("\n",fp_ou); } diff --git a/index.c b/index.c index 0aa49c5..5a50d68 100644 --- a/index.c +++ b/index.c @@ -132,7 +132,7 @@ static void make_date_index(void) exit(1); } write_html_header(fp_ou, "."); - fprintf(fp_ou,"\n",text[130],text[132]); + fprintf(fp_ou,"\n",text[130],text[132]); for (y=0 ; y0) year=yearsort[y]; @@ -173,7 +173,7 @@ static void make_date_index(void) exit(1); } write_html_header(fp_ou2,".."); - fprintf(fp_ou2,"\n",text[130],text[131]); + fprintf(fp_ou2,"\n",text[130],text[131]); for (m=0 ; m0) month=monthsort[m]; @@ -228,7 +228,7 @@ static void make_date_index(void) exit(1); } write_html_header(fp_ou3,"../.."); - fprintf(fp_ou3,"\n",text[130],text[131],text[127]); + fprintf(fp_ou3,"\n",text[130],text[131],text[127]); for (d=0 ; d0) day=daysort[d]; @@ -382,7 +382,7 @@ static void make_file_index(void) exit(1); } write_html_header(fp_ou,"."); - fprintf(fp_ou,"\n",text[101],text[102],text[103],text[93],text[96]); + fprintf(fp_ou,"\n",text[101],text[102],text[103],text[93],text[96]); for (i=0 ; i0) item=sortlist[i]; diff --git a/realtime.c b/realtime.c index 1f54f8a..7668dc9 100755 --- a/realtime.c +++ b/realtime.c @@ -253,5 +253,5 @@ static void header(void) puts("
%s %s
%s %s
%s
%s%s%s%s%s%%%s%%%s%s-%s-%s%s-%s-%s%s%s%s%s%%%s%%%s
%s
%s%s%s%s%s%3.2lf%%%3.2lf%%%3.2lf%%%3.2lf%%%3.2lf%%%3.2lf%%%s%s%s%s%3.2lf%%%3.2lf%%
%s
%s%s%s%s%s%s%s%s%s%3.2lf%%%3.2lf%%
%s%s
%s%s
%s/%s
%s/%s
%s/%s/%s
%s/%s/%s
%s%s%s%s%s
%s%s%s%s%s
\n"); printf("\n",text[134]); printf("\n",text[136],realtime_refresh); - printf("\n",text[110],text[111],text[98],text[135],text[91]); + printf("\n",text[110],text[111],text[98],text[135],text[91]); } diff --git a/repday.c b/repday.c index 14de9fc..d865e86 100644 --- a/repday.c +++ b/repday.c @@ -87,7 +87,7 @@ void report_day(const char *user) fputs("
SARG %s
%s: %d s
%s%s%s%s%s
%s%s%s%s%s
\n",fp_ou); fputs("
\n",fp_ou); - fprintf(fp_ou,"\n",text[89],period); + fprintf(fp_ou,"\n",text[89],period); strcpy(wuser,user); if(strstr(wuser,"_") != 0) @@ -105,7 +105,7 @@ void report_day(const char *user) subs(name,sizeof(name),"_","."); } - fprintf(fp_ou,"\n",text[90],name); + fprintf(fp_ou,"\n",text[90],name); fputs("\n",fp_ou); fputs("
%s: %s
%s: %s
%s: %s
%s: %s
\n",fp_ou); @@ -120,9 +120,9 @@ void report_day(const char *user) strcpy( html, "H:M:S" ); for( i = 0; i < hours.len; i++ ) - fprintf( fp_ou, "%02dH
%s\n", hours.list[ i ], html ); + fprintf( fp_ou, "%02dH
%s\n", hours.list[ i ], html ); fprintf( fp_ou, - "%s
%s\n", text[107], html ); + "%s
%s\n", text[107], html ); while(fgets(buf,sizeof(buf),fp_in)!=NULL) { fixendofline(buf); @@ -182,10 +182,10 @@ void report_day(const char *user) for( i = 0; i < hours.len; i++ ) sprintf(c[ hours.list[ i ] ],"%s",fixtime(t[ hours.list[ i ] ])); - fprintf(fp_ou, "%s\n", text[107] ); + fprintf(fp_ou, "%s\n", text[107] ); for( i = 0; i < hours.len; i++ ) - fprintf(fp_ou, "%s\n", c[ hours.list[ i ] ] ); - fprintf(fp_ou, "%s\n", fixtime(ttt) ); + fprintf(fp_ou, "%s\n", c[ hours.list[ i ] ] ); + fprintf(fp_ou, "%s\n", fixtime(ttt) ); fputs("
\n",fp_ou); diff --git a/report.c b/report.c index 4e0cc03..9766540 100644 --- a/report.c +++ b/report.c @@ -261,17 +261,17 @@ void gerarel(void) fputs("
\n",fp_tt); fprintf(fp_tt,"\n",Title); - fprintf(fp_tt,"\n",text[89],period); - fprintf(fp_tt,"\n",text[90],name); - fprintf(fp_tt,"\n",text[104],UserSortField,UserSortOrder); - fprintf(fp_tt,"\n",text[32]); + fprintf(fp_tt,"\n",text[89],period); + fprintf(fp_tt,"\n",text[90],name); + fprintf(fp_tt,"\n",text[104],UserSortField,UserSortOrder); + fprintf(fp_tt,"\n",text[32]); fputs("
%s
%s: %s
%s: %s
%s: %s, %s
%s
%s: %s
%s: %s
%s: %s, %s
%s
\n",fp_tt); fputs("
\n",fp_tt); fputs("",fp_tt); bzero(tmp4, MAXLEN); strncpy(tmp4,text[110],4); - fprintf(fp_tt,"\n",text[91],tmp4,text[110]+5); + fprintf(fp_tt,"\n",text[91],tmp4,text[110]+5); } sprintf(html,"\n",accurl,accdia,acchora); diff --git a/siteuser.c b/siteuser.c index 21fc0ea..ca4b8e4 100644 --- a/siteuser.c +++ b/siteuser.c @@ -107,16 +107,16 @@ void siteuser(void) fputs("
%s%s%s
%s%s%s
%s%s%s
\n",fp_ou); fprintf(fp_ou,"\n",Title); - fprintf(fp_ou,"\n",text[89],period); - fprintf(fp_ou,"\n",text[85]); + fprintf(fp_ou,"\n",text[89],period); + fprintf(fp_ou,"\n",text[85]); fputs("
%s
%s: %s
%s
%s: %s
%s
\n",fp_ou); fputs("
\n",fp_ou); fputs("\n",fp_ou); if(BytesInSitesUsersReport) - fprintf(fp_ou,"\n",text[100],text[91],text[93],text[103]); + fprintf(fp_ou,"\n",text[100],text[91],text[93],text[103]); else - fprintf(fp_ou,"\n",text[100],text[91],text[103]); + fprintf(fp_ou,"\n",text[100],text[91],text[103]); user[0]='\0'; ourl[0]='\0'; diff --git a/squidguard_report.c b/squidguard_report.c index a018fef..4bd9cf2 100644 --- a/squidguard_report.c +++ b/squidguard_report.c @@ -96,13 +96,13 @@ void squidguard_report(void) fputs("
%s%s%s%s
%s%s%s%s
%s%s%s
%s%s%s
\n",fp_ou); fprintf(fp_ou,"\n",Title); - fprintf(fp_ou,"\n",text[89],period); - fprintf(fp_ou,"\n",text[120]); + fprintf(fp_ou,"\n",text[89],period); + fprintf(fp_ou,"\n",text[120]); fputs("
%s
%s: %s
%s
%s: %s
%s
\n",fp_ou); fputs("
\n",fp_ou); fputs("\n",fp_ou); - fprintf(fp_ou,"\n",text[98],text[111],text[110],text[91],text[121]); + fprintf(fp_ou,"\n",text[98],text[111],text[110],text[91],text[121]); while(fgets(buf,sizeof(buf),fp_in)!=NULL) { getword_start(&gwarea,buf); diff --git a/topsites.c b/topsites.c index 79cf923..906e028 100644 --- a/topsites.c +++ b/topsites.c @@ -232,15 +232,15 @@ void topsites(void) fputs("
%s%s%s%s%s
%s%s%s%s%s
\n",fp_ou); fprintf(fp_ou,"\n",Title); - fprintf(fp_ou,"\n",text[89],period); - fprintf(fp_ou,"\n",text[83],TopSitesNum,text[84]); + fprintf(fp_ou,"\n",text[89],period); + fprintf(fp_ou,"\n",text[83],TopSitesNum,text[84]); fputs("
%s
%s: %s
%s %s %s
%s: %s
%s %s %s
\n",fp_ou); fputs("
\n",fp_ou); fputs("\n",fp_ou); - fprintf(fp_ou," \ - \ - \n", \ + fprintf(fp_ou," \ + \ + \n", \ text[100],text[91],text[92],text[93],text[99]); regs=1; diff --git a/topuser.c b/topuser.c index 5a441c9..a5572d4 100644 --- a/topuser.c +++ b/topuser.c @@ -239,10 +239,10 @@ void topuser(void) else show_sarg(fp_top3, ".."); fputs("
%s%s%s%s%s
%s%s%s%s%s
\n",fp_top3); - fprintf(fp_top3,"\n",Title); - fprintf(fp_top3,"\n",text[89],period); - fprintf(fp_top3,"\n",text[104],TopuserSortField,TopuserSortOrder); - fprintf(fp_top3,"\n",text[137]); + fprintf(fp_top3,"\n",Title); + fprintf(fp_top3,"\n",text[89],period); + fprintf(fp_top3,"\n",text[104],TopuserSortField,TopuserSortOrder); + fprintf(fp_top3,"\n",text[137]); fputs("
%s
%s: %s
%s: %s, %s
%s
%s
%s: %s
%s: %s, %s
%s
\n",fp_top3); fputs("
\n",fp_top3); @@ -267,25 +267,25 @@ void topuser(void) fputs("",fp_top3); if((TopUserFields & TOPUSERFIELDS_NUM) != 0) - fprintf(fp_top3,"",text[100]); + fprintf(fp_top3,"",text[100]); if((TopUserFields & TOPUSERFIELDS_DATE_TIME) !=0 && (ReportType & REPORT_TYPE_DATE_TIME) != 0) - fputs("",fp_top3); + fputs("",fp_top3); if((TopUserFields & TOPUSERFIELDS_USERID) != 0) - fprintf(fp_top3,"",text[98]); + fprintf(fp_top3,"",text[98]); if((TopUserFields & TOPUSERFIELDS_CONNECT) != 0) - fprintf(fp_top3,"",text[92]); + fprintf(fp_top3,"",text[92]); if((TopUserFields & TOPUSERFIELDS_BYTES) != 0) - fprintf(fp_top3,"",text[93]); + fprintf(fp_top3,"",text[93]); if((TopUserFields & TOPUSERFIELDS_SETYB) != 0) - fprintf(fp_top3,"",text[93]); + fprintf(fp_top3,"",text[93]); if((TopUserFields & TOPUSERFIELDS_IN_CACHE_OUT) != 0) - fprintf(fp_top3,"",text[113],text[114],text[112]); + fprintf(fp_top3,"",text[113],text[114],text[112]); if((TopUserFields & TOPUSERFIELDS_USED_TIME) != 0) - fprintf(fp_top3,"",text[94]); + fprintf(fp_top3,"",text[94]); if((TopUserFields & TOPUSERFIELDS_MILISEC) != 0) - fprintf(fp_top3,"",text[95]); + fprintf(fp_top3,"",text[95]); if((TopUserFields & TOPUSERFIELDS_PTIME) != 0) - fprintf(fp_top3,"",text[99]); + fprintf(fp_top3,"",text[99]); fputs("\n",fp_top3); @@ -410,24 +410,24 @@ void topuser(void) fputs("",fp_top3); if((TopUserFields & TOPUSERFIELDS_DATE_TIME) !=0 && (ReportType & REPORT_TYPE_DATE_TIME) != 0) fputs("",fp_top3); - fprintf(fp_top3,"",text[107]); + fprintf(fp_top3,"",text[107]); if((TopUserFields & TOPUSERFIELDS_CONNECT) != 0) - fprintf(fp_top3,"",fixnum(ttnacc,1)); + fprintf(fp_top3,"",fixnum(ttnacc,1)); if((TopUserFields & TOPUSERFIELDS_BYTES) != 0) - fprintf(fp_top3,"",fixnum(ttnbytes,1)); + fprintf(fp_top3,"",fixnum(ttnbytes,1)); if((TopUserFields & TOPUSERFIELDS_SETYB) != 0) fputs("",fp_top3); if((TopUserFields & TOPUSERFIELDS_IN_CACHE_OUT) != 0) { inperc=(ttnbytes) ? ttnincache * 100. / ttnbytes : 0.; ouperc=(ttnbytes) ? ttnoucache *100. / ttnbytes : 0.; - fprintf(fp_top3,"",inperc,ouperc); + fprintf(fp_top3,"",inperc,ouperc); } if((TopUserFields & TOPUSERFIELDS_USED_TIME) != 0) - fprintf(fp_top3,"",buildtime(ttnelap)); + fprintf(fp_top3,"",buildtime(ttnelap)); if((TopUserFields & TOPUSERFIELDS_MILISEC) != 0) - fprintf(fp_top3,"",fixnum2(ttnelap,1)); + fprintf(fp_top3,"",fixnum2(ttnelap,1)); fputs("\n",fp_top3); } @@ -438,22 +438,22 @@ void topuser(void) fputs("",fp_top3); if((TopUserFields & TOPUSERFIELDS_DATE_TIME) !=0 && (ReportType & REPORT_TYPE_DATE_TIME) != 0) fputs("",fp_top3); - fprintf(fp_top3,"",text[96]); + fprintf(fp_top3,"",text[96]); if((TopUserFields & TOPUSERFIELDS_CONNECT) != 0) - fprintf(fp_top3,"",fixnum(ttnacc/totuser,1)); + fprintf(fp_top3,"",fixnum(ttnacc/totuser,1)); if((TopUserFields & TOPUSERFIELDS_BYTES) != 0) { tnbytes=(totuser) ? ttnbytes / totuser : 0; - fprintf(fp_top3,"",fixnum(tnbytes,1)); + fprintf(fp_top3,"",fixnum(tnbytes,1)); } if((TopUserFields & TOPUSERFIELDS_SETYB) != 0) fputs("",fp_top3); if((TopUserFields & TOPUSERFIELDS_IN_CACHE_OUT) != 0) fputs("",fp_top3); if((TopUserFields & TOPUSERFIELDS_USED_TIME) != 0) - fprintf(fp_top3,"",buildtime(ttnelap/totuser)); + fprintf(fp_top3,"",buildtime(ttnelap/totuser)); if((TopUserFields & TOPUSERFIELDS_MILISEC) != 0) - fprintf(fp_top3,"",fixnum2(ttnelap/totuser,1)); + fprintf(fp_top3,"",fixnum2(ttnelap/totuser,1)); fputs("\n",fp_top3); } diff --git a/useragent.c b/useragent.c index 2735a7c..54d1a79 100644 --- a/useragent.c +++ b/useragent.c @@ -165,7 +165,7 @@ void useragent(void) show_sarg(fp_ht,".."); fputs("
%s%s%s%s%s%s%s%s%%%s%%%s%s-%s-%s%s-%s-%s%s%s%s%s%%%s%%%s
%s%s%s%s%15s%15s%3.2lf%%%3.2lf%%%3.2lf%%%3.2lf%%%s%s%s%s
%s%s%s%s%15s%15s%s%s%s%s
\n",fp_ht); fprintf(fp_ht,"\n",text[105]); - fprintf(fp_ht,"\n",text[89],idate,fdate); + fprintf(fp_ht,"\n",text[89],idate,fdate); fputs("
%s
%s: %s - %s
%s: %s - %s
\n",fp_ht); fputs("
\n",fp_ht); @@ -174,7 +174,7 @@ void useragent(void) fputs("
\n",fp_ht); fputs("",fp_ht); - fprintf(fp_ou,"\n",text[98],text[106]); + fprintf(fp_ou,"\n",text[98],text[106]); while(fgets(buf,sizeof(buf),fp_in)!=NULL) { getword_start(&gwarea,buf); @@ -290,7 +290,7 @@ void useragent(void) fputs("

\n",fp_ht); fputs("
  
%s%s
%s%s
\n",fp_ht); - fprintf(fp_ht,"\n",text[106],text[107]); + fprintf(fp_ht,"\n",text[106],text[107]); perc=0.; while(fgets(buf,sizeof(buf),fp_in)!=NULL) { -- 2.39.5
%s%s%%
%s%s%%