diff --git a/app/call_broadcast/app_languages.php b/app/call_broadcast/app_languages.php index 111aa69022..0418a86c96 100644 --- a/app/call_broadcast/app_languages.php +++ b/app/call_broadcast/app_languages.php @@ -1,100 +1,100 @@ \ No newline at end of file diff --git a/app/call_broadcast/v_call_broadcast.php b/app/call_broadcast/v_call_broadcast.php index 0105689f7d..b95a68a304 100644 --- a/app/call_broadcast/v_call_broadcast.php +++ b/app/call_broadcast/v_call_broadcast.php @@ -35,12 +35,15 @@ else { exit; } - foreach($content_broadcast as $key => $value) { - $content_broadcast[$key] = $value[$_SESSION['domain']['language']['code']]; +//add multi-lingual support + require_once "app_languages.php"; + foreach($content_broadcast as $key => $value) { + $content[$key] = $value[$_SESSION['domain']['language']['code']]; } -require_once "includes/header.php"; -require_once "includes/paging.php"; +//add the includes + require_once "includes/header.php"; + require_once "includes/paging.php"; //get the http get variables and set them to php variables @@ -56,7 +59,7 @@ require_once "includes/paging.php"; echo "
"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "
".$content_broadcast['title']."".$content['title']." 
\n"; @@ -93,9 +96,9 @@ require_once "includes/paging.php"; echo "
\n"; echo "\n"; echo "\n"; - echo th_order_by('broadcast_name', $content_broadcast['label-name'], $order_by, $order); - echo th_order_by('broadcast_concurrent_limit', $content_broadcast['label-concurrent-limit'], $order_by, $order); - echo th_order_by('broadcast_description', $content_broadcast['label-description'], $order_by, $order); + echo th_order_by('broadcast_name', $content['label-name'], $order_by, $order); + echo th_order_by('broadcast_concurrent_limit', $content['label-concurrent-limit'], $order_by, $order); + echo th_order_by('broadcast_description', $content['label-description'], $order_by, $order); //echo th_order_by('recordingid', 'Recording', $order_by, $order); echo "\n"; echo "\n"; diff --git a/app/call_broadcast/v_call_broadcast_delete.php b/app/call_broadcast/v_call_broadcast_delete.php index b4c2d6fab3..f33bec5100 100644 --- a/app/call_broadcast/v_call_broadcast_delete.php +++ b/app/call_broadcast/v_call_broadcast_delete.php @@ -26,7 +26,6 @@ require "root.php"; require_once "includes/require.php"; require_once "includes/checkauth.php"; -require_once "app_languages.php"; if (permission_exists('call_broadcast_delete')) { //access granted } @@ -35,8 +34,10 @@ else { exit; } - foreach($content_broadcast as $key => $value) { - $content_broadcast[$key] = $value[$_SESSION['domain']['language']['code']]; +//add multi-lingual support + require_once "app_languages.php"; + foreach($content_broadcast as $key => $value) { + $content[$key] = $value[$_SESSION['domain']['language']['code']]; } //get the id @@ -58,7 +59,7 @@ else { require_once "includes/header.php"; echo "\n"; echo "
\n"; - echo "".$content_broadcast['confirm-delete']."\n"; + echo "".$content['confirm-delete']."\n"; echo "
\n"; require_once "includes/footer.php"; return; diff --git a/app/call_broadcast/v_call_broadcast_edit.php b/app/call_broadcast/v_call_broadcast_edit.php index 90433b8b5e..7a1e108675 100644 --- a/app/call_broadcast/v_call_broadcast_edit.php +++ b/app/call_broadcast/v_call_broadcast_edit.php @@ -26,7 +26,6 @@ include "root.php"; require_once "includes/require.php"; require_once "includes/checkauth.php"; -require_once "app_languages.php"; if (permission_exists('call_broadcast_edit')) { //access granted } @@ -35,8 +34,10 @@ else { exit; } - foreach($content_broadcast as $key => $value) { - $content_broadcast[$key] = $value[$_SESSION['domain']['language']['code']]; +//add multi-lingual support + require_once "app_languages.php"; + foreach($content_broadcast as $key => $value) { + $content[$key] = $value[$_SESSION['domain']['language']['code']]; } //set the action with add or update @@ -70,7 +71,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { } //check for all required data - if (strlen($broadcast_name) == 0) { $msg .= "".$content_broadcast['confirm-name']."
\n"; } + if (strlen($broadcast_name) == 0) { $msg .= "".$content['confirm-name']."
\n"; } //if (strlen($broadcast_description) == 0) { $msg .= "Please provide: Description
\n"; } //if (strlen($broadcast_timeout) == 0) { $msg .= "Please provide: Timeout
\n"; } //if (strlen($broadcast_concurrent_limit) == 0) { $msg .= "Please provide: Concurrent Limit
\n"; } @@ -143,7 +144,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { require_once "includes/header.php"; echo "\n"; echo "
\n"; - echo "".$content_broadcast['confirm-add']."\n"; + echo "".$content['confirm-add']."\n"; echo "
\n"; require_once "includes/footer.php"; return; @@ -179,7 +180,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { require_once "includes/header.php"; echo "\n"; echo "
\n"; - echo "".$content_broadcast['confirm-update']."\n"; + echo "".$content['confirm-update']."\n"; echo "
\n"; require_once "includes/footer.php"; return; @@ -230,46 +231,46 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; if ($action == "add") { - echo "\n"; + echo "\n"; } if ($action == "update") { - echo "\n"; + echo "\n"; } echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -305,23 +306,23 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; /* @@ -354,34 +355,34 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -389,10 +390,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo " \n"; echo " "; echo "
\n"; if (permission_exists('call_broadcast_add')) { @@ -116,7 +119,7 @@ require_once "includes/paging.php"; echo " $v_link_label_edit\n"; } if (permission_exists('call_broadcast_delete')) { - echo " $v_link_label_delete\n"; + echo " $v_link_label_delete\n"; } echo "
".$content_broadcast['label-call-broadcast']."".$content['label-call-broadcast']."".$content_broadcast['label-call-broadcast-edit']."".$content['label-call-broadcast-edit']."\n"; - echo " \n"; + echo " \n"; echo "
\n"; - echo " ".$content_broadcast['label-name'].":\n"; + echo " ".$content['label-name'].":\n"; echo "\n"; echo " \n"; echo "
\n"; - echo "".$content_broadcast['description-name']."\n"; + echo "".$content['description-name']."\n"; echo "
\n"; - echo " ".$content_broadcast['label-timeout'].":\n"; + echo " ".$content['label-timeout'].":\n"; echo "\n"; echo " \n"; echo "
\n"; - echo "".$content_broadcast['description-timeout']."\n"; + echo "".$content['description-timeout']."\n"; echo "
\n"; - echo " ".$content_broadcast['label-concurrent-limit'].":\n"; + echo " ".$content['label-concurrent-limit'].":\n"; echo "\n"; echo " \n"; echo "
\n"; - echo "".$content_broadcast['description-concurrent-limit']."\n"; + echo "".$content['description-concurrent-limit']."\n"; echo "
\n"; - echo " ".$content_broadcast['label-callerid-name'].":\n"; + echo " ".$content['label-callerid-name'].":\n"; echo "\n"; echo " \n"; echo "
\n"; - echo "".$content_broadcast['description-callerid-name']."\n"; + echo "".$content['description-callerid-name']."\n"; echo "
\n"; - echo " ".$content_broadcast['label-callerid-number'].":\n"; + echo " ".$content['label-callerid-number'].":\n"; echo "\n"; echo " \n"; echo "
\n"; - echo "".$content_broadcast['description-callerid-number']."\n"; + echo "".$content['description-callerid-number']."\n"; echo "
\n"; - echo " ".$content_broadcast['label-destination'].":\n"; + echo " ".$content['label-destination'].":\n"; echo "\n"; echo " \n"; echo "
\n"; - echo "".$content_broadcast['description-destination']."

\n"; + echo "".$content['description-destination']."

\n"; echo "
\n"; - echo " ".$content_broadcast['label-phone'].":\n"; + echo " ".$content['label-phone'].":\n"; echo "\n"; echo " \n"; echo "
\n"; - echo "".$content_broadcast['description-phone']."

\n"; + echo "".$content['description-phone']."

\n"; echo "
\n"; - echo " ".$content_broadcast['label-description'].":\n"; + echo " ".$content['label-description'].":\n"; echo "\n"; echo " \n"; echo "
\n"; - echo "".$content_broadcast['description-info']."\n"; + echo "".$content['description-info']."\n"; echo "
\n"; if ($action == "update") { echo " \n"; - echo " \n"; + echo " \n"; } - echo " \n"; + echo " \n"; echo "
"; diff --git a/app/call_broadcast/v_call_broadcast_send.php b/app/call_broadcast/v_call_broadcast_send.php index 2cbb64b3a4..ffbc5f0666 100644 --- a/app/call_broadcast/v_call_broadcast_send.php +++ b/app/call_broadcast/v_call_broadcast_send.php @@ -26,7 +26,6 @@ include "root.php"; require_once "includes/require.php"; require_once "includes/checkauth.php"; -require_once "app_languages.php"; if (permission_exists('call_broadcast_send')) { //access granted } @@ -35,8 +34,10 @@ else { exit; } - foreach($content_broadcast as $key => $value) { - $content_broadcast[$key] = $value[$_SESSION['domain']['language']['code']]; +//add multi-lingual support + require_once "app_languages.php"; + foreach($content_broadcast as $key => $value) { + $content[$key] = $value[$_SESSION['domain']['language']['code']]; } //set the max execution time to 1 hour @@ -68,8 +69,7 @@ function cmd_async($cmd) { $phonetype2 = $_GET["phonetype2"]; //get the call broadcast details from the database - $sql = ""; - $sql .= "select * from v_call_broadcasts "; + $sql = "select * from v_call_broadcasts "; $sql .= "where domain_uuid = '$domain_uuid' "; $sql .= "and call_broadcast_uuid = '$call_broadcast_uuid' "; $prep_statement = $db->prepare(check_sql($sql)); @@ -122,7 +122,7 @@ function cmd_async($cmd) { echo "
\n"; echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -201,12 +201,12 @@ function cmd_async($cmd) { echo "\n"; echo "\n"; echo "\n";
".$content_broadcast['label-message']."".$content['label-message']."
$msg
\n"; - echo " ".$content_broadcast['label-call-broadcast']." $broadcast_name ".$content_broadcast['label-hasbeen']."\n"; + echo " ".$content['label-call-broadcast']." $broadcast_name ".$content['label-hasbeen']."\n"; echo "

\n"; echo " \n"; echo " \n"; echo " \n"; echo "
\n"; - echo " ".$content_broadcast['label-viewcalls']."\n"; + echo " ".$content['label-viewcalls']."\n"; echo "
\n"; echo "