From ca26a0ec46fcddabf3ac4a9c6e0edccbaaba5c35 Mon Sep 17 00:00:00 2001 From: Nuno Miguel Reis Date: Wed, 25 Sep 2013 20:14:33 +0000 Subject: [PATCH] more appropriate naming --- app/gateways/app_config.php | 2 +- app/gateways/app_languages.php | 8 ++++---- app/gateways/gateway_copy.php | 6 +++--- app/gateways/gateway_edit.php | 22 +++++++++++----------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/gateways/app_config.php b/app/gateways/app_config.php index e13a3acf4c..d215517485 100644 --- a/app/gateways/app_config.php +++ b/app/gateways/app_config.php @@ -165,7 +165,7 @@ $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ''; $z++; - $apps[$x]['db'][$y]['fields'][$z]['name'] = 'concurrent_call_limit'; + $apps[$x]['db'][$y]['fields'][$z]['name'] = 'channels'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric'; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ''; $z++; diff --git a/app/gateways/app_languages.php b/app/gateways/app_languages.php index 9fbebd6907..0f872909e7 100644 --- a/app/gateways/app_languages.php +++ b/app/gateways/app_languages.php @@ -152,11 +152,11 @@ $text['description-ping']['pt-pt'] = ''; $text['description-ping']['fr-fr'] = 'Insérer ici la fréquence de ping en secondes.'; - $text['label-limit']['en-us'] = 'How many lines'; - $text['label-limit']['pt-pt'] = 'Número de linhas'; + $text['label-channels']['en-us'] = 'Channels:'; + $text['label-channels']['pt-pt'] = 'Canais:'; - $text['description-limit']['en-us'] = 'How many lines will this gateway have?'; - $text['description-limit']['pt-pt'] = 'Insira o número máximo de linhas do gateway.'; + $text['description-channels']['en-us'] = 'Maximum number of simultaneous channels available in the gateway.'; + $text['description-channels']['pt-pt'] = 'Número máximo de canais simultâneos no gateway.'; $text['label-caller_id_in_from']['en-us'] = 'Caller Id In From'; $text['label-caller_id_in_from']['pt-pt'] = ''; diff --git a/app/gateways/gateway_copy.php b/app/gateways/gateway_copy.php index 7915cd05d3..0942f9764b 100644 --- a/app/gateways/gateway_copy.php +++ b/app/gateways/gateway_copy.php @@ -65,7 +65,7 @@ else { $extension = $row["extension"]; $codec_prefs = $row["codec_prefs"]; $ping = $row["ping"]; - $limit = $row["concurrent_call_limit"]; + $channels = $row["channels"]; $caller_id_in_from = $row["caller_id_in_from"]; $supress_cng = $row["supress_cng"]; $extension_in_contact = $row["extension_in_contact"]; @@ -103,7 +103,7 @@ else { $sql .= "extension, "; $sql .= "codec_prefs, "; $sql .= "ping, "; - $sql .= "concurrent_call_limit, "; + $sql .= "channels, "; $sql .= "caller_id_in_from, "; $sql .= "supress_cng, "; $sql .= "extension_in_contact, "; @@ -132,7 +132,7 @@ else { $sql .= "'$extension', "; $sql .= "'$codec_prefs', "; $sql .= "'$ping', "; - $sql .= "'$limit', "; + $sql .= "'$channels', "; $sql .= "'$caller_id_in_from', "; $sql .= "'$supress_cng', "; $sql .= "'$extension_in_contact', "; diff --git a/app/gateways/gateway_edit.php b/app/gateways/gateway_edit.php index e545074400..8666d077ea 100644 --- a/app/gateways/gateway_edit.php +++ b/app/gateways/gateway_edit.php @@ -68,7 +68,7 @@ else { $retry_seconds = check_str($_POST["retry_seconds"]); $extension = check_str($_POST["extension"]); $ping = check_str($_POST["ping"]); - $limit = check_str($_POST["limit"]); + $channels = check_str($_POST["channels"]); $caller_id_in_from = check_str($_POST["caller_id_in_from"]); $supress_cng = check_str($_POST["supress_cng"]); $sip_cid_type = check_str($_POST["sip_cid_type"]); @@ -108,9 +108,9 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if (strlen($retry_seconds) == 0) { $msg .= $text['message-required']." ".$text['label-retry_seconds']."
\n"; } //if (strlen($extension) == 0) { $msg .= $text['message-required']." ".$text['label-extension']."
\n"; } //if (strlen($ping) == 0) { $msg .= $text['message-required']." ".$text['label-ping']."
\n"; } - if (strlen($limit) == 0) { - //$msg .= $text['message-required']." ".$text['label-limit']."
\n"; - $limit = 0; + if (strlen($channels) == 0) { + //$msg .= $text['message-required']." ".$text['label-channels']."
\n"; + $channels = 0; } //if (strlen($caller_id_in_from) == 0) { $msg .= $text['message-required']." ".$text['label-caller_id_in_from']."
\n"; } //if (strlen($supress_cng) == 0) { $msg .= $text['message-required']." ".$text['label-supress_cng']."
\n"; } @@ -163,7 +163,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "retry_seconds, "; $sql .= "extension, "; $sql .= "ping, "; - $sql .= "concurrent_call_limit, "; + $sql .= "channels, "; $sql .= "caller_id_in_from, "; $sql .= "supress_cng, "; $sql .= "sip_cid_type, "; @@ -195,7 +195,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "'$retry_seconds', "; $sql .= "'$extension', "; $sql .= "'$ping', "; - $sql .= "'$limit', "; + $sql .= "'$channels', "; $sql .= "'$caller_id_in_from', "; $sql .= "'$supress_cng', "; $sql .= "'$sip_cid_type', "; @@ -230,7 +230,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "retry_seconds = '$retry_seconds', "; $sql .= "extension = '$extension', "; $sql .= "ping = '$ping', "; - $sql .= "concurrent_call_limit = '$limit', "; + $sql .= "channels = '$channels', "; $sql .= "caller_id_in_from = '$caller_id_in_from', "; $sql .= "supress_cng = '$supress_cng', "; $sql .= "sip_cid_type = '$sip_cid_type', "; @@ -317,7 +317,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $retry_seconds = $row["retry_seconds"]; $extension = $row["extension"]; $ping = $row["ping"]; - $limit = $row["concurrent_call_limit"]; + $channels = $row["channels"]; $caller_id_in_from = $row["caller_id_in_from"]; $supress_cng = $row["supress_cng"]; $sip_cid_type = $row["sip_cid_type"]; @@ -745,12 +745,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; - echo " ".$text['label-limit'].":\n"; + echo " ".$text['label-channels'].":\n"; echo "\n"; echo "\n"; - echo " \n"; + echo " \n"; echo "
\n"; - echo $text['description-limit']."\n"; + echo $text['description-channels']."\n"; echo "\n"; echo "\n";