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

This commit is contained in:
markjcrane
2016-08-04 09:49:57 -06:00
parent ec487d254a
commit 28c59d4eec
8 changed files with 35 additions and 45 deletions
+3 -5
View File
@@ -527,12 +527,10 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
}
//sounds
if ($load_sound) {
global $dir_path, $dir_array;
$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=".$text["sounds"].">\n";
foreach ($dir_array as $key => $value) {
foreach ($files as $key => $value) {
if (strlen($value) > 0) {
if (substr($var, 0, 71) == "\$\${sounds_dir}/\${default_language}/\${default_dialect}/\${default_voice}/") {
$var = substr($var, 71);