From ab302ebfbb044cbb6cfd2ba0a1f9dac68219d67f Mon Sep 17 00:00:00 2001 From: agree Date: Tue, 20 Apr 2021 16:31:39 -0400 Subject: [PATCH] Provision save and show user agent information --- app/devices/app_config.php | 5 +++++ app/devices/app_languages.php | 20 +++++++++++++++++++ app/devices/devices.php | 2 +- app/provision/resources/classes/provision.php | 3 ++- 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/app/devices/app_config.php b/app/devices/app_config.php index b75dda8590..a8cd2fe452 100644 --- a/app/devices/app_config.php +++ b/app/devices/app_config.php @@ -471,6 +471,11 @@ $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['search'] = 'true'; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; + $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "device_provisioned_agent"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['search'] = 'true'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; $y++; $apps[$x]['db'][$y]['table']['name'] = "v_device_lines"; diff --git a/app/devices/app_languages.php b/app/devices/app_languages.php index 1358639e2f..57cfd5362d 100644 --- a/app/devices/app_languages.php +++ b/app/devices/app_languages.php @@ -613,6 +613,26 @@ $text['label-status']['ru-ru'] = "Статус"; $text['label-status']['sv-se'] = "Status"; $text['label-status']['uk-ua'] = "Статус"; +$text['label-user_agent']['en-us'] = 'User Agent'; +$text['label-user_agent']['ar-eg'] = ''; +$text['label-user_agent']['de-at'] = ''; +$text['label-user_agent']['de-ch'] = ''; +$text['label-user_agent']['de-de'] = ''; +$text['label-user_agent']['es-cl'] = ''; +$text['label-user_agent']['es-mx'] = ''; +$text['label-user_agent']['fr-ca'] = ''; +$text['label-user_agent']['fr-fr'] = ''; +$text['label-user_agent']['he-il'] = ''; +$text['label-user_agent']['it-it'] = ''; +$text['label-user_agent']['nl-nl'] = ''; +$text['label-user_agent']['pl-pl'] = ''; +$text['label-user_agent']['pt-br'] = ''; +$text['label-user_agent']['pt-pt'] = ''; +$text['label-user_agent']['ro-ro'] = ''; +$text['label-user_agent']['ru-ru'] = ''; +$text['label-user_agent']['sv-se'] = ''; +$text['label-user_agent']['uk-ua'] = ''; + $text['label-speed_dial_active']['en-us'] = "Speed Dial Active"; $text['label-speed_dial_active']['en-gb'] = "Speed Dial Active"; $text['label-speed_dial_active']['ar-eg'] = ""; diff --git a/app/devices/devices.php b/app/devices/devices.php index 669585080e..f870b79b22 100644 --- a/app/devices/devices.php +++ b/app/devices/devices.php @@ -416,7 +416,7 @@ echo $text['label-'.$row['device_enabled']]; } echo " \n"; - echo " ".escape($row['device_provisioned_date'])." - ".escape($row['device_provisioned_method'])." - ".escape($row['device_provisioned_ip'])." \n"; + echo " ".escape($row['device_provisioned_date'])." - ".escape($row['device_provisioned_method'])." - ".escape($row['device_provisioned_ip'])." - ".$text['label-user_agent']." \n"; echo " ".escape($row['device_description'])." \n"; if (permission_exists('device_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') { echo " "; diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php index 43dfec1b31..d5b30affb0 100644 --- a/app/provision/resources/classes/provision.php +++ b/app/provision/resources/classes/provision.php @@ -341,13 +341,14 @@ include "root.php"; //register that we have seen the device $sql = "update v_devices "; - $sql .= "set device_provisioned_date = :device_provisioned_date, device_provisioned_method = :device_provisioned_method, device_provisioned_ip = :device_provisioned_ip "; + $sql .= "set device_provisioned_date = :device_provisioned_date, device_provisioned_method = :device_provisioned_method, device_provisioned_ip = :device_provisioned_ip, device_provisioned_agent = :device_provisioned_agent "; $sql .= "where domain_uuid = :domain_uuid and device_mac_address = :device_mac_address "; $parameters['domain_uuid'] = $domain_uuid; $parameters['device_mac_address'] = strtolower($mac); $parameters['device_provisioned_date'] = date("Y-m-d H:i:s"); $parameters['device_provisioned_method'] = (isset($_SERVER["HTTPS"]) ? 'https' : 'http'); $parameters['device_provisioned_ip'] = $_SERVER['REMOTE_ADDR']; + $parameters['device_provisioned_agent'] = $_SERVER['HTTP_USER_AGENT']; $database = new database; $database->execute($sql, $parameters); unset($parameters);