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

Merge pull request #1200 from badcrc/master

Browse Source 
Changed readdir to scandir so we can get sorted template names
This commit is contained in:
FusionPBX
2015-10-16 15:16:38 -07:00
parent 25ed768eb5 2d5bce9481
commit fcdd9d4338
2 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/devices/device_edit.php
+21 -18
View File
@@ -555,32 +555,35 @@ require_once "resources/require.php";
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 ($dh = opendir($template_dir)) { if (is_dir($template_dir)) {
while($dir = readdir($dh)) { $templates = scandir($template_dir);
if($file != "." && $dir != ".." && $dir[0] != '.') { foreach($templates as $dir) {
if(is_dir($template_dir . "/" . $dir)) { if($file != "." && $dir != ".." && $dir[0] != '.') {
echo "<optgroup label='$dir'>"; if(is_dir($template_dir . "/" . $dir)) {
if($dh_sub = opendir($template_dir.'/'.$dir)) { echo "<optgroup label='$dir'>";
while($dir_sub = readdir($dh_sub)) { $dh_sub=$template_dir . "/" . $dir;
if($file_sub != '.' && $dir_sub != '..' && $dir_sub[0] != '.') { if(is_dir($dh_sub)) {
if(is_dir($template_dir . '/' . $dir .'/'. $dir_sub)) { $templates_sub = scandir($dh_sub);
if ($device_template == $dir."/".$dir_sub) { foreach($templates_sub as $dir_sub) {
echo "<option value='".$dir."/".$dir_sub."' selected='selected'>".$dir."/".$dir_sub."</option>\n"; if($file_sub != '.' && $dir_sub != '..' && $dir_sub[0] != '.') {
} if(is_dir($template_dir . '/' . $dir .'/'. $dir_sub)) {
else { if ($device_template == $dir."/".$dir_sub) {
echo "<option value='".$dir."/".$dir_sub."'>".$dir."/".$dir_sub."</option>\n"; echo "<option value='".$dir."/".$dir_sub."' selected='selected'>".$dir."/".$dir_sub."</option>\n";
}
else {
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 "</select>\n";
echo "<br />\n"; echo "<br />\n";
echo $text['description-device_template']."\n"; echo $text['description-device_template']."\n";
app/extensions/extension_edit.php
+7 -4
View File
@@ -1258,13 +1258,16 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$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($dh = opendir($template_dir)) { if (is_dir($template_dir)) {
while($dir = readdir($dh)) { $templates = scandir($template_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'>";
if($dh_sub = opendir($template_dir.'/'.$dir)) { $dh_sub=$template_dir . "/" . $dir;
while($dir_sub = readdir($dh_sub)) { if(is_dir($dh_sub)) {
$templates_sub = scandir($dh_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) {