X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=siteuser.c;h=5af74ca794c80d1ecd48f0887d4e4d3faa775ce4;hb=94ff9470def23029000c8dc1e0aa0eba7c88a919;hp=9213f04323b7e594b12ff06a50f9c8f3ed71102c;hpb=25697a35b189e7a51ea2eee8edd11e3d3059a110;p=thirdparty%2Fsarg.git
diff --git a/siteuser.c b/siteuser.c
index 9213f04..5af74ca 100644
--- a/siteuser.c
+++ b/siteuser.c
@@ -1,7 +1,7 @@
/*
- * AUTHOR: Pedro Lineu Orso orso@brturbo.com.br
+ * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br
* 1998, 2005
- * SARG Squid Analysis Report Generator http://sarg-squid.org
+ * SARG Squid Analysis Report Generator http://sarg.sourceforge.net
*
* SARG donations:
* please look at http://sarg.sourceforge.net/donations.php
@@ -63,7 +63,7 @@ void siteuser()
fgets(periodo,sizeof(periodo),fp_in);
fclose(fp_in);
- sprintf(csort,"sort -k 4,4 -k 1,1 -o %s %s",geral2,geral);
+ sprintf(csort,"sort -k 4,4 -k 1,1 -o '%s' '%s'",geral2,geral);
system(csort);
if((fp_in=fopen(geral2,"r"))==NULL) {
@@ -94,9 +94,10 @@ void siteuser()
fputs(url,fp_ou);
if(strlen(LogoImage) > 0) {
- fputs("
\n",fp_ou);
- sprintf(url,"%s\n",LogoImage,Width,Height,LogoTextColor,LogoText);
+ fputs("\n",fp_ou);
+ sprintf(url," %s | \n",LogoImage,Width,Height,LogoText);
fputs(url,fp_ou);
+ fputs(" | \n",fp_ou);
fputs(" \n",fp_ou);
}
@@ -134,19 +135,24 @@ void siteuser()
if(userip)
fixip(user);
- if(UserTabFile[0] != '\0') {
- sprintf(warea,":%s:",user);
- if((str=(char *) strstr(userfile,warea)) != (char *) NULL ) {
- z1=0;
- str2=(char *) strstr(str+1,":");
- str2++;
- bzero(name, MAXLEN);
- while(str2[z1] != ':') {
- name[z1]=str2[z1];
- z1++;
- }
- } else strcpy(name,user);
- } else strcpy(name,user);
+ if(UserTabFile[0] != '\0') {
+ sprintf(warea,":%s:",user);
+ if((str=(char *) strstr(userfile,warea)) != (char *) NULL ) {
+ z1=0;
+ str2=(char *) strstr(str+1,":");
+ str2++;
+ bzero(name, MAXLEN);
+ while(str2[z1] != ':') {
+ name[z1]=str2[z1];
+ z1++;
+ }
+ } else strcpy(name,user);
+ } else strcpy(name,user);
+
+ if(dotinuser && strstr(name,"_")) {
+ str2=(char *)subs(name,"_",".");
+ strcpy(name,str2);
+ }
if(strcmp(Ip2Name,"yes") == 0)
ip2name(user);
|
---|