]> git.ipfire.org Git - thirdparty/sarg.git/blobdiff - topuser.c
Be more consistent with the use of the temporary directory (i.e. always use /tmp...
[thirdparty/sarg.git] / topuser.c
index 55058ebc200ef9c6752c45e9302ab942a99dd820..444cfc2ac6bdb59c50fa5321057feac1be416477 100644 (file)
--- a/topuser.c
+++ b/topuser.c
@@ -41,121 +41,58 @@ void topuser(void)
    double perc2=0.00;
    double inperc=0.00, ouperc=0.00;
    int posicao=0;
-   char olduser[MAXLEN], csort[MAXLEN], period[MAXLEN], arqper[MAXLEN];
+   char olduser[MAX_USER_LEN], csort[MAXLEN];
    char wger[MAXLEN], top1[MAXLEN], top2[MAXLEN], top3[MAXLEN];
-   char user[MAXLEN], tusr[MAXLEN];
-   char ip[MAXLEN], time[30], date[30];
+   char user[MAX_USER_LEN], tusr[MAXLEN];
    char ipantes[MAXLEN], nameantes[MAXLEN];
-   char sfield[10]="2,2";
-   char order[255]="-r";
+   const char *sfield="-n -k 2,2";
+   const char *order="-r";
    char title[80];
+   char *warea;
    int  totuser=0;
    int  topcount=0;
-   char *s;
    int cstatus;
-   char warea[MAXLEN];
-   char user2[MAXLEN];
-   char name[MAXLEN];
    struct getwordstruct gwarea;
+   longline line;
+   struct generalitemstruct item;
+   const struct userinfostruct *uinfo;
 
    ipantes[0]='\0';
    nameantes[0]='\0';
 
-   /*
-   * get period
-   */
-   strcpy(arqper,dirname);
-   strcat(arqper,"/sarg-period");
-   if ((fp_in = fopen(arqper, "r")) == 0) {
-      fprintf(stderr, "SARG: (topuser) %s: %s\n",text[45],arqper);
-      exit(1);
-   }
-   if (!fgets(period,sizeof(period),fp_in)) {
-      fprintf(stderr,"SARG: (topuser) Read error in %s\n",arqper);
-      exit(1);
-   }
-   fclose(fp_in);
-
-   strcpy(wger,dirname);
-   strcpy(top1,dirname);
-   strcpy(top2,dirname);
-   strcpy(top3,dirname);
-   strcpy(tusr,dirname);
-   strcat(wger,"/sarg-general");
-   strcat(top1,"/top");
-   strcat(top2,"/top.tmp");
-   strcat(tusr,"/sarg-users");
-   strcat(top3,"/index.html");
-
    ntopuser = 0;
+   snprintf(wger,sizeof(wger),"%s/sarg-general",outdirname);
    if((fp_in=fopen(wger,"r"))==NULL) {
-      fprintf(stderr, "SARG: (topuser) %s: %s\n",text[45],wger);
-      exit(1);
+      debuga(_("(topuser) Cannot open file %s\n"),wger);
+      exit(EXIT_FAILURE);
    }
 
+   snprintf(top2,sizeof(top2),"%s/top.tmp",outdirname);
    if((fp_top2=fopen(top2,"w"))==NULL) {
-      fprintf(stderr, "SARG: (topuser) %s: %s\n",text[45],top2);
-      exit(1);
+      debuga(_("(topuser) Cannot open file %s\n"),top2);
+      exit(EXIT_FAILURE);
    }
 
    olduser[0]='\0';
    totuser=0;
 
-   while(fgets(warea,sizeof(warea),fp_in)) {
-      getword_start(&gwarea,warea);
-      if (getword(user,sizeof(user),&gwarea,'\t')<0) {
-         printf("SARG: Maybe you have a broken user in your %s file.\n",wger);
-         exit(1);
-      }
-      if(strcmp(user,"TOTAL") == 0) {
-         continue;
-      }
-      if (getword_atoll(&nacc,&gwarea,'\t')<0) {
-         printf("SARG: Maybe you have a broken number of access in your %s file.\n",wger);
-         exit(1);
-      }
-      if (getword_atoll(&nbytes,&gwarea,'\t')<0) {
-         printf("SARG: Maybe you have a broken number of bytes in your %s file.\n",wger);
-         exit(1);
-      }
-      if (getword(url,sizeof(url),&gwarea,'\t')<0) {
-         printf("SARG: Maybe you have a broken url in your %s file.\n",wger);
-         exit(1);
-      }
-      if (getword(ip,sizeof(ip),&gwarea,'\t')<0) {
-         printf("SARG: Maybe you have a broken user's IP in your %s file.\n",wger);
-         exit(1);
-      }
-      if (getword(time,sizeof(time),&gwarea,'\t')<0) {
-         printf("SARG: Maybe you have a broken time in your %s file.\n",wger);
-         exit(1);
-      }
-      if (getword(date,sizeof(date),&gwarea,'\t')<0) {
-         printf("SARG: Maybe you have a broken date in your %s file.\n",wger);
-         exit(1);
-      }
-      if (getword_atoll(&elap,&gwarea,'\t')<0) {
-         printf("SARG: Maybe you have a broken download duration in your %s file.\n",wger);
-         exit(1);
-      }
-      if (getword_atoll(&incac,&gwarea,'\t')<0) {
-         printf("SARG: Maybe you have a broken in cache download in your %s file.\n",wger);
-         exit(1);
-      }
-      if (getword_atoll(&oucac,&gwarea,'\n')<0) {
-         printf("SARG: Maybe you have a broken not in cache download in your %s file.\n",wger);
-         exit(1);
-      }
-      if(strcmp(olduser,user) != 0) {
+   if ((line=longline_create())==NULL) {
+      debuga(_("Not enough memory to read the file %s\n"),wger);
+      exit(EXIT_FAILURE);
+   }
+
+   while((warea=longline_read(fp_in,line))!=NULL) {
+      ger_read(warea,&item,wger);
+      if(item.total) continue;
+      if(strcmp(olduser,item.user) != 0) {
          totuser++;
 
          if (olduser[0] != '\0') {
-            my_lltoa(tnbytes,val1,15);
-            my_lltoa(tnacc,val2,15);
-            my_lltoa(tnelap,val3,15);
-            my_lltoa(tnincache,val4,15);
-            my_lltoa(tnoucache,val5,15);
-            fprintf(fp_top2,"%s\t%s\t%s\t%s\t%s\t%s\n",olduser,val1,val2,val3,val4,val5);
+            /*
+            This complicated printf is due to Microsoft's inability to comply with any standard. Msvcrt is unable
+            to print a long long int unless it is exactly 64-bits long.
+            */
+            fprintf(fp_top2,"%s\t%"PRIu64"\t%"PRIu64"\t%"PRIu64"\t%"PRIu64"\t%"PRIu64"\n",olduser,(uint64_t)tnbytes,(uint64_t)tnacc,(uint64_t)tnelap,(uint64_t)tnincache,(uint64_t)tnoucache);
 
             ttnbytes+=tnbytes;
             ttnacc+=tnacc;
@@ -163,7 +100,7 @@ void topuser(void)
             ttnincache+=tnincache;
             ttnoucache+=tnoucache;
          }
-         strcpy(olduser,user);
+         strcpy(olduser,item.user);
          tnbytes=0;
          tnacc=0;
          tnelap=0;
@@ -171,21 +108,21 @@ void topuser(void)
          tnoucache=0;
       }
 
-      tnbytes+=nbytes;
-      tnacc+=nacc;
-      tnelap+=elap;
-      tnincache+=incac;
-      tnoucache+=oucac;
+      tnbytes+=item.nbytes;
+      tnacc+=item.nacc;
+      tnelap+=item.nelap;
+      tnincache+=item.incache;
+      tnoucache+=item.oucache;
    }
    fclose(fp_in);
+   longline_destroy(&line);
 
    if (olduser[0] != '\0') {
-      my_lltoa(tnbytes,val1,15);
-      my_lltoa(tnacc,val2,15);
-      my_lltoa(tnelap,val3,15);
-      my_lltoa(tnincache,val4,15);
-      my_lltoa(tnoucache,val5,15);
-      fprintf(fp_top2,"%s\t%s\t%s\t%s\t%s\t%s\n",olduser,val1,val2,val3,val4,val5);
+      /*
+      This complicated printf is due to Microsoft's inability to comply with any standard. Msvcrt is unable
+      to print a long long int unless it is exactly 64-bits long.
+      */
+      fprintf(fp_top2,"%s\t%"PRIu64"\t%"PRIu64"\t%"PRIu64"\t%"PRIu64"\t%"PRIu64"\n",olduser,(uint64_t)tnbytes,(uint64_t)tnacc,(uint64_t)tnelap,(uint64_t)tnincache,(uint64_t)tnoucache);
 
       ttnbytes+=tnbytes;
       ttnacc+=tnacc;
@@ -199,57 +136,60 @@ void topuser(void)
    strlow(TopuserSortOrder);
 
    if(strcmp(TopuserSortField,"USER") == 0)
-      strcpy(sfield,"1,1");
+      sfield="-k 1,1";
 
    if(strcmp(TopuserSortField,"CONNECT") == 0)
-      strcpy(sfield,"3,3");
+      sfield="-n -k 3,3";
 
    if(strcmp(TopuserSortField,"TIME") == 0)
-      strcpy(sfield,"4,4");
+      sfield="-n -k 4,4";
 
    if(strcmp(TopuserSortOrder,"normal") == 0)
-      order[0]='\0';
+      order="";
 
-   sprintf(csort,"sort -n -T \"%s\" %s -k %s -o \"%s\" \"%s\"", TempDir, order, sfield, top1, top2);
+   snprintf(top1,sizeof(top1),"%s/top",outdirname);
+   sprintf(csort,"sort -T \"%s\" %s %s -o \"%s\" \"%s\"", tmp, order, sfield, top1, top2);
    cstatus=system(csort);
    if (!WIFEXITED(cstatus) || WEXITSTATUS(cstatus)) {
-      fprintf(stderr, "SARG: sort command return status %d\n",WEXITSTATUS(cstatus));
-      fprintf(stderr, "SARG: sort command: %s\n",csort);
-      exit(1);
+      debuga(_("sort command return status %d\n"),WEXITSTATUS(cstatus));
+      debuga(_("sort command: %s\n"),csort);
+      exit(EXIT_FAILURE);
    }
 
    if((fp_top1=fopen(top1,"r"))==NULL) {
-      fprintf(stderr, "SARG: (topuser) %s: %s\n",text[45],top1);
-      exit(1);
+      debuga(_("(topuser) Cannot open file %s\n"),top1);
+      exit(EXIT_FAILURE);
    }
 
    unlink(top2);
 
+   snprintf(top3,sizeof(top3),"%s/index.html",outdirname);
    if((fp_top3=fopen(top3,"w"))==NULL) {
-      fprintf(stderr, "SARG: (topuser) %s: %s\n",text[45],top3);
-      exit(1);
+      debuga(_("(topuser) Cannot open file %s\n"),top3);
+      exit(EXIT_FAILURE);
    }
 
-   snprintf(title,sizeof(title),_("SARG report for %s"),period);
+   snprintf(title,sizeof(title),_("SARG report for %s"),period.text);
    write_html_header(fp_top3,(IndexTree == INDEX_TREE_DATE) ? 3 : 1,title);
-   fprintf(fp_top3,"<tr><td class=\"header_c\">%s: %s</td></tr>\n",text[89],period);
-   fprintf(fp_top3,"<tr><td class=\"header_c\">%s: %s, %s</td></tr>\n",text[104],TopuserSortField,TopuserSortOrder);
-   fprintf(fp_top3,"<tr><th class=\"header_c\">%s</th></tr>\n",text[137]);
+   fputs("<tr><td class=\"header_c\">",fp_top3);
+   fprintf(fp_top3,_("Period: %s"),period.html);
+   fputs("</td></tr>\n",fp_top3);
+   fprintf(fp_top3,"<tr><td class=\"header_c\">%s: %s, %s</td></tr>\n",_("Sort"),TopuserSortField,TopuserSortOrder);
+   fprintf(fp_top3,"<tr><th class=\"header_c\">%s</th></tr>\n",_("Top users"));
    close_html_header(fp_top3);
 
    fputs("<div class=\"report\"><table cellpadding=\"1\" cellspacing=\"2\">\n",fp_top3);
-   fputs("<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n",fp_top3);
-
-   if((ReportType & REPORT_TYPE_TOPSITES) != 0 && !Privacy) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"topsites.html\">%s</a></td></tr>\n",text[119]);
-   if((ReportType & REPORT_TYPE_SITES_USERS) != 0 && !Privacy) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"siteuser.html\">%s</a></td></tr>\n",text[85]);
-   if(dansguardian_count) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"dansguardian.html\">%s</a></td></tr>\n",text[128]);
-   if(squidguard_count) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"squidguard.html\">%s</a></td></tr>\n",text[122]);
-   if ((ReportType & REPORT_TYPE_DOWNLOADS) != 0 && download_count && !Privacy && ndownload) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"download.html\">%s</a></td></tr>\n",text[125]);
-   if ((ReportType & REPORT_TYPE_DENIED) != 0 && denied_count && !Privacy) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"denied.html\">%s</a></td></tr>\n",text[118]);
-   if ((ReportType & REPORT_TYPE_AUTH_FAILURES) != 0 && authfail_count && !Privacy) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"authfail.html\">%s</a></td></tr>\n",text[117]);
-   if(smartfilter) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"smartfilter.html\">%s</a></td></tr>\n",text[116]);
+
+   if((ReportType & REPORT_TYPE_TOPSITES) != 0 && !Privacy) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"topsites.html\">%s</a></td></tr>\n",_("Top sites"));
+   if((ReportType & REPORT_TYPE_SITES_USERS) != 0 && !Privacy) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"siteuser.html\">%s</a></td></tr>\n",_("Sites & Users"));
+   if(dansguardian_count) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"dansguardian.html\">%s</a></td></tr>\n",_("DansGuardian"));
+   if(squidguard_count) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"redirector.html\">%s</a></td></tr>\n",_("Redirector"));
+   if ((ReportType & REPORT_TYPE_DOWNLOADS) != 0 && download_count && !Privacy && ndownload) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"download.html\">%s</a></td></tr>\n",_("Downloads"));
+   if ((ReportType & REPORT_TYPE_DENIED) != 0 && denied_count && !Privacy) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"denied.html\">%s</a></td></tr>\n",_("Denied accesses"));
+   if ((ReportType & REPORT_TYPE_AUTH_FAILURES) != 0 && authfail_count && !Privacy) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"authfail.html\">%s</a></td></tr>\n",_("Authentication Failures"));
+   if(smartfilter) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"smartfilter.html\">%s</a></td></tr>\n",_("SmartFilter"));
    if(UserAgentLog[0] != '\0' && useragent_count) fprintf(fp_top3,"<tr><td class=\"link\" colspan=\"0\"><a href=\"useragent.html\">%s</a></td></tr>\n",_("Useragent"));
