dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add new device permissions for mac address, template, label, vendor, model, firmware, and description.

This commit is contained in:
markjcrane 2015-11-05 11:56:50 -07:00
parent 2ffd50dc81
commit 242ad7bc16
2 changed files with 118 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/devices/app_config.php
View File

@ -39,6 +39,18 @@
$apps[$x]['permissions'][$y]['groups'][] = "admin"; $apps[$x]['permissions'][$y]['groups'][] = "admin";
$apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin";
$y++; $y++;
$apps[$x]['permissions'][$y]['name'] = 'device_mac_address';
$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
$apps[$x]['permissions'][$y]['groups'][] = 'admin';
$y++;
$apps[$x]['permissions'][$y]['name'] = 'device_label';
$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
$apps[$x]['permissions'][$y]['groups'][] = 'admin';
$y++;
$apps[$x]['permissions'][$y]['name'] = 'device_template';
$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
$apps[$x]['permissions'][$y]['groups'][] = 'admin';
$y++;
$apps[$x]['permissions'][$y]['name'] = "device_extension_view"; $apps[$x]['permissions'][$y]['name'] = "device_extension_view";
$apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin";
$apps[$x]['permissions'][$y]['groups'][] = "admin"; $apps[$x]['permissions'][$y]['groups'][] = "admin";
@ -137,10 +149,24 @@
$apps[$x]['permissions'][$y]['name'] = 'device_all'; $apps[$x]['permissions'][$y]['name'] = 'device_all';
$apps[$x]['permissions'][$y]['groups'][] = 'superadmin'; $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
$y++; $y++;
$apps[$x]['permissions'][$y]['name'] = 'device_vendor';
$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
$apps[$x]['permissions'][$y]['groups'][] = 'admin';
$y++;
$apps[$x]['permissions'][$y]['name'] = 'device_model';
$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
$y++;
$apps[$x]['permissions'][$y]['name'] = 'device_firmware';
$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
$y++;
$apps[$x]['permissions'][$y]['name'] = 'device_enable'; $apps[$x]['permissions'][$y]['name'] = 'device_enable';
$apps[$x]['permissions'][$y]['groups'][] = 'superadmin'; $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
$apps[$x]['permissions'][$y]['groups'][] = 'admin'; $apps[$x]['permissions'][$y]['groups'][] = 'admin';
$y++; $y++;
$apps[$x]['permissions'][$y]['name'] = 'device_description';
$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
$apps[$x]['permissions'][$y]['groups'][] = 'admin';
$y++;
//schema details //schema details
$y = 0; //table array index $y = 0; //table array index

160
app/devices/device_edit.php
View File

