opengnsys
/
opengnsys
1
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

#718: Mejoras en mensajes registrados por las funciones REST que atienden a mensajes del OGAgent. 

git-svn-id: https://opengnsys.es/svn/branches/version1.1@4979 a21b9725-9963-47de-94b9-378ad31fedc9
remotes/github/debian-pkg
ramon 2016-07-05 16:19:54 +00:00
parent 210ee85d68
commit 4e12ae632e
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
admin/WebConsole/rest/ogagent.php
View File

@ -24,7 +24,7 @@ $app->post('/ogagent/started',
//...
} else {
// Insecure agent exception.
throw new Exception("Insecure agent: ip=$ip, mac=$mac");
throw new Exception("Insecure OGAgent started: ip=$ip, mac=$mac");
}
// May check that client is included in the server database?
// Default processing: log activity.
@ -35,7 +35,7 @@ $app->post('/ogagent/started',
} catch (Exception $e) {
// Comunication error.
$response["message"] = $e->getMessage();
file_put_contents(LOG_FILE, date(DATE_RSS).": ERROR: ".$response["message"]."\n", FILE_APPEND);
file_put_contents(LOG_FILE, date(DATE_RSS).": ".__FUNCTION__.": ERROR: ".$response["message"]."\n", FILE_APPEND);
jsonResponse(400, $response);
}
}
@ -58,7 +58,7 @@ $app->post('/ogagent/stopped',
} catch (Exception $e) {
// Comunication error.
$response["message"] = $e->getMessage();
file_put_contents(LOG_FILE, date(DATE_RSS).": ERROR: ".$response["message"]."\n", FILE_APPEND);
file_put_contents(LOG_FILE, date(DATE_RSS).": ".__FUNCTION__.": ERROR: ".$response["message"]."\n", FILE_APPEND);
jsonResponse(400, $response);
}
}
@ -74,7 +74,8 @@ $app->post('/ogagent/loggedin',
$ip = htmlspecialchars($input->ip);
$user = htmlspecialchars($input->user);
if (isset($input->ostype)) $osType = htmlspecialchars($input->ostype);
if (isset($input->osversion)) $osVersion = str_replace(",", "", htmlspecialchars($input->osVersion));
//if (isset($input->osversion)) $osVersion = htmlspecialchars(implode(",", $input->osversion));
if (isset($input->osversion)) $osVersion = str_replace(",", ";", htmlspecialchars($input->osversion));
// May check that client is included in the server database?
// Default processing: log activity.
file_put_contents(LOG_FILE, date(DATE_RSS).": User logged in: ip=$ip, user=$user, os=$osType:$osVersion.\n", FILE_APPEND);
@ -84,7 +85,7 @@ $app->post('/ogagent/loggedin',
} catch (Exception $e) {
// Comunication error.
$response["message"] = $e->getMessage();
file_put_contents(LOG_FILE, date(DATE_RSS).": ERROR: ".$response["message"]."\n", FILE_APPEND);
file_put_contents(LOG_FILE, date(DATE_RSS).": ".__FUNCTION__.": ERROR: ".$response["message"]."\n", FILE_APPEND);
jsonResponse(400, $response);
}
}
@ -100,17 +101,17 @@ $app->post('/ogagent/loggedout',
$ip = htmlspecialchars($input->ip);
$user = htmlspecialchars($input->user);
if (isset($input->ostype)) $osType = htmlspecialchars($input->ostype);
if (isset($input->osversion)) $osVersion = str_replace(",", "", htmlspecialchars($input->osVersion));
if (isset($input->osversion)) $osVersion = str_replace(",", ";", htmlspecialchars($input->osversion));
// May check that client is included in the server database?
// Default processing: log activity.
file_put_contents(LOG_FILE, date(DATE_RSS).": User logged in: ip=$ip, user=$user, os=$osType:$osVersion.\n", FILE_APPEND);
file_put_contents(LOG_FILE, date(DATE_RSS).": User logged out: ip=$ip, user=$user, os=$osType:$osVersion.\n", FILE_APPEND);
// Response.
$response = "";
jsonResponse(200, $response);
} catch (Exception $e) {
// Comunication error.
$response["message"] = $e->getMessage();
file_put_contents(LOG_FILE, date(DATE_RSS).": ERROR: ".$response["message"]."\n", FILE_APPEND);
file_put_contents(LOG_FILE, date(DATE_RSS).": ".__FUNCTION__.": ERROR: ".$response["message"]."\n", FILE_APPEND);
jsonResponse(400, $response);
}
}