-   fputs("<tr><td></td></tr>\n",fp_top3);
+   fputs("<tr><td></td></tr>\n</table></div>\n",fp_top3);
 
    if ((ReportType & REPORT_TYPE_TOPUSERS) == 0) {
       fputs("</body>\n</html>\n",fp_top3);
@@ -257,58 +197,64 @@ void topuser(void)
       return;
    }
 
+   fputs("<div class=\"report\"><table cellpadding=\"1\" cellspacing=\"2\">\n",fp_top3);
    fputs("<tr>",fp_top3);
 
    if((TopUserFields & TOPUSERFIELDS_NUM) != 0)
-      fprintf(fp_top3,"<th class=\"header_l\">%s</th>",text[100]);
+      fprintf(fp_top3,"<th class=\"header_l\">%s</th>",_("NUM"));
    if((TopUserFields & TOPUSERFIELDS_DATE_TIME) !=0 && (ReportType & REPORT_TYPE_DATE_TIME) != 0)
       fputs("<th class=\"header_l\"></th>",fp_top3);
    if((TopUserFields & TOPUSERFIELDS_USERID) != 0)
-      fprintf(fp_top3,"<th class=\"header_l\">%s</th>",text[98]);
+      fprintf(fp_top3,"<th class=\"header_l\">%s</th>",_("USERID"));
    if((TopUserFields & TOPUSERFIELDS_CONNECT) != 0)