@ -526,69 +526,82 @@ require_once "resources/require.php";
echo " ".$text['label-device_mac_address']."\n"; echo " ".$text['label-device_mac_address']."\n";
echo "</td>\n"; echo "</td>\n";
echo "<td class='vtable' align='left'>\n"; echo "<td class='vtable' align='left'>\n";
echo " <input class='formfld' type='text' name='device_mac_address' id='device_mac_address' maxlength='255' value=\"$device_mac_address\">\n"; if (permission_exists('device_mac_address')) {
echo " <input class='formfld' type='text' name='device_mac_address' id='device_mac_address' maxlength='255' value=\"$device_mac_address\">\n";
}
else {
echo $device_mac_address;
}
echo " <div style='display: none;' id='duplicate_mac_response'></div>\n"; echo " <div style='display: none;' id='duplicate_mac_response'></div>\n";
echo "<br />\n"; echo "<br />\n";
echo $text['description-device_mac_address']."\n"; echo $text['description-device_mac_address']."\n";
echo "</td>\n"; echo "</td>\n";
echo "</tr>\n"; echo "</tr>\n";
echo "<tr>\n"; echo "<tr>\n";
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n"; echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo " ".$text['label-device_label']."\n"; echo " ".$text['label-device_label']."\n";
echo "</td>\n"; echo "</td>\n";
echo "<td class='vtable' align='left'>\n"; echo "<td class='vtable' align='left'>\n";
echo " <input class='formfld' type='text' name='device_label' maxlength='255' value=\"$device_label\">\n"; if (permission_exists('device_label')) {
echo " <input class='formfld' type='text' name='device_label' maxlength='255' value=\"$device_label\">\n";
}
else {
echo $device_label;
}
echo "<br />\n"; echo "<br />\n";
echo $text['description-device_label']."\n"; echo $text['description-device_label']."\n";
echo "</td>\n"; echo "</td>\n";
echo "</tr>\n"; echo "</tr>\n";
echo "<tr>\n"; if (permission_exists('device_template')) {
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n"; echo "<tr>\n";
echo " ".$text['label-device_template']."\n"; echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo "</td>\n"; echo " ".$text['label-device_template']."\n";
echo "<td class='vtable' align='left'>\n"; echo "</td>\n";
$device = new device; echo "<td class='vtable' align='left'>\n";
$template_dir = $device->get_template_dir(); $device = new device;
$template_dir = $device->get_template_dir();
echo "<select id='device_template' name='device_template' class='formfld'>\n"; echo "<select id='device_template' name='device_template' class='formfld'>\n";
echo "<option value=''></option>\n"; echo "<option value=''></option>\n";
if (is_dir($template_dir)) { if (is_dir($template_dir)) {
$templates = scandir($template_dir); $templates = scandir($template_dir);
foreach($templates as $dir) { foreach($templates as $dir) {
if($file != "." && $dir != ".." && $dir[0] != '.') { if($file != "." && $dir != ".." && $dir[0] != '.') {
if(is_dir($template_dir . "/" . $dir)) { if(is_dir($template_dir . "/" . $dir)) {
echo "<optgroup label='$dir'>"; echo "<optgroup label='$dir'>";
$dh_sub=$template_dir . "/" . $dir; $dh_sub=$template_dir . "/" . $dir;
if(is_dir($dh_sub)) { if(is_dir($dh_sub)) {
$templates_sub = scandir($dh_sub); $templates_sub = scandir($dh_sub);
foreach($templates_sub as $dir_sub) { foreach($templates_sub as $dir_sub) {
if($file_sub != '.' && $dir_sub != '..' && $dir_sub[0] != '.') { if($file_sub != '.' && $dir_sub != '..' && $dir_sub[0] != '.') {
if(is_dir($template_dir . '/' . $dir .'/'. $dir_sub)) { if(is_dir($template_dir . '/' . $dir .'/'. $dir_sub)) {
if ($device_template == $dir."/".$dir_sub) { if ($device_template == $dir."/".$dir_sub) {
echo "<option value='".$dir."/".$dir_sub."' selected='selected'>".$dir."/".$dir_sub."</option>\n"; echo "<option value='".$dir."/".$dir_sub."' selected='selected'>".$dir."/".$dir_sub."</option>\n";
} }
else { else {
echo "<option value='".$dir."/".$dir_sub."'>".$dir."/".$dir_sub."</option>\n"; echo "<option value='".$dir."/".$dir_sub."'>".$dir."/".$dir_sub."</option>\n";
}
} }
} }
} }
closedir($dh_sub);
} }
closedir($dh_sub); echo "</optgroup>";
} }
echo "</optgroup>";
} }
} }
closedir($dh);
} }
closedir($dh); echo "</select>\n";
} echo "<br />\n";
echo "</select>\n"; echo $text['description-device_template']."\n";
echo "<br />\n"; echo "</td>\n";
echo $text['description-device_template']."\n"; echo "</tr>\n";
echo "</td>\n"; }
echo "</tr>\n";
if (permission_exists('device_line_view')) { if (permission_exists('device_line_view')) {
echo " <tr>"; echo " <tr>";
@ -1198,38 +1211,44 @@ require_once "resources/require.php";
echo "</tr>\n"; echo "</tr>\n";
} }
echo "<tr>\n"; if (permission_exists('device_vendor')) {
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n"; echo "<tr>\n";
echo " ".$text['label-device_vendor']."\n"; echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo "</td>\n"; echo " ".$text['label-device_vendor']."\n";
echo "<td class='vtable' align='left'>\n"; echo "</td>\n";
echo " <input class='formfld' type='text' name='device_vendor' maxlength='255' value=\"$device_vendor\">\n"; echo "<td class='vtable' align='left'>\n";
echo "<br />\n"; echo " <input class='formfld' type='text' name='device_vendor' maxlength='255' value=\"$device_vendor\">\n";
echo $text['description-device_vendor']."\n"; echo "<br />\n";
echo "</td>\n"; echo $text['description-device_vendor']."\n";
echo "</tr>\n"; echo "</td>\n";
echo "</tr>\n";
}
echo "<tr>\n"; if (permission_exists('device_model')) {
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n"; echo "<tr>\n";
echo " ".$text['label-device_model']."\n"; echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo "</td>\n"; echo " ".$text['label-device_model']."\n";
echo "<td class='vtable' align='left'>\n"; echo "</td>\n";
echo " <input class='formfld' type='text' name='device_model' maxlength='255' value=\"$device_model\">\n"; echo "<td class='vtable' align='left'>\n";
echo "<br />\n"; echo " <input class='formfld' type='text' name='device_model' maxlength='255' value=\"$device_model\">\n";
echo $text['description-device_model']."\n"; echo "<br />\n";
echo "</td>\n"; echo $text['description-device_model']."\n";
echo "</tr>\n"; echo "</td>\n";
echo "</tr>\n";
}
echo "<tr>\n"; if (permission_exists('device_firmware')) {
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n"; echo "<tr>\n";
echo " ".$text['label-device_firmware_version']."\n"; echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo "</td>\n"; echo " ".$text['label-device_firmware_version']."\n";
echo "<td class='vtable' align='left'>\n"; echo "</td>\n";
echo " <input class='formfld' type='text' name='device_firmware_version' maxlength='255' value=\"$device_firmware_version\">\n"; echo "<td class='vtable' align='left'>\n";
echo "<br />\n"; echo " <input class='formfld' type='text' name='device_firmware_version' maxlength='255' value=\"$device_firmware_version\">\n";
echo $text['description-device_firmware_version']."\n"; echo "<br />\n";
echo "</td>\n"; echo $text['description-device_firmware_version']."\n";
echo "</tr>\n"; echo "</td>\n";
echo "</tr>\n";
}
if (permission_exists('device_domain')) { if (permission_exists('device_domain')) {
echo "<tr>\n"; echo "<tr>\n";
@ -1292,7 +1311,12 @@ require_once "resources/require.php";
echo " ".$text['label-device_description']."\n"; echo " ".$text['label-device_description']."\n";
echo "</td>\n"; echo "</td>\n";
echo "<td class='vtable' align='left'>\n"; echo "<td class='vtable' align='left'>\n";
echo " <input class='formfld' type='text' name='device_description' maxlength='255' value=\"$device_description\">\n"; if (permission_exists('device_description')) {
echo " <input class='formfld' type='text' name='device_description' maxlength='255' value=\"$device_description\">\n";
}
else {
echo $device_description."\n";
}
echo "<br />\n"; echo "<br />\n";
echo $text['description-device_description']."\n"; echo $text['description-device_description']."\n";
echo "</td>\n"; echo "</td>\n";