Changeset 4159
- Timestamp:
- 12/19/10 11:52:31 (13 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/oscam-http.c
r4156 r4159 1674 1674 } 1675 1675 1676 void send_oscam_entitlement(struct templatevars *vars, FILE *f, struct uriparams *params ) {1676 void send_oscam_entitlement(struct templatevars *vars, FILE *f, struct uriparams *params, struct in_addr in, int apicall) { 1677 1677 /* build entitlements from reader init history */ 1678 1678 char *reader_ = getParam(params, "label"); … … 2569 2569 if (strcmp(getParam(params, "part"), "status") == 0) { 2570 2570 send_oscam_status(vars, f, params, in, 1); 2571 } 2572 else if (strcmp(getParam(params, "part"), "entitlement") == 0) { 2573 //Send Errormessage while under construction 2574 tpl_addVar(vars, 0, "APIERRORMESSAGE", "coming soon"); 2575 webif_write(tpl_getTpl(vars, "APIERROR"), f); 2576 2577 //send_oscam_entitlement(vars, f, params, in, 1); 2578 } 2579 else { 2580 tpl_addVar(vars, 0, "APIERRORMESSAGE", "part not found"); 2581 webif_write(tpl_getTpl(vars, "APIERROR"), f); 2571 2582 } 2572 2583 } … … 2821 2832 case 0: send_oscam_config(vars, f, ¶ms, in); break; 2822 2833 case 1: send_oscam_reader(vars, f, ¶ms, in); break; 2823 case 2: send_oscam_entitlement(vars, f, ¶ms ); break;2834 case 2: send_oscam_entitlement(vars, f, ¶ms, in, 0); break; 2824 2835 case 3: send_oscam_status(vars, f, ¶ms, in, 0); break; 2825 2836 case 4: send_oscam_user_config(vars, f, ¶ms, in); break; … … 2836 2847 case 15: send_oscam_reader_stats(vars, f, ¶ms); break; 2837 2848 case 16: send_oscam_failban(vars, f, ¶ms); break; 2838 //case 8: js file2849 //case 17: js file 2839 2850 case 18: send_oscam_api(vars, f, ¶ms, in); break; 2840 2851 default: send_oscam_status(vars, f, ¶ms, in, 0); break; -
trunk/oscam-http.h
r4155 r4159 244 244 #define TPLAPIHEADER "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\ 245 245 <oscam version=\"##CS_VERSION## build ###CS_SVN_VERSION##\" starttime=\"##STARTDATE## - ##STARTTIME##\">\n" 246 247 #define TPLAPIERROR "##TPLAPIHEADER##\n\ 248 <error>##APIERRORMESSAGE##</error>\n\ 249 ##TPLAPIFOOTER##" 246 250 247 251 #define TPLFOOTER "\ … … 1360 1364 "HEADER", 1361 1365 "APIHEADER", 1366 "APIERROR", 1362 1367 "FOOTER", 1363 1368 "APIFOOTER", … … 1451 1456 TPLHEADER, 1452 1457 TPLAPIHEADER, 1458 TPLAPIERROR, 1453 1459 TPLFOOTER, 1454 1460 TPLAPIFOOTER,
Note:
See TracChangeset
for help on using the changeset viewer.