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

Devices - Edit: Check exists template directory and templates array to mitigate warnings.

Browse Source
This commit is contained in:
Nate
2020-02-12 15:24:42 -07:00
parent ca01581d2c
commit e94cedcc6d
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/devices/device_edit.php
+5 -1
View File
@@ -778,10 +778,12 @@
$template_dir = $device->get_template_dir(); $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) && is_array($device_vendors)) { if (is_dir($template_dir) && @is_array($device_vendors)) {
foreach ($device_vendors as $row) { foreach ($device_vendors as $row) {
echo " <optgroup label='".escape($row["name"])."'>\n"; echo " <optgroup label='".escape($row["name"])."'>\n";
if (file_exists($template_dir.'/'.$row["name"])) {
$templates = scandir($template_dir.'/'.$row["name"]); $templates = scandir($template_dir.'/'.$row["name"]);
if (is_array($templates) && @sizeof($templates) != 0) {
foreach ($templates as $dir) { foreach ($templates as $dir) {
if ($file != "." && $dir != ".." && $dir[0] != '.') { if ($file != "." && $dir != ".." && $dir[0] != '.') {
if (is_dir($template_dir . '/' . $row["name"] .'/'. $dir)) { if (is_dir($template_dir . '/' . $row["name"] .'/'. $dir)) {
@@ -794,6 +796,8 @@
} }
} }
} }
}
}
echo " </optgroup>\n"; echo " </optgroup>\n";
} }
} }