diff --git a/app/devices/device_profile_edit.php b/app/devices/device_profile_edit.php
index 2d20259db2..fbed88240d 100644
--- a/app/devices/device_profile_edit.php
+++ b/app/devices/device_profile_edit.php
@@ -245,6 +245,35 @@
$device_profile_settings[$x]['profile_setting_enabled'] = '';
$device_profile_settings[$x]['profile_setting_description'] = '';
+//get the vendors
+ $sql = "select * ";
+ $sql .= "from v_device_vendors as v ";
+ $sql .= "where enabled = 'true' ";
+ $sql .= "order by name asc ";
+ $database = new database;
+ $vendors = $database->select($sql, null, 'all');
+ unset($sql);
+
+//get the vendor functions
+ $sql = "select v.name as vendor_name, f.name, f.value ";
+ $sql .= "from v_device_vendors as v, v_device_vendor_functions as f ";
+ $sql .= "where v.device_vendor_uuid = f.device_vendor_uuid ";
+ $sql .= "and v.enabled = 'true' ";
+ $sql .= "and f.enabled = 'true' ";
+ $sql .= "order by v.name asc, f.name asc ";
+ $database = new database;
+ $vendor_functions = $database->select($sql, null, 'all');
+ unset($sql);
+
+//get the vendor count
+ $vendor_count = 0;
+ foreach($device_keys as $row) {
+ if ($previous_vendor != $row['device_key_vendor']) {
+ $previous_vendor = $row['device_key_vendor'];
+ $vendor_count++;
+ }
+ }
+
//show the header
require_once "resources/header.php";
@@ -296,7 +325,7 @@
echo "
".$text['label-device_key_icon']." | \n";
echo " | \n";
echo " \n";
-//view_array($device_profile_keys);
+
$x = 0;
foreach($device_profile_keys as $row) {
echo " \n";
@@ -370,2146 +399,62 @@
echo " | \n";
echo " \n";
echo " | \n";
echo " \n";
- echo " \n";
+ echo " \n";
+
echo " | \n";
echo " \n";
- echo " \n";
+ //echo " \n";
+
+ echo " \n";
+
echo " | \n";
echo " \n";
echo " \n";
echo " | \n";