From c47908f4e40f974ee4c8792ead6f5aa3d28c0069 Mon Sep 17 00:00:00 2001
From: Matthew Vale <github@mafoo.org>
Date: Mon, 2 Nov 2015 17:22:13 +0000
Subject: [PATCH] corrected references to voicemail_dir

changed from $_SESSION['switch']['storage']['dir'].'/voicemail/' to correctly use $_SESSION['switch']['voicemail']['dir']
added missing storage_type to app_defaults.php
---
 app/voicemails/app_defaults.php                | 7 +++++++
 app/voicemails/resources/classes/voicemail.php | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/voicemails/app_defaults.php b/app/voicemails/app_defaults.php
index d81acb5140..0fab2304d7 100644
--- a/app/voicemails/app_defaults.php
+++ b/app/voicemails/app_defaults.php
@@ -48,6 +48,13 @@ if ($domains_processed == 1) {
 		$array[$x]['default_setting_enabled'] = 'true';
 		$array[$x]['default_setting_description'] = 'Define whether to keep voicemail files on the local system after sending attached via email.';
 		$x++;
+		$array[$x]['default_setting_category'] = 'voicemail';
+		$array[$x]['default_setting_subcategory'] = 'storage_type';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = 'base64';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Define which storage type (base_64 stores in the database).';
+		$x++;
 
 	//iterate and add each, if necessary
 		foreach ($array as $index => $default_settings) {
diff --git a/app/voicemails/resources/classes/voicemail.php b/app/voicemails/resources/classes/voicemail.php
index ca5b55ba00..27f7e304af 100644
--- a/app/voicemails/resources/classes/voicemail.php
+++ b/app/voicemails/resources/classes/voicemail.php
@@ -161,7 +161,7 @@
 			if ($result_count > 0) {
 				foreach($result as &$row) {
 					//set the greeting directory
-					$path = $_SESSION['switch']['storage']['dir'].'/voicemail/default/'.$_SESSION['domain_name'].'/'.$row['voicemail_id'];
+					$path = $_SESSION['switch']['voicemail']['dir'].'/default/'.$_SESSION['domain_name'].'/'.$row['voicemail_id'];
 					if (file_exists($path.'/msg_'.$row['voicemail_message_uuid'].'.wav')) {
 						$row['file_path'] = $path.'/msg_'.$row['voicemail_message_uuid'].'.wav';
 					}
@@ -239,7 +239,7 @@
 				}
 
 			//delete the recording
-				$file_path = $_SESSION['switch']['storage']['dir']."/voicemail/default/".$_SESSION['domain_name']."/".$this->voicemail_id;
+				$file_path = $_SESSION['switch']['voicemail']['dir']."/default/".$_SESSION['domain_name']."/".$this->voicemail_id;
 				foreach (glob($file_path."/msg_".$this->voicemail_message_uuid.".*") as $file_name) {
 					unlink($file_name);
 				}
@@ -278,7 +278,7 @@
 				session_cache_limiter('public');
 
 			//set source folder path
-				$path = $_SESSION['switch']['storage']['dir'].'/voicemail/default/'.$_SESSION['domain_name'].'/'.$this->voicemail_id;
+				$path = $_SESSION['switch']['voicemail']['dir'].'/default/'.$_SESSION['domain_name'].'/'.$this->voicemail_id;
 
 			//prepare base64 content from db, if enabled
 				if ($_SESSION['voicemail']['storage_type']['text'] == 'base64') {