From 74b3ce154c76b3f700b464ba96af02abae0e349d Mon Sep 17 00:00:00 2001 From: markjcrane Date: Mon, 15 May 2023 23:17:37 -0600 Subject: [PATCH] Update file.php minor code improvements --- resources/classes/file.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/resources/classes/file.php b/resources/classes/file.php index 108305cb7b..e4cb3f4446 100644 --- a/resources/classes/file.php +++ b/resources/classes/file.php @@ -26,6 +26,7 @@ class file { * @var boolean $recursive get the sub directories */ public function glob($dir, $recursive) { + $files = []; if ($dir != '' || $dir != '/') { $tree = glob(rtrim($dir, '/') . '/*'); if ($recursive) { @@ -56,6 +57,9 @@ class file { * Get the sounds list of search as a relative path without the rate */ public function sounds($language = 'en', $dialect = 'us', $voice = 'callie') { + //define an empty array + $array = []; + //set default values if (!isset($language)) { $language = 'en'; } if (!isset($dialect)) { $dialect = 'us'; } @@ -65,12 +69,14 @@ class file { $dir = $_SESSION['switch']['sounds']['dir'].'/'.$language.'/'.$dialect.'/'.$voice; $rate = '8000'; $files = $this->glob($dir.'/*/'.$rate, true); - + //loop through the languages - foreach($files as $file) { - $file = substr($file, strlen($dir)+1); - $file = str_replace("/".$rate, "", $file); - $array[] = $file; + if (!empty($files)) { + foreach($files as $file) { + $file = substr($file, strlen($dir)+1); + $file = str_replace("/".$rate, "", $file); + $array[] = $file; + } } //return the list of sounds