]> git.ipfire.org Git - thirdparty/sarg.git/blobdiff - html.c
Add an option to create the per_user_limit files
[thirdparty/sarg.git] / html.c
diff --git a/html.c b/html.c
index 00dac809ff406a84dc523eb668fb3dda7f68fe73..ad5be738e80adcea141bdf66d228aa911fa98070 100644 (file)
--- a/html.c
+++ b/html.c
 #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;
@@ -51,6 +58,8 @@ void htmlrel(void)
        double perc=0, perc2=0, ouperc=0, inperc=0;
        int count;
        int cstatus;
+       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;
@@ -77,6 +86,31 @@ void htmlrel(void)
 
        sort_labels(&sort_field,&sort_order);
 
+       switch (PerUserFileCreation)
+       {
+               case PUFC_Always:
+                       for (i=0 ; i<PerUserLimitsNumber ; i++) {
+                               FILE *fp_usr=fopen(PerUserLimits[i].File,"wt");
+                               if (fp_usr==NULL) {
+                                       debuga(_("Cannot create empty per_user_limit file \"%s\": %s"),PerUserLimits[i].File,
+                                                  strerror(errno));
+                                       exit(EXIT_FAILURE);
+                               }
+                               fclose(fp_usr);
+                       }
+                       break;
+
+               case PUFC_AsRequired:
+                       for (i=0 ; i<PerUserLimitsNumber ; i++) {
+                               if (access(PerUserLimits[i].File,R_OK)==0 && unlink(PerUserLimits[i].File)==-1) {
+                                       debuga(_("Cannot delete per_user_limit file \"%s\": %s"),PerUserLimits[i].File,
+                                                  strerror(errno));
+                                       exit(EXIT_FAILURE);
+                               }
+                       }
+                       break;
+       }
+
        uscan=userinfo_startscan();
        if (uscan == NULL) {
                debuga(_("Cannot enumerate the user list\n"));
@@ -129,6 +163,9 @@ void htmlrel(void)
                        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;
@@ -206,7 +243,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)
@@ -214,7 +251,7 @@ 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);
 
@@ -264,8 +301,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>");
                                }
@@ -323,8 +360,7 @@ 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(warea,sizeof(warea),"%s/%s/tt%s-%s.html",outdirname,uinfo->filename,uinfo->filename,siteind);
+                               snprintf(warea,sizeof(warea),"%s/%s/tt.html",outdirname,uinfo->filename);
                                if (unlink(warea)!=0) {
                                        debuga(_("Cannot delete \"%s\": %s\n"),warea,strerror(errno));
                                }
@@ -528,37 +564,33 @@ 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: %s\n"),PerUserLimitFile,strerror(errno));
-                                               exit(EXIT_FAILURE);
-                                       }
-                                       while(fgets(tmp6,sizeof(tmp6),fp_usr)!=NULL) {
-                                               fixendofline(tmp6);
-                                               if(strcmp(tmp6,uinfo->label) == 0) {
-                                                       limit_flag=1;
-                                                       break;
-                                               }
-                                       }
-                                       fclose(fp_usr);
-                               }
-
-                               if(!limit_flag) {
-                                       if((fp_usr = fopen(PerUserLimitFile, "a")) == 0) {
-                                               debuga(_("(html10) Cannot open file %s: %s\n"),PerUserLimitFile,strerror(errno));
+               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(_("(html10) Cannot open per user limit file %s: %s\n"),PerUserLimits[i].File,strerror(errno));
                                                exit(EXIT_FAILURE);
                                        }
-                                       fprintf(fp_usr,"%s\n",uinfo->label);
+                                       if (PerUserLimits[i].UserId)
+                                               fprintf(fp_usr,"%s\n",uinfo->label);
+                                       else
+                                               fprintf(fp_usr,"%s\n",uinfo->ip);
                                        if (fclose(fp_usr)==EOF) {
-                                               debuga(_("Write error in %s: %s\n"),PerUserLimitFile,strerror(errno));
+                                               debuga(_("Write error in per user limit file %s: %s\n"),PerUserLimits[i].File,strerror(errno));
                                                exit(EXIT_FAILURE);
                                        }
+                                       user_limit[maskid]|=mask;
 
                                        if(debug)
-                                               debuga(_("User %s limit exceeded (%d MB). Added to file %s\n"),uinfo->label,PerUserLimit,PerUserLimitFile);
+                                               debuga(_("User %s limit exceeded (%d MB). Added to file %s\n"),uinfo->label,
+                                                          PerUserLimits[i].Limit,PerUserLimits[i].File);
                                }
                        }
                }