Changeset 1258
- Timestamp:
- 01/16/10 23:37:58 (14 years ago)
- Location:
- branches/monitor-improvement
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/monitor-improvement/oscam-http-helpers.c
r1256 r1258 388 388 fprintf(f, "Expires: Sat, 26 Jul 1997 05:00:00 GMT\r\n"); 389 389 fprintf(f, "Last-Modified: %s\r\n", timebuf); 390 391 390 fprintf(f, "Connection: close\r\n"); 391 fprintf(f, "\r\n"); 392 392 } 393 393 -
branches/monitor-improvement/oscam-http.c
r1256 r1258 9 9 #include <dirent.h> 10 10 #include <sys/socket.h> 11 12 static int running = 1; 11 13 12 14 void refresh_oscam(enum refreshtypes refreshtype, struct in_addr in){ … … 1174 1176 } 1175 1177 1178 void send_oscam_shutdown(struct templatevars *vars, FILE *f){ 1179 tpl_printf(vars, 0, "REFRESHTIME", "%d", SHUTDOWNREFRESH); 1180 tpl_addVar(vars, 0, "REFRESH", tpl_getTpl(vars, "REFRESH")); 1181 tpl_printf(vars, 0, "SECONDS", "%d", SHUTDOWNREFRESH); 1182 fputs(tpl_getTpl(vars, "SHUTDOWN"), f); 1183 running = 0; 1184 } 1185 1176 1186 int process_request(FILE *f, struct in_addr in) { 1177 1187 char buf[4096]; … … 1198 1208 "/site.css", 1199 1209 "/services_edit.html", 1200 "/savetemplates.html"}; 1210 "/savetemplates.html", 1211 "/shutdown.html"}; 1201 1212 int pagescnt = sizeof(pages)/sizeof(char *); // Calculate the amount of items in array 1202 1213 … … 1305 1316 case 4: send_oscam_user_config(vars, f, ¶ms, in); break; 1306 1317 case 5: send_oscam_reader_config(vars, f, ¶ms, in); break; 1307 case 1318 case 6: send_oscam_services(vars, f, ¶ms, in); break; 1308 1319 case 7: send_oscam_user_config_edit(vars, f, ¶ms, in); break; 1309 1320 case 9: send_oscam_services_edit(vars, f, ¶ms, in); break; 1310 1321 case 10: send_oscam_savetpls(vars, f); break; 1322 case 11: send_oscam_shutdown(vars, f); break; 1311 1323 default: send_oscam_status(vars, f, ¶ms, in); break; 1312 1324 } … … 1358 1370 } 1359 1371 cs_log("HTTP Server listening on port %d", cfg->http_port); 1360 while ( 1)1372 while (running) 1361 1373 { 1362 1374 int s; … … 1375 1387 } 1376 1388 close(sock); 1377 } 1389 kill(client[0].pid, SIGQUIT); 1390 } -
branches/monitor-improvement/oscam-http.h
r1244 r1258 7 7 #define AUTHNONCEVALIDSECS 15 8 8 #define MAXGETPARAMS 100 9 #define SHUTDOWNREFRESH 30 9 10 10 11 #define CSS "\ … … 30 31 TABLE.menu{background-color:black; align:center; font-size: 10px;}\n\ 31 32 TABLE.menu TD{border:2px outset lightgrey; background-color:silver; font-color:black; font-family: Arial;}\n\ 33 TABLE.menu TD.shutdown{border:2px outset lightgrey; background-color:orange; font-color:black; font-family: Arial;}\n\ 32 34 TD.menu {border:2px outset lightgrey; background-color:silver; font-color:black; font-family: Arial; font-size:11px;}\n\ 33 35 TABLE.configmenu{background-color:black; align:center; font-size: 10px;}\n\ … … 55 57 56 58 #define TPLREFRESH "\ 57 <meta http-equiv=\"refresh\" content=\"##REFRESHTIME## \"; URL=/status.html\" />\n"59 <meta http-equiv=\"refresh\" content=\"##REFRESHTIME##; URL=/status.html\" />\n" 58 60 59 61 #define TPLMENU "\ … … 65 67 <TD CLASS=\"menu\"><A HREF=\"userconfig.html\">USERS</TD>\n\ 66 68 <TD CLASS=\"menu\"><A HREF=\"services.html\">SERVICES</TD>\n\ 69 <TD CLASS=\"shutdown\"><A HREF=\"shutdown.html\">SHUTDOWN</TD>\n\ 67 70 </TR>\n\ 68 71 </TABLE>" … … 855 858 ##TPLFOOTER##" 856 859 860 #define TPLSHUTDOWN "##TPLHEADER##\ 861 ##TPLMENU##\n\ 862 <br><b>Oscam Shutdown - Try Reconnect in ##SECONDS## Seconds</b><br>\n\ 863 ##TPLFOOTER##" 864 857 865 enum refreshtypes {REFR_ACCOUNTS, REFR_READERS, REFR_SERVER, REFR_ANTICASC, REFR_SERVICES}; 858 866 … … 902 910 "SERVICECONFIGLISTBIT", 903 911 "SERVICECONFIGSIDBIT", 904 "SERVICEEDIT" 912 "SERVICEEDIT", 913 "SHUTDOWN" 905 914 #ifdef HAVE_DVBAPI 906 915 ,"CONFIGDVBAPI" … … 966 975 TPLSERVICECONFIGLISTBIT, 967 976 TPLSERVICECONFIGSIDBIT, 968 TPLSERVICEEDIT 977 TPLSERVICEEDIT, 978 TPLSHUTDOWN 969 979 #ifdef HAVE_DVBAPI 970 980 ,TPLCONFIGDVBAPI
Note:
See TracChangeset
for help on using the changeset viewer.