Changeset 1088
- Timestamp:
- 01/06/10 13:59:34 (14 years ago)
- Location:
- branches/monitor-improvement
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/monitor-improvement/oscam-http.c
r1082 r1088 819 819 if((cfg->http_hide_idle_clients == 1) && (client[i].typ == 'c') && ((now - client[i].lastecm) > cfg->mon_hideclient_to)) continue; 820 820 821 /*if ((cfg->mon_hideclient_to <= 0) || (((now-client[i].lastecm)/60)<cfg->mon_hideclient_to) ||822 (((now-client[i].lastemm)/60)<cfg->mon_hideclient_to) || (client[i].typ!='c')){*/823 821 lsec=now-client[i].login; 824 822 isec=now-client[i].last; … … 858 856 tpl_printf(vars, 0, "CWNOK", "%d", client[i].cwnot); 859 857 tpl_addVar(vars, 1, "CLIENTSTATUS", tpl_getTpl(vars, "CLIENTSTATUSBIT")); 860 //}861 858 } 862 859 } … … 876 873 } 877 874 878 void send_oscam_services(struct templatevars *vars, FILE *f ) {875 void send_oscam_services(struct templatevars *vars, FILE *f, struct uriparams *params) { 879 876 struct s_sidtab *sidtab = cfg->sidtab; 880 877 int i; 881 878 879 if (strcmp(getParam(params, "action"), "delete") == 0){ 880 881 //Todo Delete Service 882 tpl_addVar(vars, 0, "MESSAGE", "<BR><B>Delete Service not yet implemented</B>"); 883 884 } 885 886 if (strcmp(getParam(params, "action"), "edit") == 0){ 887 888 //Todo Edit Service 889 tpl_addVar(vars, 0, "MESSAGE", "<BR><B>Edit Service not yet implemented</B>"); 890 891 } 892 893 if (strcmp(getParam(params, "action"), "add") == 0){ 894 895 //Todo Add Service 896 tpl_addVar(vars, 0, "MESSAGE", "<BR><B>Add Service not yet implemented</B>"); 897 898 } 899 900 // Show List 882 901 while(sidtab != NULL){ 883 for (i=0; i<sidtab->num_caid; i++){ 884 if (i==0) tpl_printf(vars, 0, "CAIDS", "%04X", sidtab->caid[i]); 885 else tpl_printf(vars, 1, "CAIDS", ",%04X", sidtab->caid[i]); 886 } 887 888 for (i=0; i<sidtab->num_provid; i++){ 889 if (i==0) tpl_printf(vars, 0, "PROVIDS", "%ld08X", sidtab->provid[i]); 890 else tpl_printf(vars, 1, "PROVIDS", ",%ld08X", sidtab->provid[i]); 891 } 892 893 for (i=0; i<sidtab->num_srvid; i++){ 894 if (i==0) tpl_printf(vars, 0, "SRVIDS", "%04X", sidtab->srvid[i]); 895 else tpl_printf(vars, 1, "SRVIDS", ",%04X", sidtab->srvid[i]); 902 tpl_printf(vars, 0, "SID",""); 903 if ((strcmp(getParam(params, "service"), sidtab->label) == 0) && (strcmp(getParam(params, "action"), "list") == 0) ){ 904 for (i=0; i<sidtab->num_srvid; i++){ 905 tpl_printf(vars, 1, "SID", "%04X : %s<BR>", sidtab->srvid[i], monitor_get_srvname(sidtab->srvid[i])); 906 } 907 } else { 908 tpl_printf(vars, 0, "SID","<A HREF=\"services.html?service=%s&action=list\">Show Services</A>",sidtab->label); 896 909 } 897 910 tpl_addVar(vars, 0, "LABEL", sidtab->label); 898 tpl_printf(vars, 0, "CAIDNUM", "%d", sidtab->num_caid); 899 tpl_printf(vars, 0, "PROVIDNUM", "%d",sidtab->num_provid); 900 tpl_printf(vars, 0, "SRVIDNUM", "%d", sidtab->num_srvid); 901 tpl_addVar(vars, 1, "SIDTABS", tpl_getTpl(vars, "SIDTABBIT")); 911 tpl_addVar(vars, 0, "SIDLIST", tpl_getTpl(vars, "SERVICECONFIGSIDBIT")); 912 tpl_addVar(vars, 1, "SERVICETABS", tpl_getTpl(vars, "SERVICECONFIGLISTBIT")); 902 913 sidtab=sidtab->next; 903 } 904 fputs(tpl_getTpl(vars, "SIDTAB"), f); 914 } 915 fputs(tpl_getTpl(vars, "SERVICECONFIGLIST"), f); 916 917 // while(sidtab != NULL){ 918 // for (i=0; i<sidtab->num_caid; i++){ 919 // if (i==0) tpl_printf(vars, 0, "CAIDS", "%04X", sidtab->caid[i]); 920 // else tpl_printf(vars, 1, "CAIDS", ",%04X", sidtab->caid[i]); 921 // } 922 // 923 // for (i=0; i<sidtab->num_provid; i++){ 924 // if (i==0) tpl_printf(vars, 0, "PROVIDS", "%ld08X", sidtab->provid[i]); 925 // else tpl_printf(vars, 1, "PROVIDS", ",%ld08X", sidtab->provid[i]); 926 // } 927 // 928 // for (i=0; i<sidtab->num_srvid; i++){ 929 // if (i==0) tpl_printf(vars, 0, "SRVIDS", "%04X", sidtab->srvid[i]); 930 // else tpl_printf(vars, 1, "SRVIDS", ",%04X", sidtab->srvid[i]); 931 // } 932 // tpl_addVar(vars, 0, "LABEL", sidtab->label); 933 // tpl_printf(vars, 0, "CAIDNUM", "%d", sidtab->num_caid); 934 // tpl_printf(vars, 0, "PROVIDNUM", "%d",sidtab->num_provid); 935 // tpl_printf(vars, 0, "SRVIDNUM", "%d", sidtab->num_srvid); 936 // tpl_addVar(vars, 1, "SIDTABS", tpl_getTpl(vars, "SIDTABBIT")); 937 // sidtab=sidtab->next; 938 // } 939 // fputs(tpl_getTpl(vars, "SIDTAB"), f); 905 940 } 906 941 … … 1041 1076 case 4: send_oscam_user_config(vars, f, ¶ms); break; 1042 1077 case 5: send_oscam_reader_config(vars, f, ¶ms); break; 1043 case 6: send_oscam_services(vars, f ); break;1078 case 6: send_oscam_services(vars, f, ¶ms); break; 1044 1079 case 7: send_oscam_user_config_edit(vars, f, ¶ms); break; 1045 1080 case 9: send_oscam_savetpls(vars, f); break; -
branches/monitor-improvement/oscam-http.h
r1081 r1088 654 654 ##TPLFOOTER##" 655 655 #endif 656 657 #define TPLSERVICECONFIGLIST "\ 658 ##TPLHEADER##\ 659 ##TPLMENU##\n\ 660 ##MESSAGE##\ 661 <BR><BR>\ 662 <TABLE cellspacing=\"0\" cellpadding=\"10\">\n\ 663 <TR>\n\ 664 <TH>Label</TH>\n\ 665 <TH colspan=\"3\" align=\"center\">Action</TH>\n\ 666 </TR>\n\ 667 ##SERVICETABS##\ 668 <TR>\n\ 669 <FORM action=\"services.html\" method=\"get\"><INPUT TYPE=\"hidden\" NAME=\"action\" VALUE=\"add\">\n\ 670 <TD>New Service:</TD>\n\ 671 <TD colspan=\"2\"><input name=\"service\" type=\"text\"></TD>\n\ 672 <TD align=\"center\"><input type=\"submit\" value=\"Add Service\"></TD>\n\ 673 </FORM>\n\ 674 <TR>\n\ 675 </TABLE>\n\ 676 ##TPLFOOTER##" 677 678 #define TPLSERVICECONFIGLISTBIT "\ 679 <TR>\n\ 680 <TD>##LABEL##</TD>\n\ 681 <TD>##SIDLIST##</TD>\n\ 682 <TD><A HREF=\"services.html?service=##LABEL##&action=edit\">Edit Settings</A></TD>\n\ 683 <TD><A HREF=\"services.html?service=##LABEL##&action=delete\">Delete Service</A></TD>\n\ 684 </TR>\n" 685 686 #define TPLSERVICECONFIGSIDBIT "\ 687 ##SID##" 688 689 656 690 657 691 enum refreshtypes {REFR_ACCOUNTS, REFR_READERS, REFR_SERVER, REFR_ANTICASC}; … … 689 723 "CONFIGCAMD35", 690 724 "CONFIGCAMD35TCP", 691 "CONFIGSERIAL" 725 "CONFIGSERIAL", 726 "SERVICECONFIGLIST", 727 "SERVICECONFIGLISTBIT", 728 "SERVICECONFIGSIDBIT" 692 729 #ifdef HAVE_DVBAPI_3 693 730 ,"CONFIGDVBAPI" … … 733 770 TPLCONFIGCAMD35, 734 771 TPLCONFIGCAMD35TCP, 735 TPLCONFIGSERIAL 772 TPLCONFIGSERIAL, 773 TPLSERVICECONFIGLIST, 774 TPLSERVICECONFIGLISTBIT, 775 TPLSERVICECONFIGSIDBIT 736 776 #ifdef HAVE_DVBAPI_3 737 777 ,TPLCONFIGDVBAPI
Note:
See TracChangeset
for help on using the changeset viewer.