Changeset 4417
- Timestamp:
- 01/12/11 01:06:30 (13 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/globals.h
r4404 r4417 1065 1065 int http_use_ssl; 1066 1066 char http_cert[128]; 1067 int http_js_icons;1068 1067 #endif 1069 1068 int http_full_cfg; -
trunk/oscam-config.c
r4413 r4417 749 749 } 750 750 751 if (!strcmp(token, "httpjsicons")) {752 cfg->http_js_icons = strToIntVal(value, 0);753 return;754 }755 756 751 if (token[0] != '#') 757 752 fprintf(stderr, "Warning: keyword '%s' in webif section not recognized\n",token); … … 1296 1291 cfg->http_hide_idle_clients = 0; 1297 1292 strcpy(cfg->http_tpl, ""); 1298 cfg->http_js_icons = 1;1299 1293 #endif 1300 1294 cfg->ncd_keepalive = 1; … … 1985 1979 fprintf_conf(f, CONFVARWIDTH, "httpreadonly", "%d\n", cfg->http_readonly); 1986 1980 fprintf_conf(f, CONFVARWIDTH, "httpsavefullcfg", "%d\n", cfg->http_full_cfg); 1987 fprintf_conf(f, CONFVARWIDTH, "httpjsicons", "%d\n", cfg->http_js_icons);1988 1981 1989 1982 fputc((int)'\n', f); -
trunk/oscam-http.c
r4416 r4417 532 532 if (cfg->http_full_cfg) 533 533 tpl_addVar(vars, 0, "HTTPSAVEFULLSELECT", "selected"); 534 535 if (cfg->http_js_icons)536 tpl_addVar(vars, 0, "HTTPJSICONS", "selected");537 534 538 535 return tpl_getTpl(vars, "CONFIGMONITOR"); … … 753 750 tpl_printf(vars, 0, "EMMBLOCKEDUQ", "%d", rdr->emmblocked[UNIQUE]); 754 751 755 756 tpl_addVar(vars, 0, "DELICO", "image?i=ICDEL");757 tpl_addVar(vars, 0, "STATICO", "image?i=ICSTA");758 tpl_addVar(vars, 0, "EDIICO", "image?i=ICEDI");759 760 761 752 if (!(rdr->typ & R_IS_NETWORK)) { //reader is physical 762 753 tpl_addVar(vars, 0, "REFRICO", "image?i=ICREF"); … … 764 755 tpl_addVar(vars, 0, "ENTICO", "image?i=ICENT"); 765 756 tpl_addVar(vars, 0, "ENTITLEMENT", tpl_getTpl(vars, "READERENTITLEBIT")); 766 767 757 } else { 768 758 tpl_addVar(vars, 0, "READERREFRESH",""); … … 773 763 tpl_addVar(vars, 0, "ENTITLEMENT",""); 774 764 } 775 776 765 } 777 766 … … 1700 1689 tpl_addVar(vars, 0, "EXPIRED", expired); 1701 1690 1702 if (!cfg->http_js_icons) {1703 tpl_addVar(vars, 0, "DELICO", ICDEL);1704 tpl_addVar(vars, 0, "EDIICO", ICEDI);1705 tpl_addVar(vars, 0, "RESICO", ICRES);1706 }1707 1708 1691 tpl_addVar(vars, 1, "USERCONFIGS", tpl_getTpl(vars, "USERCONFIGLISTBIT")); 1709 1692 isec = 0; … … 2041 2024 tpl_printf(vars, 0, "HIDEIDX", "%ld", cl->thread); 2042 2025 2043 if(!cfg->http_js_icons)2044 tpl_addVar(vars, 0, "HIDEICON", ICHID);2045 2046 2026 if(cl->typ == 'c' && !cfg->http_readonly) { 2047 2027 tpl_printf(vars, 0, "CSIDX", "<A HREF=\"status.html?action=kill&threadid=%ld\" TITLE=\"Kill this client\"><IMG HEIGHT=\"16\" WIDTH=\"16\" SRC=\"image?i=ICKIL\" ALT=\"Kill\"></A>", cl->thread); 2048 2028 } 2049 2029 else if((cl->typ == 'p') && !cfg->http_readonly) { 2050 2030 tpl_printf(vars, 0, "CSIDX", "<A HREF=\"status.html?action=restart&label=%s\" TITLE=\"Restart this reader/ proxy\"><IMG HEIGHT=\"16\" WIDTH=\"16\" SRC=\"image?i=ICKIL\" ALT=\"Restart\"></A>", urlencode(vars, cl->reader->label)); 2051 2031 } 2052 2032 else { … … 2420 2400 tpl_addVar(vars, 0, "SIDLIST", tpl_getTpl(vars, "SERVICECONFIGSIDBIT")); 2421 2401 2422 if (!cfg->http_js_icons) {2423 tpl_addVar(vars, 0, "EDIICO", ICEDI);2424 tpl_addVar(vars, 0, "DELICO", ICDEL);2425 }2426 2427 2402 tpl_addVar(vars, 1, "SERVICETABS", tpl_getTpl(vars, "SERVICECONFIGLISTBIT")); 2428 2403 sidtab=sidtab->next; … … 2732 2707 while ((v_ban_entry=ll_iter_next(itr))) { 2733 2708 2734 if (!cfg->http_js_icons)2735 tpl_addVar(vars, 0, "DELICO", ICDEL);2736 2709 tpl_printf(vars, 0, "IPADDRESS", "%s", cs_inet_ntoa(v_ban_entry->v_ip)); 2737 2710 … … 3116 3089 tpl_addVar(vars, 0, "REFRESHURL", "status.html"); 3117 3090 tpl_addVar(vars, 0, "REFRESH", tpl_getTpl(vars, "REFRESH")); 3118 }3119 3120 if (cfg->http_js_icons && ( pgidx == 6 || pgidx == 16)) {3121 tpl_printf(vars, 0, "ICONS", "var ICSTA =\"%s\";\n", ICSTA);3122 tpl_printf(vars, 1, "ICONS", "var ICDEL =\"%s\";\n", ICDEL);3123 tpl_printf(vars, 1, "ICONS", "var ICEDI =\"%s\";\n", ICEDI);3124 tpl_printf(vars, 1, "ICONS", "var ICENT =\"%s\";\n", ICENT);3125 tpl_printf(vars, 1, "ICONS", "var ICREF =\"%s\";\n", ICREF);3126 tpl_printf(vars, 1, "ICONS", "var ICKIL =\"%s\";\n", ICKIL);3127 tpl_printf(vars, 1, "ICONS", "var ICDIS =\"%s\";\n", ICDIS);3128 tpl_printf(vars, 1, "ICONS", "var ICENA =\"%s\";\n", ICENA);3129 tpl_printf(vars, 1, "ICONS", "var ICHID =\"%s\";\n", ICHID);3130 tpl_printf(vars, 1, "ICONS", "var ICRES =\"%s\";\n", ICRES);3131 tpl_addVar(vars, 0, "ONLOADSCRIPT", " onload=\"load_Icons()\"");3132 3091 } 3133 3092 -
trunk/oscam-http.h
r4416 r4417 389 389 <TD>##VIOLATIONCOUNT##</TD>\ 390 390 <TD align=\"center\">##LEFTTIME##</TD>\ 391 <TD align=\"center\"><A HREF=\"failban.html?action=delete&intip=##INTIP##\" TITLE=\"Delete Entry\"><IMG HEIGHT=\"16\" WIDTH=\"16\" ID=\"ICDEL\" SRC=\"##DELICO##\" BORDER=\"0\" ALT=\"Delete Entry\"/></A></TD></TR>\n"391 <TD align=\"center\"><A HREF=\"failban.html?action=delete&intip=##INTIP##\" TITLE=\"Delete Entry\"><IMG HEIGHT=\"16\" WIDTH=\"16\" SRC=\"image?i=ICDEL\" BORDER=\"0\" ALT=\"Delete Entry\"/></A></TD></TR>\n" 392 392 393 393 #ifdef CS_ANTICASC … … 717 717 <TD align=\"center\">##EMMSKIPPEDUK## / ##EMMSKIPPEDG## / ##EMMSKIPPEDS## / ##EMMSKIPPEDUQ##</TD>\n\ 718 718 <TD align=\"center\">##EMMBLOCKEDUK## / ##EMMBLOCKEDG## / ##EMMBLOCKEDS## / ##EMMBLOCKEDUQ##</TD>\n\ 719 <TD align=\"center\"><A HREF=\"readerconfig.html?label=##READERNAMEENC##\" TITLE=\"Edit this Reader\"><IMG HEIGHT=\"16\" WIDTH=\"16\" SRC=\" ##EDIICO##\" BORDER=\"0\" ALT=\"Edit Reader\"/></A></TD>\719 <TD align=\"center\"><A HREF=\"readerconfig.html?label=##READERNAMEENC##\" TITLE=\"Edit this Reader\"><IMG HEIGHT=\"16\" WIDTH=\"16\" SRC=\"image?i=ICEDI\" BORDER=\"0\" ALT=\"Edit Reader\"/></A></TD>\ 720 720 <TD align=\"center\">##ENTITLEMENT##</TD>\n\ 721 721 <TD align=\"center\">##READERREFRESH##</TD>\n\ 722 <TD align=\"center\"><A HREF=\"readerstats.html?label=##READERNAMEENC##&hide=4\" TITLE=\"Show loadbalancer statistics\"><IMG HEIGHT=\"16\" WIDTH=\"16\" SRC=\" ##STATICO##\" BORDER=\"0\" ALT=\"Loadbalancer statistics\"/></A></TD>\n\723 <TD align=\"center\"><A HREF=\"readers.html?label=##READERNAMEENC##&action=delete\" TITLE=\"Delete this Reader\"><IMG HEIGHT=\"16\" WIDTH=\"16\" SRC=\" ##DELICO##\" BORDER=\"0\" ALT=\"Delete Reader\"/></A></TD>\n\722 <TD align=\"center\"><A HREF=\"readerstats.html?label=##READERNAMEENC##&hide=4\" TITLE=\"Show loadbalancer statistics\"><IMG HEIGHT=\"16\" WIDTH=\"16\" SRC=\"image?i=ICSTA\" BORDER=\"0\" ALT=\"Loadbalancer statistics\"/></A></TD>\n\ 723 <TD align=\"center\"><A HREF=\"readers.html?label=##READERNAMEENC##&action=delete\" TITLE=\"Delete this Reader\"><IMG HEIGHT=\"16\" WIDTH=\"16\" SRC=\"image?i=ICDEL\" BORDER=\"0\" ALT=\"Delete Reader\"/></A></TD>\n\ 724 724 </TR>\n" 725 725 … … 1101 1101 <TR><TD>Http dyndns:</TD><TD><input name=\"httpdyndns\" type=\"text\" size=\"100\" maxlength=\"200\" value=\"##HTTPDYNDNS##\"></TD></TR>\n\ 1102 1102 <TR><TD>Http save full config:</TD><TD><SELECT NAME=\"httpsavefullcfg\"><OPTION VALUE=\"0\">NO</OPTION><OPTION VALUE=\"1\" ##HTTPSAVEFULLSELECT##>YES</OPTION></SELECT></TD></TR>\n\ 1103 <TR><TD>Http use JS Icons:</TD><TD><SELECT NAME=\"httpjsicons\"><OPTION VALUE=\"0\">NO</OPTION><OPTION VALUE=\"1\" ##HTTPJSICONS##>YES</OPTION></SELECT></TD></TR>\n\1104 1103 <TR><TD colspan=\"2\" align=\"right\"><input type=\"submit\" value=\"OK\" ##BTNDISABLED##>\n</TD></TR>\n\ 1105 1104 </TABLE>\n\ … … 1373 1372 <TD>##LABEL##</TD>\n\ 1374 1373 <TD width =\"250\" align=\"center\">##SIDLIST##</TD>\n\ 1375 <TD><A HREF=\"services_edit.html?service=##LABELENC##&action=edit\" TITLE=\"Edit this Service\"><IMG HEIGHT=\"16\" WIDTH=\"16\" ID=\"ICEDI\" SRC=\"##EDIICO##\" BORDER=\"0\" ALT=\"Edit Service\"/></A></TD>\n\1376 <TD><A HREF=\"services.html?service=##LABELENC##&action=delete\" TITLE=\"Delete this Service\"><IMG HEIGHT=\"16\" WIDTH=\"16\" ID=\"ICDEL\" SRC=\"##DELICO##\" BORDER=\"0\" ALT=\"Delete Service\"/></A></TD>\n\1374 <TD><A HREF=\"services_edit.html?service=##LABELENC##&action=edit\" TITLE=\"Edit this Service\"><IMG HEIGHT=\"16\" WIDTH=\"16\" SRC=\"image?i=ICEDI\" BORDER=\"0\" ALT=\"Edit Service\"/></A></TD>\n\ 1375 <TD><A HREF=\"services.html?service=##LABELENC##&action=delete\" TITLE=\"Delete this Service\"><IMG HEIGHT=\"16\" WIDTH=\"16\" SRC=\"image?i=ICDEL\" BORDER=\"0\" ALT=\"Delete Service\"/></A></TD>\n\ 1377 1376 </TR>\n" 1378 1377
Note:
See TracChangeset
for help on using the changeset viewer.