Mass commit of all the changes made between version 2.1 and 2.2.5. See ChangeLog...

[thirdparty/sarg.git] / dansguardian_report.c
diff --git a/dansguardian_report.c b/dansguardian_report.c

index d87b8e90fc1379388f3b52a6ae339a1f79af7e54..a3c85d49be79e4f2cb1f352125a1c7f8f06b24ff 100644 (file)
--- a/dansguardian_report.c
+++ b/dansguardian_report.c
@@ -37,7 +37,7 @@ void dansguardian_report()
     char dansguardian_ou[MAXLEN];
     char per[MAXLEN];
     char report[MAXLEN];
-   char periodo[100];
+   char period[100];
     char ip[MAXLEN];
     char rule[255];
     char oip[MAXLEN];
@@ -59,7 +59,7 @@ void dansguardian_report()
        return;
     }
  
-   sprintf(per,"%s/periodo",dirname);
+   sprintf(per,"%s/sarg-period",dirname);
     sprintf(report,"%s/dansguardian.html",dirname);
  
     if ((fp_in = fopen(per, "r")) == 0) {
@@ -67,7 +67,7 @@ void dansguardian_report()
        exit(1);
     }
  
-   fgets(periodo,sizeof(periodo),fp_in);
+   fgets(period,sizeof(period),fp_in);
     fclose(fp_in);
  
     if((fp_in=fopen(dansguardian_in,"r"))==NULL) {
@@ -80,31 +80,13 @@ void dansguardian_report()
       exit(1);
     }
  
-   fputs("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"",fp_ou);
-   fputs(" \"http://www.w3.org/TR/html4/loose.dtd\">\n",fp_ou);
-   fputs("<html>\n",fp_ou);
-   fputs("<head>\n",fp_ou);
-   sprintf(html,"  <meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\">\n",CharSet);
-   fputs(html,fp_ou);
+   fprintf(fp_ou, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n<html>\n<head>\n  <meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\">\n",CharSet);
     css(fp_ou);
     fputs("</head>\n",fp_ou);
-
-   if(strlen(FontFace) > 0) {
-      sprintf(url,"<font face=%s>\n",FontFace);
-      fputs(url,fp_ou);
-   }
-
-   sprintf(url,"<body bgcolor=%s text=%s background='%s'>\n",BgColor,TxColor,BgImage);
-   fputs(url,fp_ou);
-
-   if(strlen(LogoImage) > 0) {
-      fputs("<center><table cellpadding=\"0\" cellspacing=\"0\">\n",fp_ou);
-      sprintf(url,"<tr><th class=\"logo\"><img src='%s' border=0 align=absmiddle width=%s height=%s>&nbsp;%s</th></tr>\n",LogoImage,Width,Height,LogoText);
-      fputs(url,fp_ou);
-      fputs("<tr><td height=\"5\"></td></tr>\n",fp_ou);
-      fputs("</table>\n",fp_ou);
-   }
-
+   if(strlen(FontFace) > 0) fprintf(fp_ou,"<font face=%s>\n",FontFace);
+   fprintf(fp_ou,"<body bgcolor=%s text=%s background='%s'>\n",BgColor,TxColor,BgImage);
+   if(strlen(LogoImage) > 0) fprintf(fp_ou, "<center><table cellpadding=\"0\" cellspacing=\"0\">\n<tr><th class=\"logo\"><img src='%s' border=0 align=absmiddle width=%s height=%s>&nbsp;%s</th></tr>\n<tr><td height=\"5\"></td></tr>\n</table>\n",LogoImage,Width,Height,LogoText);
+   
     if(strcmp(IndexTree,"date") == 0)
        show_sarg(fp_ou, "../../..");
     else
@@ -113,9 +95,9 @@ void dansguardian_report()
     sprintf(url,"<tr><th class=\"title\">%s</th></tr>\n",Title);
     fputs(url,fp_ou);
  
-   sprintf(url,"<tr><td class=\"header\">%s: %s</td></tr>\n",text[89],periodo);
+   sprintf(url,"<tr><td class=\"header\">%s: %s</td></tr>\n",text[89],period);
     fputs(url,fp_ou);
-   sprintf(url,"<tr><th class=\"header3\">%s %s</th></tr>\n",text[128],text[55]);
+   sprintf(url,"<tr><th class=\"header3\">%s</th></tr>\n",text[128]);
     fputs(url,fp_ou);
     fputs("</table></center>\n",fp_ou);