]> git.ipfire.org Git - thirdparty/sarg.git/blobdiff - html.c
Rename configure.in as configure.ac
[thirdparty/sarg.git] / html.c
diff --git a/html.c b/html.c
index 5d62d766fc88531894d4170d16b53823fde3c0d3..2d78fac514d503c39b4c5ed72a639958c700e416 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,6 +1,6 @@
 /*
  * SARG Squid Analysis Report Generator      http://sarg.sourceforge.net
- *                                                            1998, 2011
+ *                                                            1998, 2015
  *
  * SARG donations:
  *      please look at http://sarg.sourceforge.net/donations.php
 #include "include/conf.h"
 #include "include/defs.h"
 
+//! Number of limits.
+int PerUserLimitsNumber=0;
+//! Log user's who downloaded more than the limit.
+struct PerUserLimitStruct PerUserLimits[MAX_USER_LIMITS];
+//! How to create a per user file.
+enum PerUserFileCreationEnum PerUserFileCreation=PUFC_Always;
+
 extern struct globalstatstruct globstat;
 
 void htmlrel(void)
 {
-       FILE *fp_in, *fp_ou, *fp_ip, *fp_ip2, *fp_usr;
+       FILE *fp_in, *fp_ou, *fp_ip, *fp_ip2;
 
        long long int nnbytes=0, unbytes=0, tnbytes=0, totbytes=0, totbytes2=0;
        long long int totelap=0, totelap2=0, nnelap=0, unelap=0, tnelap=0;
@@ -40,107 +47,133 @@ void htmlrel(void)
        long long int ntotuser;
        long long int userbytes, userelap;
        char *buf;
-       char arqin[MAXLEN], arqou[MAXLEN], arqper[MAXLEN], arqip[MAXLEN];
+       char arqin[MAXLEN], arqou[MAXLEN], arqip[MAXLEN];
        char *url, tmsg[50], csort[MAXLEN];
        char duser[MAXLEN];
        char user_ip[MAXLEN], olduserip[MAXLEN], tmp2[MAXLEN], tmp3[MAXLEN];
        char warea[MAXLEN];
-       char totuser[8];
        char tmp6[MAXLEN];
        char *user_url;
-       long long int tnacc=0, ttnacc=0, unacc=0;
+       long long int tnacc=0, ttnacc=0;
        double perc=0, perc2=0, ouperc=0, inperc=0;
        int count;
        int cstatus;
-       int have_denied_report;
+       int i;
+       unsigned int user_limit[(MAX_USER_LIMITS+sizeof(unsigned int)-1)/sizeof(unsigned int)];
+       bool have_denied_report;
        const char *sort_field;
        const char *sort_order;
-       const char *user;
        char siteind[MAX_TRUNCATED_URL];
        struct getwordstruct gwarea;
        longline line,line1;
        const struct userinfostruct *uinfo;
        userscan uscan;
 
-       if((ReportType & REPORT_TYPE_USERS_SITES) == 0) return;
-
-       strcpy(tmp2,tmp);
-       strcat(tmp2,"/sargtmp.unsort");
+       if (snprintf(tmp2,sizeof(tmp2),"%s/sargtmp.int_unsort",tmp)>=sizeof(tmp2)) {
+               debuga(__FILE__,__LINE__,_("Path too long: "));
+               debuga_more("%s/sargtmp.int_unsort\n",tmp);
+               exit(EXIT_FAILURE);
+       }
 
-       strcpy(tmp3,tmp);
-       strcat(tmp3,"/sargtmp.log");
+       if (snprintf(tmp3,sizeof(tmp3),"%s/sargtmp.int_log",tmp)>=sizeof(tmp3)) {
+               debuga(__FILE__,__LINE__,_("Path too long: "));
+               debuga_more("%s/sargtmp.int_log\n",tmp);
+               exit(EXIT_FAILURE);
+       }
 
        tnacc=globstat.nacc;
        totbytes=globstat.nbytes;
        totelap=globstat.elap;
+       ntotuser=globstat.totuser;
 
-       snprintf(arqper,sizeof(arqper),"%s/sarg-users",outdirname);
-       if ((fp_in = fopen(arqper, "r")) == 0){
-               debuga(_("(html11) Cannot open file %s\n"),arqper);
-               exit(EXIT_FAILURE);
-       }
-       if (!fgets(totuser,sizeof(totuser),fp_in)) {
-               debuga(_("(html11) read error in %s\n"),arqper);
-               exit(EXIT_FAILURE);
-       }
-       fclose(fp_in);
-       ntotuser=my_atoll(totuser);
-       if (ntotuser<=0) ntotuser=1;
+       sort_labels(&sort_field,&sort_order);
 
-       greport_prepare();
+       switch (PerUserFileCreation)
+       {
+               case PUFC_Always:
+                       for (i=0 ; i<PerUserLimitsNumber ; i++) {
+                               FILE *fp_usr=fopen(PerUserLimits[i].File,"wt");
+                               if (fp_usr==NULL) {
+                                       debuga(__FILE__,__LINE__,_("Cannot create empty per_user_limit file \"%s\": %s\n"),PerUserLimits[i].File,
+                                                  strerror(errno));
+                                       exit(EXIT_FAILURE);
+                               }
+                               if (fclose(fp_usr)==EOF) {
+                                       debuga(__FILE__,__LINE__,_("Write error in \"%s\": %s\n"),PerUserLimits[i].File,strerror(errno));
+                                       exit(EXIT_FAILURE);
+                               }
+                       }
+                       break;
 
-       sort_labels(&sort_field,&sort_order);
+               case PUFC_AsRequired:
+                       for (i=0 ; i<PerUserLimitsNumber ; i++) {
+                               if (access(PerUserLimits[i].File,R_OK)==0 && unlink(PerUserLimits[i].File)==-1) {
+                                       debuga(__FILE__,__LINE__,_("Cannot delete \"%s\": %s\n"),PerUserLimits[i].File,
+                                                  strerror(errno));
+                                       exit(EXIT_FAILURE);
+                               }
+                       }
+                       break;
+       }
 
        uscan=userinfo_startscan();
        if (uscan == NULL) {
-               debuga(_("Cannot enumerate the user list\n"));
+               debuga(__FILE__,__LINE__,_("Cannot enumerate the user list\n"));
                exit(EXIT_FAILURE);
        }
        while ( (uinfo = userinfo_advancescan(uscan)) != NULL ) {
-               user=uinfo->filename;
-
-               if (snprintf(warea,sizeof(warea),"%s/%s",outdirname,user)>=sizeof(warea)) {
-                       debuga(_("Destination directory too long: %s/%s\n"),outdirname,user);
+               if (snprintf(warea,sizeof(warea),"%s/%s",outdirname,uinfo->filename)>=sizeof(warea)) {
+                       debuga(__FILE__,__LINE__,_("Path too long: "));
+                       debuga_more("%s/%s\n",outdirname,uinfo->filename);
                        exit(EXIT_FAILURE);
                }
+               if (!uinfo->topuser) {
+                       //! \todo Instead of deleting the supernumerary directories, don't create them in the first place.
+                       unlinkdir(warea,0);
+                       continue;
+               }
+
                if (access(warea, R_OK) != 0) {
-                       if (mkdir(warea,0755)) {
-                               debuga(_("Cannot create directory %s - %s\n"),warea,strerror(errno));
+                       if (PortableMkDir(warea,0755)) {
+                               debuga(__FILE__,__LINE__,_("Cannot create directory \"%s\": %s\n"),warea,strerror(errno));
                                exit(EXIT_FAILURE);
                        }
                }
+               tmpsort(uinfo);
 
-               report_day(uinfo);
-               greport_day(uinfo);
-
-               if (snprintf(arqin,sizeof(arqin),"%s/%s.txt",tmp,uinfo->filename)>=sizeof(arqin)) {
-                       debuga(_("Input file name too long: %s/%s.txt\n"),tmp,uinfo->filename);
+               if (snprintf(arqin,sizeof(arqin),"%s/htmlrel.txt",tmp)>=sizeof(arqin)) {
+                       debuga(__FILE__,__LINE__,_("Input file name too long: %s/htmlrel.txt\n"),tmp);
                        exit(EXIT_FAILURE);
                }
                if ((fp_in = fopen(arqin, "r")) == 0){
                        if (uinfo->no_report) continue;
-                       debuga(_("(html3) Cannot open file %s\n"),arqin);
+                       debuga(__FILE__,__LINE__,_("Cannot open file \"%s\": %s\n"),arqin,strerror(errno));
                        exit(EXIT_FAILURE);
                }
 
                if (snprintf(arqou,sizeof(arqou),"%s/%s/%s.html",outdirname,uinfo->filename,uinfo->filename)>=sizeof(arqou)) {
-                       debuga(_("Output file name too long: %s/%s/%s.html\n"),outdirname,uinfo->filename,uinfo->filename);
+                       debuga(__FILE__,__LINE__,_("Path too long: "));
+                       debuga_more("%s/%s/%s.html\n",outdirname,uinfo->filename,uinfo->filename);
                        exit(EXIT_FAILURE);
                }
-               if (snprintf(duser,sizeof(duser),"%s/%s/denied_%s.html",tmp,uinfo->filename,uinfo->filename)>=sizeof(duser)) {
-                       debuga(_("File name too long: %s/%s/denied_%s.html\n"),tmp,uinfo->filename,uinfo->filename);
+               if (snprintf(duser,sizeof(duser),"%s/denied_%s.html",outdirname,uinfo->filename)>=sizeof(duser)) {
+                       debuga(__FILE__,__LINE__,_("Path too long: "));
+                       debuga_more("%s/denied_%s.html\n",outdirname,uinfo->filename);
                        exit(EXIT_FAILURE);
                }
                if(access(duser, R_OK) != 0)
-                       have_denied_report=0;
+                       have_denied_report=false;
                else
-                       have_denied_report=1;
+                       have_denied_report=true;
 
                if ((line=longline_create())==NULL) {
-                       debuga(_("Not enough memory to read file %s\n"),arqin);
+                       debuga(__FILE__,__LINE__,_("Not enough memory to read file \"%s\"\n"),arqin);
                        exit(EXIT_FAILURE);
                }
 
+               for (i=0 ; i<sizeof(user_limit)/sizeof(user_limit[0]) ; i++)
+                       user_limit[i]=0;
+
                tnacc=0;
                tnbytes=0;
                tnelap=0;
@@ -149,35 +182,35 @@ void htmlrel(void)
                while((buf=longline_read(fp_in,line))!=NULL) {
                        getword_start(&gwarea,buf);
                        if (getword_atoll(&ltemp,&gwarea,'\t')<0) {
-                               debuga(_("There is a broken number of access in file %s\n"),arqin);
+                               debuga(__FILE__,__LINE__,_("Invalid number of accesses in file \"%s\"\n"),arqin);
                                exit(EXIT_FAILURE);
                        }
                        tnacc+=ltemp;
                        if (getword_atoll(&ltemp,&gwarea,'\t')<0) {
-                               debuga(_("There is a broken downloaded size in file %s\n"),arqin);
+                               debuga(__FILE__,__LINE__,_("Invalid downloaded size in file \"%s\"\n"),arqin);
                                exit(EXIT_FAILURE);
                        }
                        tnbytes+=ltemp;
                        if (getword_ptr(NULL,NULL,&gwarea,'\t')<0) {
-                               debuga(_("There is a broken url in file %s\n"),arqin);
+                               debuga(__FILE__,__LINE__,_("Invalid url in file \"%s\"\n"),arqin);
                                exit(EXIT_FAILURE);
                        }
                        if (getword_skip(MAXLEN,&gwarea,'\t')<0) {
-                               debuga(_("There is a broken access code in file %s\n"),arqin);
+                               debuga(__FILE__,__LINE__,_("Invalid access code in file \"%s\"\n"),arqin);
                                exit(EXIT_FAILURE);
                        }
                        if (getword_atoll(&ltemp,&gwarea,'\t')<0) {
-                               debuga(_("There is a broken elapsed time in file %s\n"),arqin);
+                               debuga(__FILE__,__LINE__,_("Invalid elapsed time in file \"%s\"\n"),arqin);
                                exit(EXIT_FAILURE);
                        }
                        tnelap+=ltemp;
                        if (getword_atoll(&ltemp,&gwarea,'\t')<0) {
-                               debuga(_("There is a broken in-cache volume in file %s\n"),arqin);
+                               debuga(__FILE__,__LINE__,_("Invalid in-cache size in file \"%s\"\n"),arqin);
                                exit(EXIT_FAILURE);
                        }
                        tnincache+=ltemp;
                        if (getword_atoll(&ltemp,&gwarea,'\n')<0) {
-                               debuga(_("There is a broken out-cache volume in file %s\n"),arqin);
+                               debuga(__FILE__,__LINE__,_("Invalid out-of-cache size in file \"%s\"\n"),arqin);
                                exit(EXIT_FAILURE);
                        }
                        tnoucache+=ltemp;
@@ -186,7 +219,7 @@ void htmlrel(void)
                rewind(fp_in);
 
                if ((fp_ou = fopen(arqou, "w")) == 0){
-                       debuga(_("(html5) Cannot open file %s\n"),arqou);
+                       debuga(__FILE__,__LINE__,_("Cannot open file \"%s\": %s\n"),arqou,strerror(errno));
                        exit(EXIT_FAILURE);
                }
 
@@ -199,17 +232,16 @@ void htmlrel(void)
                fprintf(fp_ou,"<tr><th class=\"header_c\">%s</th></tr>\n",_("User report"));
                close_html_header(fp_ou);
 
+               if (have_denied_report) {
+                       fputs("<div class=\"report\"><table cellpadding=\"1\" cellspacing=\"2\">\n",fp_ou);
+                       fprintf(fp_ou,"<tr><td class=\"header_l\" colspan=\"11\"><a href=\"denied_%s.html\">%s</a></td></tr>\n",uinfo->filename,_("SmartFilter report"));
+                       fputs("<tr><td></td></tr>\n</table></div>\n",fp_ou);
+               }
+
                fputs("<div class=\"report\"><table cellpadding=\"2\" cellspacing=\"1\"",fp_ou);
                if (SortTableJs[0]) fputs(" class=\"sortable\"",fp_ou);
                fputs(">\n",fp_ou);
 
-               /*! \bug This line lays before the header of the table and is therefore invalid
-               HTML. It will also break the sorttable script. Beside, I suspect it serves no purpose.
-               */
-               if(have_denied_report) {
-                       fprintf(fp_ou,"<tr><td class=\"header_l\" colspan=\"11\"><a href=\"denied_%s.html\">%s</a> %s</td></tr>\n",uinfo->filename,_("SmartFilter"),_("Report"));
-               }
-
                fputs("<thead><tr><th class=\"sorttable_nosort\"></th><th class=\"header_l",fp_ou);
                if (SortTableJs[0]) fputs(" sorttable_alpha",fp_ou);
                fprintf(fp_ou,"\">%s</th>",_("ACCESSED SITE"));