-      fprintf(fp_top3,"<th class=\"header_l\">%s</th>",text[92]);
+      fprintf(fp_top3,"<th class=\"header_l\">%s</th>",_("CONNECT"));
    if((TopUserFields & TOPUSERFIELDS_BYTES) != 0)
-      fprintf(fp_top3,"<th class=\"header_l\">%s</th>",text[93]);
+      fprintf(fp_top3,"<th class=\"header_l\">%s</th>",_("BYTES"));
    if((TopUserFields & TOPUSERFIELDS_SETYB) != 0)
-      fprintf(fp_top3,"<th class=\"header_l\">%%%s</th>",text[93]);
+      fprintf(fp_top3,"<th class=\"header_l\">%%%s</th>",_("BYTES"));
    if((TopUserFields & TOPUSERFIELDS_IN_CACHE_OUT) != 0)
-      fprintf(fp_top3,"<th class=\"header_c\" colspan=\"2\">%s-%s-%s</th>",text[113],text[114],text[112]);
+      fprintf(fp_top3,"<th class=\"header_c\" colspan=\"2\">%s</th>",_("IN-CACHE-OUT"));
    if((TopUserFields & TOPUSERFIELDS_USED_TIME) != 0)
-      fprintf(fp_top3,"<th class=\"header_l\">%s</th>",text[94]);
+      fprintf(fp_top3,"<th class=\"header_l\">%s</th>",_("ELAPSED TIME"));
    if((TopUserFields & TOPUSERFIELDS_MILISEC) != 0)
