Changeset 10688
- Timestamp:
- 06/09/15 20:32:05 (9 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-webif.c
r10653 r10688 3982 3982 tpl_addVar(vars, TPLAPPEND, "LOGHISTORY", "<BR><BR>New Structure:<BR>"); 3983 3983 char tbuffer[83]; 3984 int jsondelimiter = 0; 3984 3985 while((item = ll_iter_next(&itr))) 3985 3986 { 3986 3987 3987 localtime_r(&item->start, &start_t); 3988 3988 localtime_r(&item->end, &end_t); … … 4016 4016 { tpl_addVar(vars, TPLAPPEND, "READERENTENTRY", tpl_getTpl(vars, "ENTITLEMENTITEMBIT")); } 4017 4017 4018 if(apicall==2) 4019 { 4020 tpl_printf(vars, TPLAPPEND, "APIENTITLEMENTLIST","%s%s",jsondelimiter?",":"", tpl_getTpl(vars, "JSONENTITLEMENTBIT")); 4021 jsondelimiter++; 4022 } 4018 4023 } 4019 4024 } … … 4155 4160 { return tpl_getTpl(vars, "ENTITLEMENTS"); } 4156 4161 else 4157 { return tpl_getTpl(vars, "APICCCAMCARDLIST"); } 4162 { 4163 if(apicall==1) 4164 { return tpl_getTpl(vars, "APICCCAMCARDLIST"); } 4165 else 4166 { return tpl_getTpl(vars, "JSONENTITLEMENTS"); } 4167 } 4158 4168 } 4159 4169 … … 6707 6717 if(rdr) 6708 6718 { 6709 if(rdr-> typ == R_CCCAM && rdr->enable == 1)6719 if(rdr->enable == 1) 6710 6720 { 6711 6721 return send_oscam_entitlement(vars, params, apicall); -
trunk/webif/pages_index.txt
r10403 r10688 9 9 JSONCACHEEX api.json/cacheex.json CS_CACHEEX 10 10 JSONCACHEEXBIT api.json/cacheexbit.json CS_CACHEEX 11 JSONENTITLEMENTS api.json/entitlements.json 12 JSONENTITLEMENTBIT api.json/entitlementbit.json 11 13 JSONFOOTER api.json/footer.json 12 14 JSONHEADER api.json/header.json
Note:
See TracChangeset
for help on using the changeset viewer.