@@ -219,7 +251,7 @@ void htmlrel(void)
                if((UserReportFields & USERREPORTFIELDS_BYTES) != 0)
                        fprintf(fp_ou,"<th class=\"header_l\">%s</th>",_("BYTES"));
                if((UserReportFields & USERREPORTFIELDS_SETYB) != 0)
-                       fprintf(fp_ou,"<th class=\"header_l\">%%%s</th>",_("BYTES"));
+                       fprintf(fp_ou,"<th class=\"header_l\">%s</th>",_("%BYTES"));
                if((UserReportFields & USERREPORTFIELDS_IN_CACHE_OUT) != 0)
                        fprintf(fp_ou,"<th class=\"header_c\" colspan=\"2\">%s</th><th style=\"display:none;\"></th>",_("IN-CACHE-OUT"));
                if((UserReportFields & USERREPORTFIELDS_USED_TIME) != 0)
@@ -227,12 +259,12 @@ void htmlrel(void)
                if((UserReportFields & USERREPORTFIELDS_MILISEC) != 0)
                        fprintf(fp_ou,"<th class=\"header_l\">%s</th>",_("MILLISEC"));
                if((UserReportFields & USERREPORTFIELDS_PTIME) != 0)
-                       fprintf(fp_ou,"<th class=\"header_l\">%%%s</th>",_("TIME"));
+                       fprintf(fp_ou,"<th class=\"header_l\">%s</th>",pgettext("duration","%TIME"));
 
                fputs("</tr></thead>\n",fp_ou);
 
                if(debug) {
-                       debuga(_("Making report: %s\n"),uinfo->id);
+                       debuga(__FILE__,__LINE__,_("Making report %s\n"),uinfo->id);
                }
                count=0;
                arqip[0]='\0';
