From 2ae59b382e418b15ddf2426efae186cb79653edb Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Wed, 24 Oct 2012 07:12:15 +0000 Subject: [PATCH] Move to the $text array and add dashes between words on the $text named array values. --- app/calls_active/app_languages.php | 140 +++++++++--------- app/calls_active/v_calls_active.php | 11 +- ...v_calls_active_assigned_extensions_inc.php | 35 ++--- .../v_calls_active_extensions.php | 35 ++--- .../v_calls_active_extensions_inc.php | 67 ++++----- app/calls_active/v_calls_active_inc.php | 43 +++--- 6 files changed, 168 insertions(+), 163 deletions(-) diff --git a/app/calls_active/app_languages.php b/app/calls_active/app_languages.php index a2f22b3b7e..dd1fd54b97 100644 --- a/app/calls_active/app_languages.php +++ b/app/calls_active/app_languages.php @@ -1,106 +1,106 @@ \ No newline at end of file diff --git a/app/calls_active/v_calls_active.php b/app/calls_active/v_calls_active.php index 935b21a86b..cf18094920 100644 --- a/app/calls_active/v_calls_active.php +++ b/app/calls_active/v_calls_active.php @@ -35,8 +35,9 @@ else { exit; } - foreach($content_calls_active as $key => $value) { - $content_calls_active[$key] = $value[$_SESSION['domain']['language']['code']]; +//add multi-lingual support + foreach($text as $key => $value) { + $text[$key] = $value[$_SESSION['domain']['language']['code']]; } $conference_name = trim($_REQUEST["c"]); @@ -115,8 +116,8 @@ echo "
"; 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"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; foreach ($_SESSION['extension_array'] as $row) { $domain_uuid = $row['domain_uuid']; @@ -161,20 +162,20 @@ if (permission_exists('extensions_active_assigned_view')) { echo "\n"; echo "\n"; diff --git a/app/calls_active/v_calls_active_extensions.php b/app/calls_active/v_calls_active_extensions.php index 1652a24ea2..fcb2cf4be8 100644 --- a/app/calls_active/v_calls_active_extensions.php +++ b/app/calls_active/v_calls_active_extensions.php @@ -35,8 +35,9 @@ else { exit; } - foreach($content_calls_active as $key => $value) { - $content_calls_active[$key] = $value[$_SESSION['domain']['language']['code']]; +//add multi-lingual support + foreach($text as $key => $value) { + $text[$key] = $value[$_SESSION['domain']['language']['code']]; } //http get and set variables @@ -206,7 +207,7 @@ echo "
"; echo "
".$content_calls_active['title']."
\n"; -echo " ".$content_calls_active['description']."\n"; +echo " 		".$text['title']."
\n"; +echo " ".$text['description']."\n"; echo " 		\n"; @@ -167,4 +168,4 @@ echo "-->\n"; echo "\n"; require_once "includes/footer.php"; -?> +?> \ No newline at end of file diff --git a/app/calls_active/v_calls_active_assigned_extensions_inc.php b/app/calls_active/v_calls_active_assigned_extensions_inc.php index af8aa1c369..a9411b1f4a 100644 --- a/app/calls_active/v_calls_active_assigned_extensions_inc.php +++ b/app/calls_active/v_calls_active_assigned_extensions_inc.php @@ -29,10 +29,11 @@ require_once "includes/checkauth.php"; include "app_languages.php"; if (permission_exists('extensions_active_assigned_view')) { - foreach($content_calls_active as $key => $value) { - $content_calls_active[$key] = $value[$_SESSION['domain']['language']['code']]; +//add multi-lingual support + foreach($text as $key => $value) { + $text[$key] = $value[$_SESSION['domain']['language']['code']]; } - + //http get and set variables if (strlen($_GET['url']) > 0) { $url = $_GET['url']; @@ -49,18 +50,18 @@ if (permission_exists('extensions_active_assigned_view')) { //hide the user_status when it is set to false } else { - echo "".$content_calls_active['label-status']."".$text['label-status']."".$content_calls_active['label-time']."".$text['label-time']."DirectionProfile".$content_calls_active['label-cid-name']."".$content_calls_active['label-cid-number']."".$content_calls_active['label-destination']."".$content_calls_active['label-app']."".$content_calls_active['label-secure']."".$content_calls_active['label-name']."".$content_calls_active['label-opt']."".$text['label-cid-name']."".$text['label-cid-number']."".$text['label-destination']."".$text['label-app']."".$text['label-secure']."".$text['label-name']."".$text['label-opt']."
\n"; //transfer - echo " ".$content_calls_active['label-transfer']."';\" onclick=\"send_cmd('v_calls_exec.php?cmd='+get_transfer_cmd(escape('$uuid')));\">".$content_calls_active['label-transf']." \n"; + echo " ".$text['label-transfer']."';\" onclick=\"send_cmd('v_calls_exec.php?cmd='+get_transfer_cmd(escape('$uuid')));\">".$text['label-transfer']." \n"; //park - echo " ".$content_calls_active['label-park']." \n"; + echo " ".$text['label-park']." \n"; //hangup - echo " ".$content_calls_active['label-hangup']." \n"; + echo " ".$text['label-hangup']." \n"; //record start/stop $tmp_file = $_SESSION['switch']['recordings']['dir']."/archive/".date("Y")."/".date("M")."/".date("d")."/".$uuid.".wav"; if (file_exists($tmp_file)) { //stop - echo " ".$content_calls_active['label-stop']." \n"; + echo " ".$text['label-stop']." \n"; } else { //start - echo " ".$content_calls_active['label-start']." \n"; + echo " ".$text['label-start']." \n"; } echo "  "; echo "
\n"; echo " \n"; echo " \n"; //get the user status when the page loads @@ -233,40 +234,40 @@ else { echo " \n"; @@ -274,13 +275,13 @@ else { echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo "
\n"; -echo " ".$content_calls_active['title2']."
\n"; +echo " ".$text['title-2']."
\n"; echo " 		\n"; //status list echo "  "; - echo " ".$content_calls_active['label-status']." \n"; + echo " ".$text['label-status']." \n"; $cmd = "'v_calls_exec.php?action=user_status&data='+this.value+'"; $cmd .= "&cmd=callcenter_config+agent+set+status+".$_SESSION['username']."@".$_SESSION['domain_name']."+'+this.value"; echo " \n"; echo " \n"; echo "  "; -echo " ".$content_calls_active['label-transfer']."\n"; +echo " ".$text['label-transfer']."\n"; echo " \n"; echo "
\n"; -echo " ".$content_calls_active['description2']."\n"; +echo " ".$text['description-2']."\n"; echo "
\n"; @@ -340,4 +341,4 @@ echo "-->\n"; echo "\n"; require_once "includes/footer.php"; -?> +?> \ No newline at end of file diff --git a/app/calls_active/v_calls_active_extensions_inc.php b/app/calls_active/v_calls_active_extensions_inc.php index b6751c5b37..32c419758c 100644 --- a/app/calls_active/v_calls_active_extensions_inc.php +++ b/app/calls_active/v_calls_active_extensions_inc.php @@ -35,8 +35,9 @@ else { exit; } - foreach($content_calls_active as $key => $value) { - $content_calls_active[$key] = $value[$_SESSION['domain']['language']['code']]; +//add multi-lingual support + foreach($text as $key => $value) { + $text[$key] = $value[$_SESSION['domain']['language']['code']]; } //set debug to true or false @@ -99,11 +100,11 @@ else { //get information over event socket if (!$fp) { - $msg = "
".$content_calls_active['confirm-socket']."
"; + $msg = "
".$text['confirm-socket']."
"; echo "
\n"; echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -330,27 +331,27 @@ else { echo "
".$content_calls_active['label-message']."".$text['label-message']."
$msg
\n"; echo "\n"; - echo "\n"; + echo "\n"; if ($_SESSION['user_status_display'] == "false") { //hide the user_status when it is set to false } else { - echo "\n"; + echo "\n"; } - echo "\n"; + echo "\n"; if (if_group("admin") || if_group("superadmin")) { if (strlen(($_GET['rows'])) == 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"; if (if_group("admin") || if_group("superadmin")) { if (strlen(($_GET['rows'])) == 0) { - echo "\n"; + echo "\n"; } } echo "\n"; @@ -462,20 +463,20 @@ else { if ($found_extension) { echo "\n"; @@ -498,27 +499,27 @@ else { echo "
".$content_calls_active['label-ext']."".$text['label-ext']."".$content_calls_active['label-status']."".$text['label-status']."".$content_calls_active['label-time']."".$text['label-time']."".$content_calls_active['label-cid-name']."".$content_calls_active['label-cid-number']."".$content_calls_active['label-destination']."".$content_calls_active['label-app']."".$content_calls_active['label-secure']."".$text['label-cid-name']."".$text['label-cid-number']."".$text['label-destination']."".$text['label-app']."".$text['label-secure']."".$content_calls_active['label-name']."".$text['label-name']."".$content_calls_active['label-opt']."".$text['label-opt']."
\n"; //transfer - echo " ".$content_calls_active['label-transf']." \n"; + echo " ".$text['label-transfer']." \n"; //park - echo " ".$content_calls_active['label-park']." \n"; + echo " ".$text['label-park']." \n"; //hangup - echo " ".$content_calls_active['label-hangup']." \n"; + echo " ".$text['label-hangup']." \n"; //record start/stop $tmp_file = $_SESSION['switch']['recordings']['dir']."/archive/".date("Y")."/".date("M")."/".date("d")."/".$uuid.".wav"; if (file_exists($tmp_file)) { //stop - echo " ".$content_calls_active['label-stop']." \n"; + echo " ".$text['label-stop']." \n"; } else { //start - echo " ".$content_calls_active['label-start']." \n"; + echo " ".$text['label-start']." \n"; } echo "  "; echo "
\n"; echo "\n"; - echo "\n"; + echo "\n"; if ($_SESSION['user_status_display'] == "false") { //hide the user_status when it is set to false } else { - echo "\n"; + echo "\n"; } - echo "\n"; + echo "\n"; if (if_group("admin") || if_group("superadmin")) { if ($_GET['rows'] == 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"; if (if_group("admin") || if_group("superadmin")) { if ($_GET['rows'] == 0) { - echo "\n"; + echo "\n"; } } echo "\n"; @@ -533,10 +534,10 @@ else { //valet park echo "
".$content_calls_active['label-ext']."".$text['label-ext']."".$content_calls_active['label-status']."".$text['label-status']."".$content_calls_active['label-time']."".$text['label-time']."".$content_calls_active['label-cid-name']."".$content_calls_active['label-cid-number']."".$content_calls_active['label-destination']."".$content_calls_active['label-app']."".$content_calls_active['label-secure']."".$text['label-cid-name']."".$text['label-cid-number']."".$text['label-destination']."".$text['label-app']."".$text['label-secure']."".$content_calls_active['label-name']."".$text['label-name']."".$content_calls_active['label-opt']."".$text['label-opt']."
\n"; echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; foreach ($valet_array as $row) { if (strlen($row['extension']) > 0) { diff --git a/app/calls_active/v_calls_active_inc.php b/app/calls_active/v_calls_active_inc.php index 082ca16b47..16791d5002 100644 --- a/app/calls_active/v_calls_active_inc.php +++ b/app/calls_active/v_calls_active_inc.php @@ -35,8 +35,9 @@ else { exit; } - foreach($content_calls_active as $key => $value) { - $content_calls_active[$key] = $value[$_SESSION['domain']['language']['code']]; +//add multi-lingual support + foreach($text as $key => $value) { + $text[$key] = $value[$_SESSION['domain']['language']['code']]; } //set the command @@ -45,11 +46,11 @@ else { $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']); //if the connnection is available then run it and return the results if (!$fp) { - $msg = "
".$content_calls_active['confirm-socket']."
"; + $msg = "
".$text['confirm-socket']."
"; echo "
\n"; echo "
".$content_calls_active['label-parkext']."".$content_calls_active['label-time']."".$content_calls_active['label-cid-name']."".$content_calls_active['label-cid-number']."".$text['label-park-ext']."".$text['label-time']."".$text['label-cid-name']."".$text['label-cid-number']."
\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -79,25 +80,25 @@ else { //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"; //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"; echo "\n"; foreach ($result_array as $row) { @@ -105,7 +106,7 @@ else { foreach ($row as $key => $value) { $$key = $value; } - + //get the sip profile $name_array = explode("/", $name); $sip_profile = $name_array[1]; @@ -148,22 +149,22 @@ else { echo "\n"; echo "\n"; @@ -174,4 +175,4 @@ else { echo "\n"; echo "
".$content_calls_active['label-message']."".$text['label-message']."
$msgIDUUIDDir".$content_calls_active['label-profile']."".$content_calls_active['label-created']."".$text['label-profile']."".$text['label-created']."Created EpochName".$content_calls_active['label-num']."".$text['label-number']."State".$content_calls_active['label-cid-name']."".$content_calls_active['label-cid-number']."".$text['label-cid-name']."".$text['label-cid-number']."IP Addr".$content_calls_active['label-destination']."".$content_calls_active['label-app']."".$text['label-destination']."".$text['label-app']."DialplanContext".$content_calls_active['label-codec']."".$text['label-codec']."Read RateWrite CodecWrite Rate".$content_calls_active['label-secure']."".$content_calls_active['label-opt']."".$text['label-secure']."".$text['label-opt']."
$secure  \n"; //transfer - echo " ".$content_calls_active['label-transfer']."';\" onclick=\"send_cmd('v_calls_exec.php?cmd='+get_transfer_cmd(escape('$uuid')));\">".$content_calls_active['label-transf']." \n"; + echo " ".$text['label-transfer']."';\" onclick=\"send_cmd('v_calls_exec.php?cmd='+get_transfer_cmd(escape('$uuid')));\">".$text['label-transfer']." \n"; //park - echo " ".$content_calls_active['label-park']." \n"; + echo " ".$text['label-park']." \n"; //hangup - echo " ".$content_calls_active['label-hangup']." \n"; + echo " ".$text['label-hangup']." \n"; //record start/stop $tmp_dir = $_SESSION['switch']['recordings']['dir']."/archive/".date("Y")."/".date("M")."/".date("d"); mkdir($tmp_dir, 0777, true); $tmp_file = $tmp_dir."/".$uuid.".wav"; if (file_exists($tmp_file)) { //stop - echo " ".$content_calls_active['label-stop']." \n"; + echo " ".$text['label-stop']." \n"; } else { //start - echo " ".$content_calls_active['label-start']." \n"; + echo " ".$text['label-start']." \n"; } echo "  "; echo "
\n"; } -?> +?> \ No newline at end of file