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

Fix voicemail greeting for base64 

- Use the settings class
- Re-use the database object
- Update the indentation
This commit is contained in:
FusionPBX 2024-09-23 18:17:44 -06:00 committed by GitHub
parent 0c9329b119
commit 50a1ed145c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 126 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
app/voicemail_greetings/app_defaults.php
View File

@ -17,7 +17,7 @@
The Initial Developer of the Original Code is The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2008-2012 Portions created by the Initial Developer are Copyright (C) 2008-2024
the Initial Developer. All Rights Reserved. the Initial Developer. All Rights Reserved.
Contributor(s): Contributor(s):
@ -25,12 +25,12 @@
*/ */
if ($domains_processed == 1) { if ($domains_processed == 1) {
//if greeting filename field empty, copy greeting name field value //if greeting filename field empty, copy greeting name field value
$sql = "update v_voicemail_greetings "; $sql = "update v_voicemail_greetings ";
$sql .= "set greeting_filename = greeting_name "; $sql .= "set greeting_filename = greeting_name ";
$sql .= "where greeting_filename is null "; $sql .= "where greeting_filename is null ";
$sql .= "or greeting_filename = '' "; $sql .= "or greeting_filename = '' ";
$database = new database;
$database->execute($sql); $database->execute($sql);
unset($sql); unset($sql);
@ -38,12 +38,13 @@ if ($domains_processed == 1) {
$sql = "select voicemail_greeting_uuid, greeting_filename "; $sql = "select voicemail_greeting_uuid, greeting_filename ";
$sql .= "from v_voicemail_greetings "; $sql .= "from v_voicemail_greetings ";
$sql .= "where greeting_id is null "; $sql .= "where greeting_id is null ";
$database = new database;
$result = $database->select($sql, null, 'all'); $result = $database->select($sql, null, 'all');
if (!empty($result)) { if (!empty($result)) {
foreach ($result as $x => $row) { foreach ($result as $x => $row) {
//get the values from the database
$voicemail_greeting_uuid = $row['voicemail_greeting_uuid']; $voicemail_greeting_uuid = $row['voicemail_greeting_uuid'];
$greeting_id = preg_replace('{\D}', '', $row['greeting_filename']); $greeting_id = preg_replace('{\D}', '', $row['greeting_filename']);
//build update array //build update array
$array['voicemail_greetings'][$x]['voicemail_greeting_uuid'] = $voicemail_greeting_uuid; $array['voicemail_greetings'][$x]['voicemail_greeting_uuid'] = $voicemail_greeting_uuid;
$array['voicemail_greetings'][$x]['greeting_id'] = $greeting_id; $array['voicemail_greetings'][$x]['greeting_id'] = $greeting_id;
@ -53,87 +54,97 @@ if ($domains_processed == 1) {
//grant temporary permissions //grant temporary permissions
$p = new permissions; $p = new permissions;
$p->add('voicemail_greeting_edit', 'temp'); $p->add('voicemail_greeting_edit', 'temp');
//execute update
$database = new database; //execute
$database->app_name = 'voicemail_greetings'; $database->app_name = 'voicemail_greetings';
$database->app_uuid = 'e4b4fbee-9e4d-8e46-3810-91ba663db0c2'; $database->app_uuid = 'e4b4fbee-9e4d-8e46-3810-91ba663db0c2';
$database->save($array, false); $database->save($array, false);
unset($array); unset($array);
//revoke temporary permissions //revoke temporary permissions
$p->delete('voicemail_greeting_edit', 'temp'); $p->delete('voicemail_greeting_edit', 'temp');
} }
} }
unset($sql, $result, $x, $row); unset($sql, $result, $row);
//get settings
$voicemail_storage_type = $setting->get('voicemail','storage_type');
$switch_storage = $setting->get('switch','storage');
//if base64, populate from existing greeting files, then remove //if base64, populate from existing greeting files, then remove
if (!empty($_SESSION['voicemail']['storage_type']['text']) && $_SESSION['voicemail']['storage_type']['text'] == 'base64') { if (!empty($voicemail_storage_type) && $voicemail_storage_type == 'base64') {
//get greetings without base64 in db //get greetings without base64 in db
$sql = "select voicemail_greeting_uuid, domain_uuid, voicemail_id, greeting_filename "; $sql = "select g.voicemail_greeting_uuid, g.domain_uuid, d.domain_name, g.voicemail_id, g.greeting_filename ";
$sql .= "from v_voicemail_greetings "; $sql .= "from v_voicemail_greetings as g, v_domains as d ";
$sql .= "where greeting_base64 is null "; $sql .= "where (greeting_base64 is null or greeting_base64 = '') ";
$sql .= "or greeting_base64 = '' "; $sql .= "and g.domain_uuid = d.domain_uuid ";
$database = new database;
$result = $database->select($sql, null, 'all'); $result = $database->select($sql, null, 'all');
if (!empty($result)) { if (!empty($result)) {
foreach ($result as $x => $row) { foreach ($result as $x => $row) {
//get the values from the database
$voicemail_greeting_uuid = $row['voicemail_greeting_uuid']; $voicemail_greeting_uuid = $row['voicemail_greeting_uuid'];
$greeting_domain_uuid = $row['domain_uuid']; $greeting_domain_uuid = $row['domain_uuid'];
$greeting_domain_name = $row['domain_name'];
$voicemail_id = $row['voicemail_id']; $voicemail_id = $row['voicemail_id'];
$greeting_filename = $row['greeting_filename']; $greeting_filename = $row['greeting_filename'];
//set greeting directory //set greeting directory
$greeting_directory = $_SESSION['switch']['storage']['dir'].'/voicemail/default/'.$_SESSION['domains'][$greeting_domain_uuid]['domain_name'].'/'.$voicemail_id; $greeting_directory = $switch_storage.'/voicemail/default/'.$greeting_domain_name.'/'.$voicemail_id;
//encode greeting file (if exists) //encode greeting file (if exists)
if (file_exists($greeting_directory.'/'.$greeting_filename)) { if (file_exists($greeting_directory.'/'.$greeting_filename)) {
//build update array //build update array
$array['voicemail_greetings'][$x]['voicemail_greeting_uuid'] = $voicemail_greeting_uuid; $array['voicemail_greetings'][$x]['voicemail_greeting_uuid'] = $voicemail_greeting_uuid;
$array['voicemail_greetings'][$x]['greeting_base64'] = base64_encode(file_get_contents($greeting_directory.'/'.$greeting_filename)); $array['voicemail_greetings'][$x]['greeting_base64'] = base64_encode(file_get_contents($greeting_directory.'/'.$greeting_filename));
//remove local greeting file //remove local greeting file
@unlink($greeting_directory.'/'.$greeting_filename); //@unlink($greeting_directory.'/'.$greeting_filename);
} }
} }
if (!empty($array)) { if (!empty($array)) {
//grant temporary permissions //grant temporary permissions
$p = new permissions; $p = new permissions;
$p->add('voicemail_greeting_edit', 'temp'); $p->add('voicemail_greeting_edit', 'temp');
//execute update //execute update
$database = new database;
$database->app_name = 'voicemail_greetings'; $database->app_name = 'voicemail_greetings';
$database->app_uuid = 'e4b4fbee-9e4d-8e46-3810-91ba663db0c2'; $database->app_uuid = 'e4b4fbee-9e4d-8e46-3810-91ba663db0c2';
$database->save($array, false); $database->save($array, false);
unset($array); unset($array);
//revoke temporary permissions //revoke temporary permissions
$p->delete('voicemail_greeting_edit', 'temp'); $p->delete('voicemail_greeting_edit', 'temp');
} }
} }
unset($sql, $result, $row); unset($sql, $result, $row);
} }
elseif (empty($voicemail_storage_type) || $voicemail_storage_type != 'base64') {
//if not base64, decode to local files, remove base64 data from db //if not base64 then save base64 to a file on the file system
else if (empty($_SESSION['voicemail']['storage_type']['text']) || $_SESSION['voicemail']['storage_type']['text'] != 'base64') { $sql = "select g.voicemail_greeting_uuid, g.domain_uuid, d.domain_name, g.voicemail_id, g.greeting_filename, g.greeting_base64 ";
//get greetings with base64 in db $sql .= "from v_voicemail_greetings as g, v_domains as d ";
$sql = "select voicemail_greeting_uuid, domain_uuid, voicemail_id, greeting_filename, greeting_base64 ";
$sql .= "from v_voicemail_greetings ";
$sql .= "where greeting_base64 is not null "; $sql .= "where greeting_base64 is not null ";
$database = new database; $sql .= "and g.domain_uuid = d.domain_uuid ";
$result = $database->select($sql, null, 'all'); $result = $database->select($sql, null, 'all');
if (is_array($result) && @sizeof($result) != 0) { if (is_array($result) && @sizeof($result) != 0) {
foreach ($result as $x => $row) { foreach ($result as $x => $row) {
//set variables //set variables
$voicemail_greeting_uuid = $row['voicemail_greeting_uuid']; $voicemail_greeting_uuid = $row['voicemail_greeting_uuid'];
$greeting_domain_uuid = $row['domain_uuid']; $greeting_domain_uuid = $row['domain_uuid'];
$greeting_domain_name = $row['domain_name'];
$voicemail_id = $row['voicemail_id']; $voicemail_id = $row['voicemail_id'];
$greeting_filename = $row['greeting_filename']; $greeting_filename = $row['greeting_filename'];
$greeting_base64 = $row['greeting_base64']; $greeting_base64 = $row['greeting_base64'];
//set greeting directory //set greeting directory
$greeting_directory = $_SESSION['switch']['storage']['dir'].'/voicemail/default/'.$_SESSION['domains'][$greeting_domain_uuid]['domain_name'].'/'.$voicemail_id; $greeting_directory = $switch_storage.'/voicemail/default/'.$greeting_domain_name.'/'.$voicemail_id;
//remove local file, if any //remove local file, if any
@unlink($greeting_directory.'/'.$greeting_filename); //@unlink($greeting_directory.'/'.$greeting_filename);
//build update array //build update array
$array['voicemail_greetings'][$x]['voicemail_greeting_uuid'] = $voicemail_greeting_uuid; //$array['voicemail_greetings'][$x]['voicemail_greeting_uuid'] = $voicemail_greeting_uuid;
$array['voicemail_greetings'][$x]['greeting_base64'] = null; //$array['voicemail_greetings'][$x]['greeting_base64'] = null;
//decode base64, save to local file //decode base64, save to local file
file_put_contents($greeting_directory.'/'.$greeting_filename, base64_decode($greeting_base64)); file_put_contents($greeting_directory.'/'.$greeting_filename, base64_decode($greeting_base64));
@ -144,7 +155,6 @@ if ($domains_processed == 1) {
$p->add('voicemail_greeting_edit', 'temp'); $p->add('voicemail_greeting_edit', 'temp');
//execute update //execute update
$database = new database;
$database->app_name = 'voicemail_greetings'; $database->app_name = 'voicemail_greetings';
$database->app_uuid = 'e4b4fbee-9e4d-8e46-3810-91ba663db0c2'; $database->app_uuid = 'e4b4fbee-9e4d-8e46-3810-91ba663db0c2';
$database->save($array, false); $database->save($array, false);
@ -156,6 +166,7 @@ if ($domains_processed == 1) {
} }
unset($sql, $result, $row); unset($sql, $result, $row);
} }
} }
?> ?>