@@ -240,31 +272,31 @@ void htmlrel(void)
                while((buf=longline_read(fp_in,line))!=NULL) {
                        getword_start(&gwarea,buf);
                        if (getword_atoll(&twork,&gwarea,'\t')<0) {
-                               debuga(_("There is a broken number of access in file %s\n"),arqin);
+                               debuga(__FILE__,__LINE__,_("Invalid number of accesses in file \"%s\"\n"),arqin);
                                exit(EXIT_FAILURE);
                        }
                        if (getword_atoll(&nnbytes,&gwarea,'\t')<0) {
-                               debuga(_("There is a broken number of bytes in file %s\n"),arqin);
+                               debuga(__FILE__,__LINE__,_("Invalid number of bytes in file \"%s\"\n"),arqin);
                                exit(EXIT_FAILURE);
                        }
                        if (getword_ptr(buf,&url,&gwarea,'\t')<0) {
-                               debuga(_("There is a broken url in file %s\n"),arqin);
+                               debuga(__FILE__,__LINE__,_("Invalid url in file \"%s\"\n"),arqin);
                                exit(EXIT_FAILURE);
                        }
                        if (getword(tmsg,sizeof(tmsg),&gwarea,'\t')<0) {
-                               debuga(_("There is a broken access code in file %s\n"),arqin);
+                               debuga(__FILE__,__LINE__,_("Invalid access code in file \"%s\"\n"),arqin);
                                exit(EXIT_FAILURE);
                        }
                        if (getword_atoll(&nnelap,&gwarea,'\t')<0) {
-                               debuga(_("There is a broken elapsed time in file %s\n"),arqin);
+                               debuga(__FILE__,__LINE__,_("Invalid elapsed time in file \"%s\"\n"),arqin);
                                exit(EXIT_FAILURE);
                        }
                        if (getword_atoll(&incache,&gwarea,'\t')<0) {
-                               debuga(_("There is a broken in cache column in file %s\n"),arqin);
+                               debuga(__FILE__,__LINE__,_("Invalid in-cache size in file \"%s\"\n"),arqin);
                                exit(EXIT_FAILURE);
                        }
                        if (getword_atoll(&oucache,&gwarea,'\n')<0) {
-                               debuga(_("There is a broken out of cache column in file %s (%d)\n"),arqin,__LINE__);
+                               debuga(__FILE__,__LINE__,_("Invalid out-of-cache size in file \"%s\"\n"),arqin);
                                exit(EXIT_FAILURE);
                        }
 
@@ -277,8 +309,8 @@ void htmlrel(void)
                                        strcpy(tmp6,"../../images");
 
                                if((ReportType & REPORT_TYPE_SITE_USER_TIME_DATE) != 0) {
-                                       url_to_file(url,siteind,sizeof(siteind));
-                                       fprintf(fp_ou,"<td class=\"data\"><a href=\"tt%s-%s.html\"><img src=\"%s/datetime.png\" title=\"%s\" alt=\"T\"></a></td>",uinfo->filename,siteind,tmp6,_("date/time report"));
+                                       url_to_anchor(url,siteind,sizeof(siteind));
+                                       fprintf(fp_ou,"<td class=\"data\"><a href=\"tt.html#%s\"><img src=\"%s/datetime.png\" title=\"%s\" alt=\"T\"></a></td>",siteind,tmp6,_("date/time report"));
                                } else {
                                        fprintf(fp_ou,"<td class=\"data\"></td>");
                                }
@@ -287,16 +319,13 @@ void htmlrel(void)
                                        fprintf(fp_ou,"<td class=\"data2\"><span style=\"color:%s;\">%s</span></td>",PrivacyStringColor,PrivacyString);
                                else {
                                        fputs("<td class=\"data2\">",fp_ou);
-                                       if(BlockIt[0]!='\0') {
+                                       if(BlockIt[0]!='\0' && url[0]!=ALIAS_PREFIX) {
                                                fprintf(fp_ou,"<a href=\"%s%s?url=",wwwDocumentRoot,BlockIt);
                                                output_html_url(fp_ou,url);
                                                fprintf(fp_ou,"\"><img src=\"%s/sarg-squidguard-block.png\"></a>&nbsp;",tmp6);
                                        }
-                                       fputs("<a href=\"http://",fp_ou);
-                                       output_html_url(fp_ou,url);
-                                       fputs("\">",fp_ou);
-                                       output_html_string(fp_ou,url,100);
-                                       fputs("</a></td>",fp_ou);
+                                       output_html_link(fp_ou,url,100);
+                                       fputs("</td>",fp_ou);
                                }
 
                                if((UserReportFields & USERREPORTFIELDS_CONNECT) != 0) {
@@ -339,98 +368,112 @@ void htmlrel(void)
                                fputs("</tr>\n",fp_ou);
                                count++;
                        } else if ((ReportType & REPORT_TYPE_SITE_USER_TIME_DATE) != 0) {
-                               url_to_file(url,siteind,sizeof(siteind));
-                               snprintf(tmp2,sizeof(tmp2),"%s/%s/tt%s-%s.html",outdirname,uinfo->filename,uinfo->filename,siteind);
-                               if (unlink(tmp2)!=0) {
-                                       debuga(_("Cannot delete unused file \"%s\" - %s\n"),tmp2,strerror(errno));
+                               snprintf(warea,sizeof(warea),"%s/%s/tt.html",outdirname,uinfo->filename);
+                               if (unlink(warea)!=0) {
+                                       debuga(__FILE__,__LINE__,_("Cannot delete \"%s\": %s\n"),warea,strerror(errno));
                                }
                        }
 
                        if(iprel) {
                                if (snprintf(arqip,sizeof(arqip),"%s/%s.ip",tmp,uinfo->filename)>=sizeof(arqip)) {
-                                       debuga(_("File name too long: %s/%s.ip\n"),tmp,uinfo->filename);
+                                       debuga(__FILE__,__LINE__,_("Path too long: "));
+                                       debuga_more("%s/%s.ip\n",tmp,uinfo->filename);
                                        exit(EXIT_FAILURE);
                                }
 
                                if ((fp_ip = fopen(arqip, "r")) == 0){
-                                       debuga(_("(html6) Cannot open file %s\n"),arqip);
+                                       debuga(__FILE__,__LINE__,_("Cannot open file \"%s\": %s\n"),arqip,strerror(errno));
                                        exit(EXIT_FAILURE);
                                }
 
                                if ((fp_ip2 = MY_FOPEN(tmp2, "a")) == 0){
-                                       debuga(_("(html7) Cannot open file %s\n"),tmp2);
+                                       debuga(__FILE__,__LINE__,_("Cannot open file \"%s\": %s\n"),tmp2,strerror(errno));
                                        exit(EXIT_FAILURE);
                                }
 
                                if ((line1=longline_create())==NULL) {
-                                       debuga(_("Not enough memory to read file %s\n"),arqip);
+                                       debuga(__FILE__,__LINE__,_("Not enough memory to read file \"%s\"\n"),arqip);
                                        exit(EXIT_FAILURE);
                                }
                                while((buf=longline_read(fp_ip,line1))!=NULL) {
                                        getword_start(&gwarea,buf);
                                        if (getword(user_ip,sizeof(user_ip),&gwarea,'\t')<0) {
-                                               debuga(_("Maybe you have a broken user IP in your %s file\n"),tmp3);
+                                               debuga(__FILE__,__LINE__,_("Invalid user IP in file \"%s\"\n"),tmp3);
                                                exit(EXIT_FAILURE);
                                        }
                                        if (getword_ptr(buf,&user_url,&gwarea,'\t')<0) {
-                                               debuga(_("Maybe you have a broken url in your %s file\n"),tmp3);
+                                               debuga(__FILE__,__LINE__,_("Invalid url in file \"%s\"\n"),tmp3);
                                                exit(EXIT_FAILURE);
                                        }
                                        if (strncmp(user_url,url,strlen(url))!=0) continue;
                                        if (getword_skip(15,&gwarea,'\t')<0) {
-                                               debuga(_("Maybe you have a broken day in your %s file\n"),tmp3);
+                                               debuga(__FILE__,__LINE__,_("Invalid day in file \"%s\"\n"),tmp3);
                                                exit(EXIT_FAILURE);
                                        }
                                        if (getword_skip(15,&gwarea,'\t')<0) {
-                                               debuga(_("Maybe you have a broken time in your %s file\n"),tmp3);
+                                               debuga(__FILE__,__LINE__,_("Invalid time in file \"%s\"\n"),tmp3);
                                                exit(EXIT_FAILURE);
                                        }
                                        if (getword_atoll(&userbytes,&gwarea,'\t')<0) {
-                                               debuga(_("Maybe you have a broken size in your %s file\n"),tmp3);
+                                               debuga(__FILE__,__LINE__,_("Invalid size in file \"%s\"\n"),tmp3);
                                                exit(EXIT_FAILURE);
                                        }
                                        if (getword_atoll(&userelap,&gwarea,'\0')<0) {
-                                               debuga(_("Maybe you have a broken elapsed time in your %s file\n"),tmp3);
+                                               debuga(__FILE__,__LINE__,_("Invalid elapsed time in file \"%s\"\n"),tmp3);
                                                exit(EXIT_FAILURE);
                                        }
                                        fprintf(fp_ip2,"%s\t%"PRIu64"\t%"PRIu64"\n",user_ip,(uint64_t)userbytes,(uint64_t)userelap);
                                }
                                longline_destroy(&line1);
 
-                               fclose(fp_ip);
-                               fclose(fp_ip2);
+                               if (fclose(fp_ip2)==EOF) {
+                                       debuga(__FILE__,__LINE__,_("Write error in \"%s\": %s\n"),tmp2,strerror(errno));
+                                       exit(EXIT_FAILURE);
+                               }
+                               if (fclose(fp_ip)==EOF) {
+                                       debuga(__FILE__,__LINE__,_("Read error in \"%s\": %s\n"),arqip,strerror(errno));
+                                       exit(EXIT_FAILURE);
+                               }
 
-                               sprintf(csort,"sort -n -T \"%s\" -k 1,1 -k 2,2 -o \"%s\" \"%s\"",tmp,tmp3,tmp2);
+                               if (snprintf(csort,sizeof(csort),"sort -n -t \"\t\" -T \"%s\" -k 1,1 -k 2,2 -o \"%s\" \"%s\"",tmp,tmp3,tmp2)>=sizeof(csort)) {
+                                       debuga(__FILE__,__LINE__,_("Sort command too long when sorting file \"%s\" to \"%s\"\n"),tmp2,tmp3);
+                                       exit(EXIT_FAILURE);
+                               }
                                cstatus=system(csort);
                                if (!WIFEXITED(cstatus) || WEXITSTATUS(cstatus)) {
-                                       debuga(_("sort command return status %d\n"),WEXITSTATUS(cstatus));
-                                       debuga(_("sort command: %s\n"),csort);
+                                       debuga(__FILE__,__LINE__,_("sort command return status %d\n"),WEXITSTATUS(cstatus));
+                                       debuga(__FILE__,__LINE__,_("sort command: %s\n"),csort);
                                        exit(EXIT_FAILURE);
                                }
 
                                if ((fp_ip = MY_FOPEN(tmp3, "r")) == 0) {
-                                       debuga(_("(html8) Cannot open file %s\n"),tmp3);
+                                       debuga(__FILE__,__LINE__,_("Cannot open file \"%s\": %s\n"),tmp3,strerror(errno));
+                                       exit(EXIT_FAILURE);
+                               }
+
+                               if (unlink(tmp2)) {
+                                       debuga(__FILE__,__LINE__,_("Cannot delete \"%s\": %s\n"),tmp2,strerror(errno));
                                        exit(EXIT_FAILURE);
                                }
 
                                olduserip[0]='\0';
 
                                if ((line1=longline_create())==NULL) {
-                                       debuga(_("Not enough memory to read file %s\n"),arqip);
+                                       debuga(__FILE__,__LINE__,_("Not enough memory to read file \"%s\"\n"),arqip);
                                        exit(EXIT_FAILURE);
                                }
                                while((buf=longline_read(fp_ip,line1))!=NULL) {
                                        getword_start(&gwarea,buf);
                                        if (getword(user_ip,sizeof(user_ip),&gwarea,'\t')<0) {
-                                               debuga(_("Maybe you have a broken user IP in your %s file\n"),tmp3);
+                                               debuga(__FILE__,__LINE__,_("Invalid user IP in file \"%s\"\n"),tmp3);
                                                exit(EXIT_FAILURE);
                                        }
                                        if (getword_atoll(&userbytes,&gwarea,'\t')<0) {
-                                               debuga(_("Maybe you have a broken size in your %s file\n"),tmp3);
+                                               debuga(__FILE__,__LINE__,_("Invalid size in file \"%s\"\n"),tmp3);
                                                exit(EXIT_FAILURE);
                                        }
                                        if (getword_atoll(&userelap,&gwarea,'\0')<0) {
-                                               debuga(_("Maybe you have a broken elapsed time in your %s file\n"),tmp3);
+                                               debuga(__FILE__,__LINE__,_("Invalid elapsed time in file \"%s\"\n"),tmp3);
                                                exit(EXIT_FAILURE);
                                        }
                                        if(strcmp(user_ip,olduserip) != 0) {
@@ -452,7 +495,6 @@ void htmlrel(void)
                                                }
 
                                                strcpy(olduserip,user_ip);
-                                               unacc=0;
                                                unbytes=0;
                                                unelap=0;
                                        }
@@ -461,15 +503,14 @@ void htmlrel(void)
                                        unelap+=userelap;
                                }
 
-                               fclose(fp_ip);
-                               longline_destroy(&line1);
-
-                               if (unlink(tmp2)) {
-                                       debuga(_("Cannot delete %s - %s\n"),tmp2,strerror(errno));
+                               if (fclose(fp_ip)==EOF) {
+                                       debuga(__FILE__,__LINE__,_("Read error in \"%s\": %s\n"),tmp3,strerror(errno));
                                        exit(EXIT_FAILURE);
                                }
+                               longline_destroy(&line1);
+
                                if (unlink(tmp3)) {
-                                       debuga(_("Cannot delete %s - %s\n"),tmp3,strerror(errno));
+                                       debuga(__FILE__,__LINE__,_("Cannot delete \"%s\": %s\n"),tmp3,strerror(errno));
                                        exit(EXIT_FAILURE);
                                }
 
@@ -491,22 +532,24 @@ void htmlrel(void)
                                }
                        }
 
-                       unacc=0;
                        unbytes=0;
                        unelap=0;
                }
 
-               fclose(fp_in);
+               if (fclose(fp_in)==EOF) {
+                       debuga(__FILE__,__LINE__,_("Read error in \"%s\": %s\n"),arqin,strerror(errno));
+                       exit(EXIT_FAILURE);
+               }
                longline_destroy(&line);
 
                if (iprel && arqip[0]) {
-                       if (unlink(arqip)) {
-                               debuga(_("Cannot delete %s - %s\n"),arqip,strerror(errno));
+                       if (!KeepTempLog && unlink(arqip)) {
+                               debuga(__FILE__,__LINE__,_("Cannot delete \"%s\": %s\n"),arqip,strerror(errno));
                                exit(EXIT_FAILURE);
                        }
                }
-               if (unlink(arqin)) {
-                       debuga(_("Cannot delete %s - %s\n"),arqin,strerror(errno));
+               if (!KeepTempLog && unlink(arqin)) {
+                       debuga(__FILE__,__LINE__,_("Cannot delete \"%s\": %s\n"),arqin,strerror(errno));
                        exit(EXIT_FAILURE);
                }
 
@@ -539,34 +582,38 @@ void htmlrel(void)
                        fputs("</tr>\n",fp_ou);
                }
 
-               if(PerUserLimit > 0) {
-                       if(tnbytes > (PerUserLimit*1000000)) {
-                               limit_flag=0;
-                               if(access(PerUserLimitFile, R_OK) == 0) {
-                                       if((fp_usr = fopen(PerUserLimitFile, "r")) == 0) {
-                                               debuga(_("(html9) Cannot open file %s\n"),PerUserLimitFile);
+               if (PerUserLimitsNumber>0) {
+                       int limit=(int)(tnbytes/1000000LLU);
+                       int maskid;
+                       int mask;
+                       for (i=0 ; i<PerUserLimitsNumber ; i++) {
+                               maskid=i/sizeof(unsigned int);
+                               mask=0x1U << (i % sizeof(unsigned int));
+                               if (limit>PerUserLimits[i].Limit && (user_limit[maskid] & mask)==0) {
+                                       FILE *fp_usr;
+
+                                       if((fp_usr = fopen(PerUserLimits[i].File, "at")) == 0) {
+                                               debuga(__FILE__,__LINE__,_("Cannot open file \"%s\": %s\n"),PerUserLimits[i].File,strerror(errno));
                                                exit(EXIT_FAILURE);
                                        }
-                                       while(fgets(tmp6,sizeof(tmp6),fp_usr)!=NULL) {
-                                               fixendofline(tmp6);
-                                               if(strcmp(tmp6,uinfo->label) == 0) {
-                                                       limit_flag=1;
+                                       switch (PerUserLimits[i].Output)
+                                       {
+                                               case PUOE_UserId:
+                                                       fprintf(fp_usr,"%s\n",uinfo->label);
+                                                       break;
+                                               case PUOE_UserIp:
+                                                       fprintf(fp_usr,"%s\n",uinfo->ip);
                                                        break;
-                                               }
                                        }
-                                       fclose(fp_usr);
-                               }
-
-                               if(!limit_flag) {
-                                       if((fp_usr = fopen(PerUserLimitFile, "a")) == 0) {
-                                               debuga(_("(html10) Cannot open file %s\n"),PerUserLimitFile);
+                                       if (fclose(fp_usr)==EOF) {
+                                               debuga(__FILE__,__LINE__,_("Write error in \"%s\": %s\n"),PerUserLimits[i].File,strerror(errno));
                                                exit(EXIT_FAILURE);
                                        }
-                                       fprintf(fp_usr,"%s\n",uinfo->label);
-                                       fclose(fp_usr);
+                                       user_limit[maskid]|=mask;
 
                                        if(debug)
-                                               debuga(_("User %s limit exceeded (%d MB). Added to file %s\n"),uinfo->label,PerUserLimit,PerUserLimitFile);
+                                               debuga(__FILE__,__LINE__,_("Limit exceeded for user %s (%d MB). Added to file \"%s\"\n"),uinfo->label,
+                                                          PerUserLimits[i].Limit,PerUserLimits[i].File);
                                }
                        }
                }
@@ -596,16 +643,16 @@ void htmlrel(void)
                        fputs("</tfoot>",fp_ou);
 
                fputs("</table></div>\n",fp_ou);
-               if (write_html_trailer(fp_ou)<0)
-                       debuga(_("Write error in file %s\n"),arqou);
-               if (fclose(fp_ou)==EOF)
-                       debuga(_("Failed to close file %s - %s\n"),arqou,strerror(errno));
+               write_html_trailer(fp_ou);
+               if (fclose(fp_ou)==EOF) {
+                       debuga(__FILE__,__LINE__,_("Write error in \"%s\": %s\n"),arqou,strerror(errno));
+                       exit(EXIT_FAILURE);
+               }
 
                htaccess(uinfo);
        }
 
        userinfo_stopscan(uscan);
-       greport_cleanup();
 
        return;
 }