Netsyms/PCInfo
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Generate random machine ID if not specified when creating machine

Browse Source
This commit is contained in:
Skylar Ittner 2018-07-15 19:06:02 -06:00
parent 11b29980a1
commit 9692076e13
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/index.php
View File

@ -120,7 +120,7 @@ switch ($VARS['action']) {
case "addmachine": case "addmachine":
dieWithoutRole(Roles::ROLE_ADDEDIT); dieWithoutRole(Roles::ROLE_ADDEDIT);
if (empty($VARS['id'])) { if (empty($VARS['id'])) {
sendError("nomachineid"); $VARS['id'] = Machine::generateId();
} }
if ($database->has('machines', ['machineid' => $VARS['id']])) { if ($database->has('machines', ['machineid' => $VARS['id']])) {
sendError("", "A machine with that ID already exists."); sendError("", "A machine with that ID already exists.");
@ -157,7 +157,7 @@ switch ($VARS['action']) {
if ($database->error()[1] != 0) { if ($database->error()[1] != 0) {
sendError("dberror", $database->error()[2]); sendError("dberror", $database->error()[2]);
} }
exit(json_encode(["status" => "OK"])); exit(json_encode(["status" => "OK", "id" => $data['machineid']]));
break; break;
case "addhistory": case "addhistory":
dieWithoutRole([Roles::ROLE_ADDEDIT, Roles::ROLE_ADDHIST]); dieWithoutRole([Roles::ROLE_ADDEDIT, Roles::ROLE_ADDHIST]);

16
machine.php
View File

@ -118,4 +118,20 @@ class Machine {
$database->insert('components', ['serial' => $serial, 'typeid' => $type, 'tested' => $tested, 'notes' => $notes, 'capacity' => $capacity, 'model' => $model, 'machineid' => $this->machineid]); $database->insert('components', ['serial' => $serial, 'typeid' => $type, 'tested' => $tested, 'notes' => $notes, 'capacity' => $capacity, 'model' => $model, 'machineid' => $this->machineid]);
} }
/**
* Generate a random machine ID number that is not in use.
* @global $database
* @param int $min Optional minimum number.
* @param int $max Optional maximum number.
* @return int
*/
public static function generateId(int $min = 1000000000, int $max = 9999999999): int {
global $database;
$id = random_int(1000000000, 9999999999);
while ($database->has('machines', ['machineid' => $id])) {
$id = random_int(1000000000, 9999999999);
}
return $id;
}
} }