Changeset 1175
- Timestamp:
- 01/10/10 21:38:00 (14 years ago)
- Location:
- branches/monitor-improvement
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/monitor-improvement/oscam-config.c
r1174 r1175 1977 1977 1978 1978 char *mk_t_group(ulong *grp){ 1979 int i = 0, needed = 1, pos = 0 ;1979 int i = 0, needed = 1, pos = 0, dot = 0; 1980 1980 char grpbit[33]; 1981 1981 long2bitchar((long) grp, grpbit); … … 1991 1991 for(i = 0; i < 32; i++){ 1992 1992 if (grpbit[i] == '1'){ 1993 if ( i== 0){1993 if (dot == 0){ 1994 1994 sprintf(value + pos, "%d", i+1); 1995 1995 if (i > 9)pos += 2; 1996 1996 else pos += 1; 1997 dot = 1; 1997 1998 } else { 1998 1999 sprintf(value + pos, ",%d", i+1); -
branches/monitor-improvement/oscam-http.c
r1173 r1175 510 510 } 511 511 512 //Group 513 /*restore the settings format of group from long over bitarray*/ 514 char *dot = ""; //flag for comma 515 char grpbit[33]; 516 long2bitchar(reader[ridx].grp, grpbit); 517 for(i = 0; i < 32; i++){ 518 if (grpbit[i] == '1'){ 519 tpl_printf(vars, 1, "GRP", "%s%d", dot, i+1); 520 dot = ","; 521 } 522 } 512 //group 513 char *value = mk_t_group((long*)reader[ridx].grp); 514 tpl_printf(vars, 0, "GRP", "%s", value); 515 free(value); 523 516 524 517 //services … … 543 536 544 537 // CAID 545 char *value = mk_t_caidtab(&reader[ridx].ctab);538 value = mk_t_caidtab(&reader[ridx].ctab); 546 539 tpl_addVar(vars, 0, "CAIDS", value); 547 540 free(value); … … 549 542 /*IDENT*/ 550 543 int j; 551 dot="";544 char *dot=""; 552 545 FTAB *ftab = &reader[ridx].ftab; 553 546 for (i = 0; i < ftab->nfilts; ++i){ … … 752 745 strftime (buf,80,"%Y-%m-%d",timeinfo); 753 746 if(strcmp(buf,"1970-01-01")) tpl_addVar(vars, 0, "EXPDATE", buf); 747 754 748 //Group 755 /*restore the settings format of group from long over bitarray*/ 756 char *dot = ""; //flag for comma 757 char grpbit[33]; 758 long2bitchar(account->grp, grpbit); 759 for(i = 0; i < 32; i++){ 760 if (grpbit[i] == '1'){ 761 tpl_printf(vars, 1, "GROUPS", "%s%d", dot, i+1); 762 dot = ","; 763 } 764 } 749 char *value = mk_t_group((long*)account->grp); 750 tpl_addVar(vars, 0, "GROUPS", value); 751 free(value); 752 765 753 //Hostname 766 754 tpl_addVar(vars, 0, "DYNDNS", (char *)account->dyndns); … … 811 799 812 800 // CAID 813 char *value = mk_t_caidtab(&account->ctab);801 value = mk_t_caidtab(&account->ctab); 814 802 tpl_addVar(vars, 0, "CAIDS", value); 815 803 free(value); 816 804 817 805 /*IDENT*/ 818 dot="";806 char *dot=""; 819 807 FTAB *ftab = &account->ftab; 820 808 for (i = 0; i < ftab->nfilts; ++i){
Note:
See TracChangeset
for help on using the changeset viewer.