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

Update recur_sounds_dir to return an array rather than using a global variable.

Browse Source
This commit is contained in:
markjcrane
2016-08-04 09:49:57 -06:00
parent 5a8fd35e48
commit f5959516ed
8 changed files with 35 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/ivr_menus/ivr_menu_edit.php
+12 -16
View File
@@ -479,11 +479,10 @@
}
//sounds
/*
$dir_path = $_SESSION['switch']['sounds']['dir'];
recur_sounds_dir($_SESSION['switch']['sounds']['dir']);
if (count($dir_array) > 0) {
$files = recur_sounds_dir($_SESSION['switch']['sounds']['dir']);
if (count($files) > 0) {
echo "<optgroup label='Sounds'>\n";
foreach ($dir_array as $key => $value) {
foreach ($files as $key => $value) {
if (strlen($value) > 0) {
if (substr($ivr_menu_greet_long, 0, 71) == "\$\${sounds_dir}/\${default_language}/\${default_dialect}/\${default_voice}/") {
$ivr_menu_greet_long = substr($ivr_menu_greet_long, 71);
@@ -576,11 +575,10 @@
//sounds
/*
$dir_path = $_SESSION['switch']['sounds']['dir'];
recur_sounds_dir($_SESSION['switch']['sounds']['dir']);
if (count($dir_array) > 0) {
$files = recur_sounds_dir($_SESSION['switch']['sounds']['dir']);
if (count($files) > 0) {
echo "<optgroup label='Sounds'>\n";
foreach ($dir_array as $key => $value) {
foreach ($files as $key => $value) {
if (strlen($value) > 0) {
if (substr($ivr_menu_greet_short, 0, 71) == "\$\${sounds_dir}/\${default_language}/\${default_dialect}/\${default_voice}/") {
$ivr_menu_greet_short = substr($ivr_menu_greet_short, 71);
@@ -879,11 +877,10 @@
echo "</optgroup>\n";
}
//sounds
$dir_path = $_SESSION['switch']['sounds']['dir'];
recur_sounds_dir($_SESSION['switch']['sounds']['dir']);
if (count($dir_array) > 0) {
$files = recur_sounds_dir($_SESSION['switch']['sounds']['dir']);
if (count($files) > 0) {
echo "<optgroup label='Sounds'>\n";
foreach ($dir_array as $key => $value) {
foreach ($files as $key => $value) {
if (strlen($value) > 0) {
if (substr($ivr_menu_invalid_sound, 0, 71) == "\$\${sounds_dir}/\${default_language}/\${default_dialect}/\${default_voice}/") {
$ivr_menu_invalid_sound = substr($ivr_menu_invalid_sound, 71);
@@ -975,11 +972,10 @@
echo "</optgroup>\n";
}
//sounds
$dir_path = $_SESSION['switch']['sounds']['dir'];
recur_sounds_dir($_SESSION['switch']['sounds']['dir']);
if (count($dir_array) > 0) {
$files = recur_sounds_dir($_SESSION['switch']['sounds']['dir']);
if (count($files) > 0) {
echo "<optgroup label='Sounds'>\n";
foreach ($dir_array as $key => $value) {
foreach ($files as $key => $value) {
if (strlen($value) > 0) {
if (substr($ivr_menu_exit_sound, 0, 71) == "\$\${sounds_dir}/\${default_language}/\${default_dialect}/\${default_voice}/") {
$ivr_menu_exit_sound = substr($ivr_menu_exit_sound, 71);