-      fprintf(fp_top3,"<th class=\"header_l\">%s</th>",text[95]);
+      fprintf(fp_top3,"<th class=\"header_l\">%s</th>",_("MILLISEC"));
    if((TopUserFields & TOPUSERFIELDS_PTIME) != 0)
-      fprintf(fp_top3,"<th class=\"header_l\">%%%s</th>",text[99]);
+      fprintf(fp_top3,"<th class=\"header_l\">%%%s</th>",_("TIME"));
 
    fputs("</tr>\n",fp_top3);
 
    ntopuser = 0;
 
-   while(fgets(warea,sizeof(warea),fp_top1)) {
+   if ((line=longline_create())==NULL) {
+      debuga(_("Not enough memory to read the downloaded files\n"));
+      exit(EXIT_FAILURE);
+   }
+
+   while((warea=longline_read(fp_top1,line))!=NULL) {
       getword_start(&gwarea,warea);
       if (getword(user,sizeof(user),&gwarea,'\t')<0) {
-         printf("SARG: Maybe you have a broken user in your %s file.\n",top1);
-         exit(1);
+         debuga(_("There is a broken user in file %s\n"),top1);
+         exit(EXIT_FAILURE);
       }
       if (getword_atoll(&nbytes,&gwarea,'\t')<0) {
-         printf("SARG: Maybe you have a broken number of bytes in your %s file.\n",top1);
-         exit(1);
+         debuga(_("There is a broken number of bytes in file %s\n"),top1);
+         exit(EXIT_FAILURE);
       }
       if (getword_atoll(&nacc,&gwarea,'\t')<0) {
-         printf("SARG: Maybe you have a broken number of access in your %s file.\n",top1);
-         exit(1);
+         debuga(_("There is a broken number of access in file %s\n"),top1);
+         exit(EXIT_FAILURE);
       }
       if (getword_atoll(&elap,&gwarea,'\t')<0) {
-         printf("SARG: Maybe you have a broken elpased time in your %s file.\n",top1);
-         exit(1);
+         debuga(_("There is a broken elpased time in file %s\n"),top1);
+         exit(EXIT_FAILURE);
       }
       if (getword_atoll(&incac,&gwarea,'\t')<0) {
-         printf("SARG: Maybe you have a broken in-cache size in your %s file.\n",top1);
-         exit(1);
+         debuga(_("There is a broken in-cache size in file %s\n"),top1);
+         exit(EXIT_FAILURE);
       }
       if (getword_atoll(&oucac,&gwarea,'\n')<0) {
-         printf("SARG: Maybe you have a broken out-of-cache size in your %s file.\n",top1);
-         exit(1);
+         debuga(_("There is a broken out-of-cache size in file %s\n"),top1);
+         exit(EXIT_FAILURE);
       }
       if(nacc < 1)
          continue;
@@ -317,16 +263,10 @@ void topuser(void)
       tnbytes=nbytes;
       tnelap=elap;
 
-      strcpy(user2,user);
-      if(userip) {
-         fixip(user2);
-         if(Ip2Name) {
-            if(strcmp(user2,ipantes) != 0) {
-               strcpy(ipantes,user2);
-               ip2name(user2,sizeof(user2));
-               strcpy(nameantes,user2);
-            } else strcpy(user2,nameantes);
-         }
+      uinfo=userinfo_find_from_id(user);
+      if (!uinfo) {
+         debuga(_("Unknown user ID %s in file %s\n"),user,top1);
+         exit(EXIT_FAILURE);
       }
 
       fputs("<tr>",fp_top3);
@@ -335,39 +275,24 @@ void topuser(void)
       if((TopUserFields & TOPUSERFIELDS_NUM) != 0)
          fprintf(fp_top3,"<td class=\"data\">%d</td>",posicao);
 
-      user_find(name, sizeof(name), user2);
-      if(Ip2Name &&
-         ((str=(char *) strstr(name, ".")) != (char *) NULL) &&
-         ((str=(char *) strstr(str+1, ".")) != (char *) NULL))
-         ip2name(name,sizeof(name));
-      if(dotinuser && strchr(name,'_')) {
-         subs(name,sizeof(name),"_",".");
-      }
-
       if((TopUserFields & TOPUSERFIELDS_DATE_TIME) !=0 && (ReportType & REPORT_TYPE_DATE_TIME) != 0) {
-         sprintf(ltext110,"%s",text[110]);
-         for(s=ltext110; *s; ++s)
-            *s=tolower(*s);
          fputs("<td class=\"data2\">",fp_top3);
 #ifdef HAVE_GD
-         if(Graphs) {
-            fprintf(fp_top3,"<a href=\"%s/graph_day.png\"><img src=\"%s/graph.png\" title=\"%s\" alt=\"G\"></a>&nbsp;",user,ImageFile,text[126]);
+         if(Graphs && GraphFont[0]!='\0') {
+            //fprintf(fp_top3,"<a href=\"%s/graph_day.png\"><img src=\"%s/graph.png\" title=\"%s\" alt=\"G\"></a>&nbsp;",uinfo->filename,ImageFile,_("Graphic"));
+            fprintf(fp_top3,"<a href=\"%s/graph.html\"><img src=\"%s/graph.png\" title=\"%s\" alt=\"G\"></a>&nbsp;",uinfo->filename,ImageFile,_("Graphic"));
          }
 #endif
-         fprintf(fp_top3,"<a href=\"%s/d%s.html\"><img src=\"%s/datetime.png\" title=\"%s",user,user,ImageFile,ltext110);
-#ifdef HAVE_GD
-         fprintf(fp_top3," %s",text[55]);
-#endif
-         fputs("\" alt=\"T\"></a></td>",fp_top3);
+         fprintf(fp_top3,"<a href=\"%s/d%s.html\"><img src=\"%s/datetime.png\" title=\"%s\" alt=\"T\"></a></td>",uinfo->filename,uinfo->filename,ImageFile,_("date/time report"));
       } else {
-         sprintf(val1,"%s/d%s.html",dirname,user);
+         sprintf(val1,"%s/d%s.html",outdirname,uinfo->filename);
          unlink(val1);
       }
       if((TopUserFields & TOPUSERFIELDS_USERID) != 0) {
          if((ReportType & REPORT_TYPE_USERS_SITES) == 0)
             fprintf(fp_top3,"<td class=\"data2\">%s</td>",name);
          else
-            fprintf(fp_top3,"<td class=\"data2\"><a href=\"%s/%s.html\">%s</a></td>",user,user,name);
+            fprintf(fp_top3,"<td class=\"data2\"><a href=\"%s/%s.html\">%s</a></td>",uinfo->filename,uinfo->filename,uinfo->label);
       }
       if((TopUserFields & TOPUSERFIELDS_CONNECT) != 0)
          fprintf(fp_top3,"<td class=\"data\">%s</td>",fixnum(nacc,1));
@@ -397,6 +322,7 @@ void topuser(void)
    }
    fclose(fp_top1);
    unlink(top1);
+   longline_destroy(&line);
 
    if((TopUserFields & TOPUSERFIELDS_TOTAL) != 0) {
       fputs("<tr>",fp_top3);
@@ -404,7 +330,7 @@ void topuser(void)
          fputs("<td></td>",fp_top3);
       if((TopUserFields & TOPUSERFIELDS_DATE_TIME) !=0 && (ReportType & REPORT_TYPE_DATE_TIME) != 0)
          fputs("<td></td>",fp_top3);
-      fprintf(fp_top3,"<th class=\"header_l\">%s</th>",text[107]);
+      fprintf(fp_top3,"<th class=\"header_l\">%s</th>",_("TOTAL"));
 
       if((TopUserFields & TOPUSERFIELDS_CONNECT) != 0)
          fprintf(fp_top3,"<th class=\"header_r\">%s</th>",fixnum(ttnacc,1));
@@ -432,7 +358,7 @@ void topuser(void)
          fputs("<td></td>",fp_top3);
       if((TopUserFields & TOPUSERFIELDS_DATE_TIME) !=0 && (ReportType & REPORT_TYPE_DATE_TIME) != 0)
          fputs("<td></td>",fp_top3);
-      fprintf(fp_top3,"<th class=\"header_l\">%s</th>",text[96]);
+      fprintf(fp_top3,"<th class=\"header_l\">%s</th>",_("AVERAGE"));
 
       if((TopUserFields & TOPUSERFIELDS_CONNECT) != 0)
          fprintf(fp_top3,"<th class=\"header_r\">%s</th>",fixnum(ttnacc/totuser,1));
@@ -452,15 +378,19 @@ void topuser(void)
    }
 
    fputs("</table></div>\n",fp_top3);
-   write_html_trailer(fp_top3);
-   fclose(fp_top3);
+   if (write_html_trailer(fp_top3)<0)
+      debuga(_("Write error in top user list %s\n"),top3);
+   if (fclose(fp_top3)==EOF)
+      debuga(_("Failed to close the top user list %s - %s\n"),top3,strerror(errno));
 
+   snprintf(tusr,sizeof(tusr),"%s/sarg-users",outdirname);
    if((fp_ou=fopen(tusr,"w"))==NULL) {
-      fprintf(stderr, "SARG: (topuser) %s: %s\n",text[45],tusr);
-      exit(1);
+      debuga(_("(topuser) Cannot open file %s\n"),tusr);
+      exit(EXIT_FAILURE);
    }
    fprintf(fp_ou,"%d\n",totuser);
-   fclose(fp_ou);
+   if (fclose(fp_ou)==EOF)
+      debuga(_("Failed to close file %s - %s\n"),tusr,strerror(errno));
 
    return;
 }