{\r
int i;\r
char *str;\r
- FILE *f=fopen(html,"w");\r
+ FILE *f=fopen(html, "w");\r
\r
string(str,STRLEN); \r
if(f > 0)\r
int count=1;\r
i=0;\r
\r
- /*-----------------------------------------------------------------*/\r
- printf("Writing statistics summary into HTML page %s ...\n", html);\r
- /*-----------------------------------------------------------------*/\r
-\r
if(use_jquery_popups)\r
{\r
fprintf(f,"<script type=\"text/javascript\" src=\"%s\"></script>\n", jquery_url);\r
{\r
fprintf(f,"<span id=\"sharing_%d\" style=\"display:none\">",i);\r
popup_button=0;\r
- for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))\r
+ for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && !sharedip->v6) /* IPv4 only */\r
{\r
fprintf(f,"<br /><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s</a>\n", log_url, sharedip->name, sharedip->name);\r
popup_button++;\r
}\r
+ for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && sharedip->v6) /* IPv6 only */\r
+ {\r
+ fprintf(f,"<br /><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s/64</a>\n", log_url, sharedip->addr, sharedip->addr);\r
+ popup_button++;\r
+ }\r
fputs("</span>\n",f);\r
if(popup_button)\r
{\r
}\r
fprintf(f,"<td style=\"text-align: right\">%Lu</td>\n", ip->credit);\r
fprintf(f,"<td style=\"text-align: right\"><span style=\"color:#%s\">%Lu</span></td>",\r
- ip->keyword->html_color,\r
- ip->credit+(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20)));\r
+ ip->keyword->html_color, ip->realquota);\r
fprintf(f,"<td style=\"text-align: right\">%s%Lu%s", f1, ip->traffic, f2);\r
\r
/* download --------------------------------------- */\r
if(use_jquery_popups)\r
{\r
fprintf(f,"<span id=\"download_%d\" style=\"display:none\">",i);\r
- for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))\r
+ for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && !sharedip->v6) /* IPv4 only */\r
+ {\r
+ fprintf(f,"<br />%Lu", sharedip->direct);\r
+ }\r
+ for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && sharedip->v6) /* IPv6 only */\r
{\r
fprintf(f,"<br />%Lu", sharedip->direct);\r
}\r
if(use_jquery_popups)\r
{\r
fprintf(f,"<span id=\"upload_%d\" style=\"display:none\">",i);\r
- for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))\r
+ for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing) && !sharedip->v6) /* IPv4 only */\r
+ {\r
+ fprintf(f,"<br />%Lu", sharedip->upload);\r
+ }\r
+ for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing) && sharedip->v6) /* IPv6 only */\r
{\r
fprintf(f,"<br />%Lu", sharedip->upload);\r
}\r