Store the period internaly and get rid of the sarg-period file.

[thirdparty/sarg.git] / siteuser.c

diff --git a/siteuser.c b/siteuser.c
index 80170dd303c706438a1ec915d745a98108ef72df..bbdb5fac98906a64539ff0a3962a84026674e919 100644 (file)
--- a/siteuser.c
+++ b/siteuser.c
@@ -38,10 +38,8 @@ void siteuser(void)
    char csort[255];
    char general[MAXLEN];
    char general2[MAXLEN];
-   char per[MAXLEN];
    char sites[MAXLEN];
    char report[MAXLEN];
-   char period[100];
    int regs=0;
    int ucount=0;
    int ourl_size;
@@ -60,20 +58,8 @@ void siteuser(void)
    sprintf(general,"%s/sarg-general",outdirname);
    sprintf(sites,"%s/sarg-sites",outdirname);
    sprintf(general2,"%s/sarg-general2",outdirname);
-   sprintf(per,"%s/sarg-period",outdirname);
    sprintf(report,"%s/siteuser.html",outdirname);
 
-   if ((fp_in = fopen(per, "r")) == 0) {
-      debuga(_("(siteuser) Cannot open file %s\n"),per);
-      exit(EXIT_FAILURE);
-   }
-
-   if (!fgets(period,sizeof(period),fp_in)) {
-      debuga(_("(siteuser) read error in %s\n"),per);
-      exit(EXIT_FAILURE);
-   }
-   fclose(fp_in);
-
    sprintf(csort,"sort -k 4,4 -k 1,1 -o \"%s\" \"%s\"",general2,general);
    cstatus=system(csort);
    if (!WIFEXITED(cstatus) || WEXITSTATUS(cstatus)) {
@@ -94,7 +80,9 @@ void siteuser(void)
    }
 
    write_html_header(fp_ou,(IndexTree == INDEX_TREE_DATE) ? 3 : 1,_("Sites & Users"));
-   fprintf(fp_ou,"<tr><td class=\"header_c\">%s: %s</td></tr>\n",_("Period"),period);
+   fputs("<tr><td class=\"header_c\">",fp_ou);
+   fprintf(fp_ou,_("Period: %s"),period.text);
+   fputs("</td></tr>\n",fp_ou);
    fprintf(fp_ou,"<tr><th class=\"header_c\">%s</th></tr>\n",_("Sites & Users"));
    close_html_header(fp_ou);
 
@@ -210,8 +198,10 @@ void siteuser(void)
    unlink(general2);
 
    fputs("</table></div>\n",fp_ou);
-   write_html_trailer(fp_ou);
-   fclose(fp_ou);
+   if (write_html_trailer(fp_ou)<0)
+      debuga(_("Write error in file %s\n"),report);
+   if (fclose(fp_ou)==EOF)
+      debuga(_("Failed to close file %s - %s\n"),report,strerror(errno));
 
    if(users)
       free(users);