diff --git a/app/devices/app_config.php b/app/devices/app_config.php
index d8f6591886..3e9a9c836e 100644
--- a/app/devices/app_config.php
+++ b/app/devices/app_config.php
@@ -105,6 +105,15 @@
$y++;
$apps[$x]['permissions'][$y]['name'] = 'device_domain';
$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+ $apps[$x]['permissions'][$y]['groups'][] = 'admin';
+ $y++;
+ $apps[$x]['permissions'][$y]['name'] = 'device_username_password';
+ $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+ $apps[$x]['permissions'][$y]['groups'][] = 'admin';
+ $y++;
+ $apps[$x]['permissions'][$y]['name'] = 'device_alternate';
+ $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+ $apps[$x]['permissions'][$y]['groups'][] = 'admin';
$y++;
$apps[$x]['permissions'][$y]['name'] = "device_profile_view";
$apps[$x]['permissions'][$y]['groups'][] = "admin";
@@ -127,6 +136,11 @@
$y++;
$apps[$x]['permissions'][$y]['name'] = 'device_all';
$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+ $y++;
+ $apps[$x]['permissions'][$y]['name'] = 'device_enable';
+ $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+ $apps[$x]['permissions'][$y]['groups'][] = 'admin';
+ $y++;
//schema details
$y = 0; //table array index
diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index 3ff97b01d8..949411d2a0 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -590,131 +590,133 @@ require_once "resources/require.php";
echo "\n";
echo "\n";
- echo " ";
- echo " | ".$text['label-lines']." | ";
- echo " ";
- echo " \n";
+ if (strlen($text['description-lines']) > 0) {
+ echo "
".$text['description-lines']."\n";
+ }
+ echo " | ";
+ echo "
";
+ }
+
+ if (permission_exists('device_profile_edit')) {
//device profile
$sql = "select * from v_device_profiles ";
$sql .= "where (domain_uuid = '".$domain_uuid."' or domain_uuid is null) ";
@@ -764,85 +766,63 @@ require_once "resources/require.php";
echo " \n";
}
- $x = 0;
- foreach($device_keys as $row) {
- //set the column names
- if ($previous_device_key_vendor != $row['device_key_vendor']) {
+ if (permission_exists('device_profile_view')) {
+ $x = 0;
+ foreach($device_keys as $row) {
+ //set the column names
+ if ($previous_device_key_vendor != $row['device_key_vendor']) {
+ echo " \n";
+ echo " | ".$text['label-device_key_category']." | \n";
+ echo " ".$text['label-device_key_id']." | \n";
+ if ($vendor_count > 1 && strlen($row['device_key_vendor']) > 0) {
+ echo " ".ucwords($row['device_key_vendor'])." | \n";
+ } else {
+ echo " ".$text['label-device_key_type']." | \n";
+ }
+ echo " ".$text['label-device_key_line']." | \n";
+ echo " ".$text['label-device_key_value']." | \n";
+ echo " ".$text['label-device_key_extension']." | \n";
+ echo " ".$text['label-device_key_label']." | \n";
+ echo " | \n";
+ echo "
\n";
+ }
+ //determine whether to hide the element
+ if (strlen($device_key_uuid) == 0) {
+ $element['hidden'] = false;
+ $element['visibility'] = "visibility:visible;";
+ }
+ else {
+ $element['hidden'] = true;
+ $element['visibility'] = "visibility:hidden;";
+ }
+ //add the primary key uuid
+ if (strlen($row['device_key_uuid']) > 0) {
+ echo " \n";
+ }
+ //show all the rows in the array
echo " \n";
- echo " | ".$text['label-device_key_category']." | \n";
- echo " ".$text['label-device_key_id']." | \n";
- if ($vendor_count > 1 && strlen($row['device_key_vendor']) > 0) {
- echo " ".ucwords($row['device_key_vendor'])." | \n";
- } else {
- echo " ".$text['label-device_key_type']." | \n";
- }
- echo " ".$text['label-device_key_line']." | \n";
- echo " ".$text['label-device_key_value']." | \n";
- echo " ".$text['label-device_key_extension']." | \n";
- echo " ".$text['label-device_key_label']." | \n";
- echo " | \n";
- echo "
\n";
- }
- //determine whether to hide the element
- if (strlen($device_key_uuid) == 0) {
- $element['hidden'] = false;
- $element['visibility'] = "visibility:visible;";
- }
- else {
- $element['hidden'] = true;
- $element['visibility'] = "visibility:hidden;";
- }
- //add the primary key uuid
- if (strlen($row['device_key_uuid']) > 0) {
- echo " \n";
- }
- //show all the rows in the array
- echo " \n";
- echo "| \n";
- echo " |
\n";
- //set the previous vendor
- $previous_device_key_vendor = $row['device_key_vendor'];
- //increment the array key
- $x++;
+ echo " \n";
+ echo "\n";
+
+ echo "\n";
+ $selected = "selected='selected'";
+ echo " \n";
+ echo " | \n";
+
+ echo "\n";
+ //echo " \n";
+ if (strlen($row['device_key_vendor']) > 0) {
+ $device_key_vendor = $row['device_key_vendor'];
+ }
+ else {
+ $device_key_vendor = $device_vendor;
+ }
+ ?>
+
+
+
+
+
+ \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";
+ //echo " | \n";
+ echo " \n";
+ if (strlen($row['device_key_uuid']) > 0) {
+ if (permission_exists('device_key_delete')) {
+ echo " $v_link_label_delete\n";
+ }
+ }
+ echo " | \n";
+ echo " \n";
+ //set the previous vendor
+ $previous_device_key_vendor = $row['device_key_vendor'];
+ //increment the array key
+ $x++;
+ }
+ echo " \n";
+ if (strlen($text['description-keys']) > 0) {
+ echo "
".$text['description-keys']."\n";
+ }
+ echo " ";
+ echo " ";
}
- echo " \n";
- if (strlen($text['description-keys']) > 0) {
- echo "
".$text['description-keys']."\n";
- }
- echo " ";
- echo " ";
}
//device settings
- if (permission_exists('device_setting_add')) {
+ if (permission_exists('device_setting_edit')) {
echo " ";
echo " | ".$text['label-settings']." | ";
echo " ";
@@ -1153,42 +1157,46 @@ require_once "resources/require.php";
echo " |
\n";
}
- echo "\n";
- echo "| \n";
- echo " ".$text['label-device']."\n";
- echo " | \n";
- echo "\n";
- echo " \n";
- echo " \n";
- echo " \n";
- echo "
\n";
- echo $text['description-device']."\n";
- echo " | \n";
- echo "
\n";
+ if (permission_exists('device_username_password')) {
+ echo "\n";
+ echo "| \n";
+ echo " ".$text['label-device']."\n";
+ echo " | \n";
+ echo "\n";
+ echo " \n";
+ echo " \n";
+ echo " \n";
+ echo "
\n";
+ echo $text['description-device']."\n";
+ echo " | \n";
+ echo "
\n";
+ }
- echo "\n";
- echo "| \n";
- echo " ".$text['label-device_uuid_alternate']."\n";
- echo " | \n";
- echo "\n";
- if (strlen($device_uuid_alternate) == 0) {
- echo " ";
+ if (permission_exists('device_alternate')) {
+ echo " |
\n";
+ echo "| \n";
+ echo " ".$text['label-device_uuid_alternate']."\n";
+ echo " | \n";
+ echo "\n";
+ if (strlen($device_uuid_alternate) == 0) {
+ echo " ";
+ }
+ else {
+ $label = $device_alternate[0]['device_label'];
+ if (strlen($label) == 0) { $label = $device_alternate[0]['device_description']; }
+ if (strlen($label) == 0) { $label = $device_alternate[0]['device_mac_address']; }
+ echo " \n";
+ unset($label);
+ }
+ echo $text['description-device_uuid_alternate']."\n";
+ echo " | \n";
+ echo "
\n";
}
- else {
- $label = $device_alternate[0]['device_label'];
- if (strlen($label) == 0) { $label = $device_alternate[0]['device_description']; }
- if (strlen($label) == 0) { $label = $device_alternate[0]['device_mac_address']; }
- echo " \n";
- unset($label);
- }
- echo $text['description-device_uuid_alternate']."\n";
- echo "\n";
- echo "\n";
echo "\n";
echo "| \n";
@@ -1253,29 +1261,31 @@ require_once "resources/require.php";
echo " \n";
}
- echo " |
\n";
- echo "| \n";
- echo " ".$text['label-device_provision_enable']."\n";
- echo " | \n";
- echo "\n";
- echo " \n";
- echo "
\n";
- echo $text['description-device_provision_enable']."\n";
- echo " | \n";
- echo "
\n";
echo "\n";
echo "| \n";
|