if (ident_actuators) {
FCGI_JSONKey("actuators");
FCGI_JSONValue("{\n\t\t");
- for (i = 0; i < NUMACTUATORS; i++) {
+ for (i = 0; i < g_num_actuators; i++) {
if (i > 0) {
FCGI_JSONValue(",\n\t\t");
}
- FCGI_JSONValue("\"%d\" : \"%s\"", i, g_actuator_names[i]);
+ FCGI_JSONValue("\"%d\" : \"%s\"", i, Actuator_GetName(i));
}
FCGI_JSONValue("\n\t}");
}
if (module_handler)
{
- if (module_handler != Login_Handler && module_handler != IdentifyHandler)
+ //if (module_handler != Login_Handler && module_handler != IdentifyHandler)
+ if (false) // Testing
{
- if (cookie[0] == '\0')
- {
- FCGI_RejectJSONEx(&context, STATUS_UNAUTHORIZED, "Please login.");
- continue;
- }
-
if (!FCGI_HasControl(&context, cookie))
{
- FCGI_RejectJSON(&context, "Invalid control key.");
+ FCGI_RejectJSON(&context, "Please login. Invalid control key.");
continue;
}
{
FCGI_RejectJSON(&context, "Unhandled module");
}
-
-
-
}
Log(LOGDEBUG, "Thread exiting.");