From 152ae4a30b355b1aa7ee5134c5d9bb6e8cdcf8bc Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Fri, 23 Nov 2012 03:22:43 +0000 Subject: [PATCH] Fix the music on hold layout for a users without music on hold default view permission. --- app/music_on_hold/music_on_hold.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/music_on_hold/music_on_hold.php b/app/music_on_hold/music_on_hold.php index 1af4c9b479..e661e3f910 100644 --- a/app/music_on_hold/music_on_hold.php +++ b/app/music_on_hold/music_on_hold.php @@ -303,12 +303,17 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) { echo "  
\n"; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; echo "\n"; echo "\n"; echo "

\n"; } +//set the row styles + $c = 0; + $row_style["0"] = "row_style0"; + $row_style["1"] = "row_style1"; + //show the default category if (permission_exists('music_on_hold_default_view')) { echo "Default\n"; @@ -327,10 +332,6 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) { echo " \n"; echo " "; - $c = 0; - $row_style["0"] = "row_style0"; - $row_style["1"] = "row_style1"; - foreach ($sampling_rate_dirs as $sampling_rate_dir) { if ($handle = opendir($music_on_hold_dir."/".$sampling_rate_dir)) { while (false !== ($file = readdir($handle))) { @@ -361,8 +362,9 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) { closedir($handle); } } + echo "\n"; } - echo "\n"; + if ($v_path_show) { echo "
Location: ".$music_on_hold_dir."
\n"; } @@ -434,7 +436,6 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) { echo "
Location: ".$music_on_hold_category_parent_dir."/".$category_dir."
\n"; } echo "

\n"; - } //include the footer