diff --git a/app/music_on_hold/music_on_hold.php b/app/music_on_hold/music_on_hold.php
index a298e07e2d..d195c4b270 100644
--- a/app/music_on_hold/music_on_hold.php
+++ b/app/music_on_hold/music_on_hold.php
@@ -37,7 +37,7 @@ else {
require_once "includes/paging.php";
-$samplingrate_folders = Array(8000, 16000, 32000, 48000);
+$sampling_rate_dirs = Array(8000, 16000, 32000, 48000);
$dir_music_on_hold = $_SESSION['switch']['sounds']['dir'].'/music';
ini_set(max_execution_time,7200);
@@ -46,7 +46,7 @@ $order = $_GET["order"];
if ($_GET['a'] == "download") {
$category_folder = $_GET['category'];
- $samplingrate_folder = $_GET['samplingrate'];
+ $sampling_rate_dir = $_GET['sampling_rate'];
if ($category_folder != '') {
$path_mod = $category_folder."/";
@@ -58,8 +58,8 @@ if ($_GET['a'] == "download") {
session_cache_limiter('public');
if ($_GET['type'] = "moh") {
- if (file_exists($dir_music_on_hold."/".$path_mod.$samplingrate_folder."/".base64_decode($_GET['filename']))) {
- $fd = fopen($dir_music_on_hold."/".$path_mod.$samplingrate_folder."/".base64_decode($_GET['filename']), "rb");
+ if (file_exists($dir_music_on_hold."/".$path_mod.$sampling_rate_dir."/".base64_decode($_GET['filename']))) {
+ $fd = fopen($dir_music_on_hold."/".$path_mod.$sampling_rate_dir."/".base64_decode($_GET['filename']), "rb");
if ($_GET['t'] == "bin") {
header("Content-Type: application/force-download");
header("Content-Type: application/octet-stream");
@@ -78,7 +78,7 @@ if ($_GET['a'] == "download") {
}
header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
- header("Content-Length: " . filesize($dir_music_on_hold."/".$path_mod.$samplingrate_folder."/".base64_decode($_GET['filename'])));
+ header("Content-Length: " . filesize($dir_music_on_hold."/".$path_mod.$sampling_rate_dir."/".base64_decode($_GET['filename'])));
fpassthru($fd);
}
}
@@ -86,62 +86,61 @@ if ($_GET['a'] == "download") {
}
-if (($_POST['submit'] == "Upload") && is_uploaded_file($_FILES['ulfile']['tmp_name'])) {
- $file_ext = strtolower(pathinfo($_FILES['ulfile']['name'], PATHINFO_EXTENSION));
+if (($_POST['submit'] == "Upload") && is_uploaded_file($_FILES['upload_file']['tmp_name'])) {
+ $file_ext = strtolower(pathinfo($_FILES['upload_file']['name'], PATHINFO_EXTENSION));
if ($file_ext == 'wav' || $file_ext == 'mp3') {
if ($_POST['type'] == 'moh' && permission_exists('music_on_hold_add')) {
- $new_file_name = str_replace(' ', '-', $_FILES['ulfile']['name']); // replace any spaces in the filename with dashes
+ $new_file_name = str_replace(' ', '-', $_FILES['upload_file']['name']); // replace any spaces in the filename with dashes
- $samplingrate_folder = $_POST['ulsamplingrate'] * 1000; // convert sampling rate from value passed by form
+ $sampling_rate_dir = $_POST['upload_sampling_rate'] * 1000; // convert sampling rate from value passed by form
if (count($_SESSION['domains']) > 1) {
$path_mod = $_SESSION["domain_name"]."/"; // if multi-tenant, modify folder paths
}
// create new category, if necessary
- if ($_POST['ulcategory'] == '_NEW_CAT_' && $_POST['ulcategorynew'] != '') {
- $new_category_name = str_replace(' ', '_', $_POST['ulcategorynew']);
- if (!is_dir($dir_music_on_hold."/".$path_mod.$new_category_name."/".$samplingrate_folder)) {
- @mkdir($dir_music_on_hold."/".$path_mod.$new_category_name."/".$samplingrate_folder, 0777, true);
+ if ($_POST['upload_category'] == '_NEW_CAT_' && $_POST['upload_category_new'] != '') {
+ $new_category_name = str_replace(' ', '_', $_POST['upload_category_new']);
+ if (!is_dir($dir_music_on_hold."/".$path_mod.$new_category_name."/".$sampling_rate_dir)) {
+ @mkdir($dir_music_on_hold."/".$path_mod.$new_category_name."/".$sampling_rate_dir, 0777, true);
}
- if (is_dir($dir_music_on_hold."/".$path_mod.$new_category_name."/".$samplingrate_folder)) {
- move_uploaded_file($_FILES['ulfile']['tmp_name'], $dir_music_on_hold."/".$path_mod.$new_category_name."/".$samplingrate_folder."/".$new_file_name);
- $target_folder = $dir_music_on_hold."/".$path_mod.$new_category_name."/".$samplingrate_folder;
+ if (is_dir($dir_music_on_hold."/".$path_mod.$new_category_name."/".$sampling_rate_dir)) {
+ move_uploaded_file($_FILES['upload_file']['tmp_name'], $dir_music_on_hold."/".$path_mod.$new_category_name."/".$sampling_rate_dir."/".$new_file_name);
+ $target_folder = $dir_music_on_hold."/".$path_mod.$new_category_name."/".$sampling_rate_dir;
}
}
// use existing category folder
- else if ($_POST['ulcategory'] != '' && $_POST['ulcategory'] != '_NEW_CAT_') {
- if (!is_dir($dir_music_on_hold."/".$path_mod.$_POST['ulcategory']."/".$samplingrate_folder)) {
- @mkdir($dir_music_on_hold."/".$path_mod.$_POST['ulcategory']."/".$samplingrate_folder, 0777, true);
+ else if ($_POST['upload_category'] != '' && $_POST['upload_category'] != '_NEW_CAT_') {
+ if (!is_dir($dir_music_on_hold."/".$path_mod.$_POST['upload_category']."/".$sampling_rate_dir)) {
+ @mkdir($dir_music_on_hold."/".$path_mod.$_POST['upload_category']."/".$sampling_rate_dir, 0777, true);
}
- if (is_dir($dir_music_on_hold."/".$path_mod.$_POST['ulcategory']."/".$samplingrate_folder)) {
- move_uploaded_file($_FILES['ulfile']['tmp_name'], $dir_music_on_hold."/".$path_mod.$_POST['ulcategory']."/".$samplingrate_folder."/".$new_file_name);
- $target_folder = $dir_music_on_hold."/".$path_mod.$_POST['ulcategory']."/".$samplingrate_folder;
+ if (is_dir($dir_music_on_hold."/".$path_mod.$_POST['upload_category']."/".$sampling_rate_dir)) {
+ move_uploaded_file($_FILES['upload_file']['tmp_name'], $dir_music_on_hold."/".$path_mod.$_POST['upload_category']."/".$sampling_rate_dir."/".$new_file_name);
+ $target_folder = $dir_music_on_hold."/".$path_mod.$_POST['upload_category']."/".$sampling_rate_dir;
}
}
// use default folder
- else if ($_POST['ulcategory'] == '') {
- if (!is_dir($dir_music_on_hold."/".$samplingrate_folder)) {
- @mkdir($dir_music_on_hold."/".$samplingrate_folder, 0777, true);
+ else if ($_POST['upload_category'] == '') {
+ if (!is_dir($dir_music_on_hold."/".$sampling_rate_dir)) {
+ @mkdir($dir_music_on_hold."/".$sampling_rate_dir, 0777, true);
}
- if (is_dir($dir_music_on_hold."/".$samplingrate_folder)) {
- move_uploaded_file($_FILES['ulfile']['tmp_name'], $dir_music_on_hold."/".$samplingrate_folder."/".$new_file_name);
- $target_folder = $dir_music_on_hold."/".$samplingrate_folder;
+ if (is_dir($dir_music_on_hold."/".$sampling_rate_dir)) {
+ move_uploaded_file($_FILES['upload_file']['tmp_name'], $dir_music_on_hold."/".$sampling_rate_dir."/".$new_file_name);
+ $target_folder = $dir_music_on_hold."/".$sampling_rate_dir;
}
}
else { exit(); }
- $savemsg = "Uploaded file to ".$target_folder."/".htmlentities($_FILES['ulfile']['name']);
+ $savemsg = "Uploaded file to ".$target_folder."/".htmlentities($_FILES['upload_file']['name']);
unset($_POST['txtCommand']);
}
}
}
-
if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) {
if ($_GET['type'] == 'moh') {
- $samplingrate_folder = $_GET['samplingrate'];
+ $sampling_rate_dir = $_GET['sampling_rate'];
$category_folder = $_GET['category'];
if ($category_folder != '') {
@@ -152,7 +151,7 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) {
}
}
- unlink($dir_music_on_hold."/".$path_mod.$samplingrate_folder."/".base64_decode($_GET['filename']));
+ unlink($dir_music_on_hold."/".$path_mod.$sampling_rate_dir."/".base64_decode($_GET['filename']));
header("Location: music_on_hold.php");
exit;
}
@@ -165,8 +164,8 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) {
}
// remove sampling rate folders (if any)
- foreach ($samplingrate_folders as $samplingrate_folder) {
- rmdir($dir_music_on_hold."/".$path_mod.(base64_decode($category_folder))."/".$samplingrate_folder);
+ foreach ($sampling_rate_dirs as $sampling_rate_dir) {
+ rmdir($dir_music_on_hold."/".$path_mod.(base64_decode($category_folder))."/".$sampling_rate_dir);
}
// remove category folder
@@ -219,10 +218,10 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) {
echo " \n";
echo " \n";
echo " File Path
\n";
- echo " \n";
+ echo " \n";
echo " | \n";
echo " Sampling
\n";
- echo " | \n";
echo " Category
\n";
- echo " | \n";
echo "
\n";
- echo " ";
+ echo " ";
echo " | \n";
echo "
\n";
echo " \n";
@@ -295,39 +294,35 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) {
$row_style["0"] = "row_style0";
$row_style["1"] = "row_style1";
- foreach ($samplingrate_folders as $samplingrate_folder) {
-
- if ($handle = opendir($dir_music_on_hold."/".$samplingrate_folder)) {
+ foreach ($sampling_rate_dirs as $sampling_rate_dir) {
+ if ($handle = opendir($dir_music_on_hold."/".$sampling_rate_dir)) {
while (false !== ($file = readdir($handle))) {
- if ($file != "." && $file != ".." && is_file($dir_music_on_hold."/".$samplingrate_folder."/".$file)) {
-
- $tmp_filesize = filesize($dir_music_on_hold."/".$samplingrate_folder."/".$file);
+ if ($file != "." && $file != ".." && is_file($dir_music_on_hold."/".$sampling_rate_dir."/".$file)) {
+ $tmp_filesize = filesize($dir_music_on_hold."/".$sampling_rate_dir."/".$file);
$tmp_filesize = byte_convert($tmp_filesize);
echo " |
\n";
- echo " | ".$file." | \n";
+ echo " ".$file." | \n";
echo " \n";
- echo " \n";
+ echo " \n";
$tmp_file_array = explode("\.",$file);
echo " ".$tmp_file_array[0];
echo " ";
echo " | \n";
- echo " ".date ("F d Y H:i:s", filemtime($dir_music_on_hold."/".$samplingrate_folder."/".$file))." | \n";
+ echo " ".date ("F d Y H:i:s", filemtime($dir_music_on_hold."/".$sampling_rate_dir."/".$file))." | \n";
echo " ".$tmp_filesize." | \n";
- echo " ".($samplingrate_folder / 1000)." kHz | \n";
+ echo " ".($sampling_rate_dir / 1000)." kHz | \n";
echo " \n";
if (permission_exists('music_on_hold_delete')) {
- echo " $v_link_label_delete\n";
+ echo " $v_link_label_delete\n";
}
echo " | \n";
echo "
\n";
$c = ($c==0) ? 1 : 0;
-
}
}
closedir($handle);
}
-
}
echo "\n";
@@ -339,7 +334,6 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) {
//begin moh categories ********************************************************************************************************************************************
foreach ($category_folders as $category_number => $category_folder) {
-
$c = 0;
echo "".(str_replace('_', ' ', $category_folder))."\n";
@@ -356,29 +350,28 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) {
$moh_found = false;
- foreach ($samplingrate_folders as $samplingrate_folder) {
-
- if ($handle = opendir($dir_music_on_hold_category_parent_folder."/".$category_folder."/".$samplingrate_folder)) {
+ foreach ($sampling_rate_dirs as $sampling_rate_dir) {
+ if ($handle = opendir($dir_music_on_hold_category_parent_folder."/".$category_folder."/".$sampling_rate_dir)) {
while (false !== ($file = readdir($handle))) {
- if ($file != "." && $file != ".." && is_file($dir_music_on_hold_category_parent_folder."/".$category_folder."/".$samplingrate_folder."/".$file)) {
+ if ($file != "." && $file != ".." && is_file($dir_music_on_hold_category_parent_folder."/".$category_folder."/".$sampling_rate_dir."/".$file)) {
- $tmp_filesize = filesize($dir_music_on_hold_category_parent_folder."/".$category_folder."/".$samplingrate_folder."/".$file);
+ $tmp_filesize = filesize($dir_music_on_hold_category_parent_folder."/".$category_folder."/".$sampling_rate_dir."/".$file);
$tmp_filesize = byte_convert($tmp_filesize);
echo "\n";
- echo " | ".$file." | \n";
+ echo " ".$file." | \n";
echo " \n";
- echo " \n";
+ echo " \n";
$tmp_file_array = explode("\.",$file);
echo " ".$tmp_file_array[0];
echo " ";
echo " | \n";
- echo " ".date ("F d Y H:i:s", filemtime($dir_music_on_hold_category_parent_folder."/".$category_folder."/".$samplingrate_folder."/".$file))." | \n";
+ echo " ".date ("F d Y H:i:s", filemtime($dir_music_on_hold_category_parent_folder."/".$category_folder."/".$sampling_rate_dir."/".$file))." | \n";
echo " ".$tmp_filesize." | \n";
- echo " ".($samplingrate_folder / 1000)." kHz | \n";
+ echo " ".($sampling_rate_dir / 1000)." kHz | \n";
echo " \n";
if (permission_exists('music_on_hold_delete')) {
- echo " $v_link_label_delete\n";
+ echo " $v_link_label_delete\n";
}
echo " | \n";
echo "
\n";
@@ -386,12 +379,9 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) {
$moh_found = true;
}
-
}
closedir($handle);
-
}
-
}
if (!$moh_found) {