From: Frédéric Marchal Date: Thu, 10 Dec 2009 10:52:29 +0000 (+0000) Subject: Ported r146 from branches/v2_2_6_1 (useragent font size) X-Git-Tag: v2_2_7~55 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=328eaf464d3a99b8dc9113cbb156e425da3fe8c4;p=thirdparty%2Fsarg.git Ported r146 from branches/v2_2_6_1 (useragent font size) --- diff --git a/useragent.c b/useragent.c index ff0789a..4bb6456 100644 --- a/useragent.c +++ b/useragent.c @@ -144,8 +144,9 @@ void useragent(void) debuga("%s",text[72]); fprintf(fp_ht, "\n\n\n \n",CharSet); + css(fp_ht); fputs("\n",fp_ht); - if(FontFace[0] != '\0') fprintf(fp_ht,"\n",FontFace); + //if(FontFace[0] != '\0') fprintf(fp_ht,"\n",FontFace); fprintf(fp_ht,"\n",BgColor,TxColor,BgImage); write_logo_image(fp_ht); @@ -161,13 +162,13 @@ void useragent(void) fputs("
\n",fp_ht); - fprintf(fp_ht,"\n",HeaderBgColor,FontSize,text[89],TxBgColor,FontSize,idate,fdate); + fprintf(fp_ht,"\n",HeaderBgColor,text[89],TxBgColor,idate,fdate); fputs("
%s:%s - %s
%s:%s - %s
\n",fp_ht); fputs("
\n",fp_ht); fputs("",fp_ht); - fprintf(fp_ou,"\n",HeaderBgColor,FontSize,HeaderColor,text[98],HeaderBgColor,FontSize,HeaderColor,text[106]); + fprintf(fp_ou,"\n",HeaderBgColor,HeaderColor,text[98],HeaderBgColor,HeaderColor,text[106]); while(fgets(buf,sizeof(buf),fp_in)!=NULL) { if (getword(ip,sizeof(ip),buf,'\t')<0) { @@ -190,12 +191,12 @@ void useragent(void) } if(strcmp(user,user_old) != 0) { - fprintf(fp_ht,"\n",TxBgColor,FontSize,user,TxBgColor,FontSize,agent); + fprintf(fp_ht,"\n",TxBgColor,user,TxBgColor,agent); strcpy(user_old,user); strcpy(agent_old,agent); } else { if(strcmp(agent,agent_old) != 0) { - fprintf(fp_ht,"\n",TxBgColor,FontSize,agent); + fprintf(fp_ht,"\n",TxBgColor,agent); strcpy(agent_old,agent); } } @@ -281,7 +282,7 @@ void useragent(void) fputs("

\n",fp_ht); fputs("
%s%s
%s%s
%s%s
%s%s
%s
%s
\n",fp_ht); - fprintf(fp_ht,"\n",HeaderBgColor,FontSize,HeaderColor,text[106],HeaderBgColor,FontSize,HeaderColor,text[107],HeaderBgColor,FontSize,HeaderColor); + fprintf(fp_ht,"\n",HeaderBgColor,HeaderColor,text[106],HeaderBgColor,HeaderColor,text[107],HeaderBgColor,HeaderColor); while(fgets(buf,sizeof(buf),fp_in)!=NULL) { fixendofline(buf); @@ -292,7 +293,7 @@ void useragent(void) perc=atoi(tagent) * 100; perc=perc / agentot2; - fprintf(fp_ht,"\n",TxBgColor,FontSize,buf,TxBgColor,FontSize,atoi(tagent),TxBgColor,FontSize,perc); + fprintf(fp_ht,"\n",TxBgColor,buf,TxBgColor,atoi(tagent),TxBgColor,perc); } fputs("
%s%s%%
%s%s%%
%s%d%3.2f
%s%d%3.2f
\n",fp_ht);