mirror of
https://github.com/fusionpbx/fusionpbx.git
synced 2026-01-06 11:43:50 +00:00
Ring group toll allow (#2520)
* Merge (#4) * Added variables to disable call waiting and t.38 faxing * HT702 config file variables: grandstream_disable_call_waiting, grandstream_disable_fax_t38 * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update app_config.php * Corrected bug with expansion board and call park value. Was 19, should be 16. * MAC detection for some Grandstream phones (#2486) Some GS models send the Mac address in the user agent * Add/Update German and Austrian translations (#2483) Updates to the following apps: call_broadcast call_flows devices dialplan_inbound dialplan_outbound edit emails exec extensions fax fifo fifo_list gateways ivr_menus * Update destinations.php * Update xml_cdr_inc.php * Update status_registrations.php * Update y000000000028.cfg * Update y000000000066.cfg * Update y000000000035.cfg * Update y000000000065.cfg * Update y000000000051.cfg * Update y000000000023.cfg * Update y000000000025.cfg * Update y000000000029.cfg * Update y000000000036.cfg * Update y000000000038.cfg * Update y000000000032.cfg * Update y000000000046.cfg * Update y000000000000.cfg * Update y000000000054.cfg * Update y000000000045.cfg * Update y000000000069.cfg * Update y000000000004.cfg * Update y000000000044.cfg * Update y000000000044.cfg * Update y000000000005.cfg * Update y000000000052.cfg * Update y000000000007.cfg * Update y000000000037.cfg * BugFix for VM Transcription (#2491) Records as MP3 and skips transcription steps if a user has transcription set to false. * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Yet another ip phone reporting MAC in the UserAgent (#2492) * Update app_config.php Begin adding uuid's for key functions. * Update app_config.php * Update app_config.php * Update app_config.php * Update app_config.php * Update app_config.php * Update app_config.php * Create 560_extension_queue.xml * Update y000000000037.cfg * Update y000000000007.cfg * Update app_config.php * Update y000000000052.cfg * Update y000000000028.cfg * Update y000000000005.cfg * Update y000000000044.cfg * Update y000000000044.cfg * Update y000000000004.cfg * Update y000000000069.cfg * Update y000000000045.cfg * Update y000000000000.cfg * Update y000000000046.cfg * Update y000000000032.cfg * Update y000000000038.cfg * Update y000000000054.cfg * Update y000000000036.cfg * Update y000000000029.cfg * Update y000000000066.cfg * Update y000000000035.cfg * Update y000000000065.cfg * Update y000000000051.cfg * Update y000000000023.cfg * Update y000000000025.cfg * Update app_config.php * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update {$mac}.xml * Update app_config.php * Fix. Add new sip profile setting. (#2500) * BugFix [master] system information git (#2499) fix for if the .git folder is present but corrupt * Fix. Redirect back to correct profile after delete setting. (#2501) Fix. Add setting (seems need also set sip_profile_uuid) Change. Order settings by name when output. * Restore Button + Audiocodes preliminary support (#2502) * Audiocodes phone support + restore default for vendors * Restore button * Restore script * Update device_vendors.php * Some FR & ES translation fixes (#2503) * Update app_config.php * Update app_config.php * Create {$mac}.cfg * Create directory.xml * Create favorite_setting.xml * Create y000000000025.cfg * Fix. Add extension with non numeric extension number. (#2508) * Update ring_group_edit.php * Update call_edit.php * Create 080_default_caller_id * Update 080_default_caller_id * Rename 080_default_caller_id to 080_default_caller_id.xml * Fix. Create needed number of extensions (#2509) * Update dialplan_edit.php * Update switch.php * Update index.php * Update switch.php * Update voicemail_edit.php * Update app_config.php (#2515) Add the necessary permissions in order to use the database save function (fusion 4.3) when coding for voicemail option adds/deletes/updates. I realize these voicemail permissions overall will probably get cleaned up even more once the whole app is updated to use the database function, but this is a stop gap measure. I am working on adding voicemail options to the Bulk Account Settings app and I'm stuck without these permissions. The function is kicking a out 403 Forbidden. * Update app_config.php * Really use configured transcribe_language for transcription (#2513) * Fix renaming domains (#2512) * Make presence for conferences work out of the box (#2514) Use '@' instead of '-' for separating conference name and domain, which is what FreeSWITCH mod_conference uses. * Add. Speed dial respects contacts user. (#2249) * Add. Speed dial respects contacts user. One user can not use speed dial numbers from contacts associated with another user * Make SQL query more efficient * Add. Support find contacts by user groups as well If contact has set any `user` or `group` then only this users can use speed dial numbers in other case speed dial numbers are global for domain. * Fixup for renaming domains (#2517) The previous fix was incomplete, this one should do it. * Create app_defaults.php * Update page.lua * CC Key Support for Call Center (#2518) * Exit Keys support * Multilanguage support * CC Key Support * Update call_center.php * Update code to iterate over numbers. (#1727) * Update code to iterate over numbers. This code fixes some problems * range like `009-010` current code produce numbers `009` and `0010` * range like `200-100` now raise error so it will be easy to debug * range like `010-20` now generate error. * `destination` is string so condition `destination == tonumber(sip_from_user)` is always false so change it `destination == sip_from_user` * Fix. handle ranges like `100-100` * Update app_config.php * Update app_languages.php * Update ring_group_edit.php * Update index.lua
This commit is contained in:
konradSC
@@ -96,6 +96,10 @@
|
||||
$apps[$x]['permissions'][$y]['name'] = "ring_group_missed_call";
|
||||
$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
|
||||
$apps[$x]['permissions'][$y]['groups'][] = "admin";
|
||||
$y++;
|
||||
$apps[$x]['permissions'][$y]['name'] = "ring_group_forward_toll_allow";
|
||||
$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
|
||||
$apps[$x]['permissions'][$y]['groups'][] = "admin";
|
||||
|
||||
//default settings
|
||||
$y=0;
|
||||
@@ -208,6 +212,10 @@
|
||||
$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
|
||||
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
|
||||
$z++;
|
||||
$apps[$x]['db'][$y]['fields'][$z]['name'] = "ring_group_forward_toll_allow";
|
||||
$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
|
||||
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Toll Allow for Ring Group Forward.";
|
||||
$z++;
|
||||
|
||||
$y++;
|
||||
$apps[$x]['db'][$y]['table']['name'] = "v_ring_group_destinations";
|
||||
|
||||
@@ -333,6 +333,20 @@ $text['label-forwarding']['ro'] = "expediere";
|
||||
$text['label-forwarding']['fa'] = "";
|
||||
$text['label-forwarding']['ar-eg'] = "إعادة توجيه";
|
||||
|
||||
$text['label-ring_group_forward_toll_allow']['en-us'] = "Forwarding Toll Allow";
|
||||
$text['label-ring_group_forward_toll_allow']['es-cl'] = "reenvío Toll Allow";
|
||||
$text['label-ring_group_forward_toll_allow']['pt-pt'] = "encaminhando Toll Allow";
|
||||
$text['label-ring_group_forward_toll_allow']['fr-fr'] = "Expéditeur Toll Allow";
|
||||
$text['label-ring_group_forward_toll_allow']['pt-br'] = "encaminhando Toll Allow";
|
||||
$text['label-ring_group_forward_toll_allow']['pl'] = "Przekierowanie Toll Allow";
|
||||
$text['label-ring_group_forward_toll_allow']['he'] = "שילוח";
|
||||
$text['label-ring_group_forward_toll_allow']['uk'] = "експедиція";
|
||||
$text['label-ring_group_forward_toll_allow']['sv-se'] = "Spedition Toll Allow";
|
||||
$text['label-ring_group_forward_toll_allow']['de-at'] = "Weiterleiten Toll Allow";
|
||||
$text['label-ring_group_forward_toll_allow']['ro'] = "expediere";
|
||||
$text['label-ring_group_forward_toll_allow']['fa'] = "Toll Allow";
|
||||
$text['label-ring_group_forward_toll_allow']['ar-eg'] = "Toll Allow إعادة ت وجيه";
|
||||
|
||||
$text['label-forward_destination']['en-us'] = "Number";
|
||||
$text['label-forward_destination']['es-cl'] = "Número";
|
||||
$text['label-forward_destination']['fr-fr'] = "Numéro";
|
||||
@@ -738,6 +752,17 @@ $text['description']['uk'] = "Редагування інформації обл
|
||||
$text['description']['de-at'] = "Rufgruppen sind gruppierte Ziele, welche über eine vordefinierte Rufstrategie angerufen werden.";
|
||||
$text['description']['he'] = "ערוך את פרטי החשבון";
|
||||
|
||||
$text['description-ring_group_forward_toll_allow']['en-us'] = "Ring group forwarding toll allow.";
|
||||
$text['description-ring_group_forward_toll_allow']['es-cl'] = "Ring group forwarding toll allow.";
|
||||
$text['description-ring_group_forward_toll_allow']['fr-fr'] = "Ring group forwarding toll allow.";
|
||||
$text['description-ring_group_forward_toll_allow']['pt-pt'] = "Ring group forwarding toll allow.";
|
||||
$text['description-ring_group_forward_toll_allow']['pt-br'] = "Ring group forwarding toll allow.";
|
||||
$text['description-ring_group_forward_toll_allow']['pl'] = "Ring group forwarding toll allow.";
|
||||
$text['description-ring_group_forward_toll_allow']['sv-se'] = "Ring group forwarding toll allow.";
|
||||
$text['description-ring_group_forward_toll_allow']['uk'] = "Ring group forwarding toll allow.";
|
||||
$text['description-ring_group_forward_toll_allow']['de-at'] = "Ring group forwarding toll allow.";
|
||||
$text['description-ring_group_forward_toll_allow']['he'] = "";
|
||||
|
||||
$text['button-view_all']['en-us'] = "View All";
|
||||
$text['button-view_all']['es-cl'] = "Mostrar Todos";
|
||||
$text['button-view_all']['pt-pt'] = "Mostrar Todos";
|
||||
|
||||
@@ -108,6 +108,7 @@
|
||||
$ring_group_missed_call_data = check_str($_POST["ring_group_missed_call_data"]);
|
||||
$ring_group_forward_enabled = check_str($_POST["ring_group_forward_enabled"]);
|
||||
$ring_group_forward_destination = check_str($_POST["ring_group_forward_destination"]);
|
||||
$ring_group_forward_toll_allow = check_str($_POST["ring_group_forward_toll_allow"]);
|
||||
$ring_group_enabled = check_str($_POST["ring_group_enabled"]);
|
||||
$ring_group_description = check_str($_POST["ring_group_description"]);
|
||||
$dialplan_uuid = check_str($_POST["dialplan_uuid"]);
|
||||
@@ -375,6 +376,7 @@
|
||||
$ring_group_missed_call_data = $row["ring_group_missed_call_data"];
|
||||
$ring_group_forward_enabled = $row["ring_group_forward_enabled"];
|
||||
$ring_group_forward_destination = $row["ring_group_forward_destination"];
|
||||
$ring_group_forward_toll_allow = $row["ring_group_forward_toll_allow"];
|
||||
$ring_group_enabled = $row["ring_group_enabled"];
|
||||
$ring_group_description = $row["ring_group_description"];
|
||||
$dialplan_uuid = $row["dialplan_uuid"];
|
||||
@@ -712,6 +714,19 @@
|
||||
echo "</td>\n";
|
||||
echo "</tr>\n";
|
||||
|
||||
if (permission_exists('ring_group_forward_toll_allow')) {
|
||||
echo "<tr>\n";
|
||||
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
|
||||
echo " ".$text['label-ring_group_forward_toll_allow']."\n";
|
||||
echo "</td>\n";
|
||||
echo "<td class='vtable' align='left'>\n";
|
||||
echo " <input class='formfld' type='text' name='ring_group_forward_toll_allow' maxlength='255' value=".$ring_group_forward_toll_allow.">\n";
|
||||
echo "<br />\n";
|
||||
echo $text['description-ring_group_forward_toll_allow']."\n";
|
||||
echo "</td>\n";
|
||||
echo "</tr>\n";
|
||||
}
|
||||
|
||||
if (if_group("superadmin")) {
|
||||
echo "<tr>\n";
|
||||
echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
|
||||
|
||||
@@ -123,6 +123,7 @@ local log = require "resources.functions.log".ring_group
|
||||
ring_group_extension = row["ring_group_extension"];
|
||||
ring_group_forward_enabled = row["ring_group_forward_enabled"];
|
||||
ring_group_forward_destination = row["ring_group_forward_destination"];
|
||||
ring_group_forward_toll_allow = row["ring_group_forward_toll_allow"];
|
||||
ring_group_cid_name_prefix = row["ring_group_cid_name_prefix"];
|
||||
ring_group_cid_number_prefix = row["ring_group_cid_number_prefix"];
|
||||
missed_call_app = row["ring_group_missed_call_app"];
|
||||
@@ -211,6 +212,7 @@ local log = require "resources.functions.log".ring_group
|
||||
--process the ring group
|
||||
if (ring_group_forward_enabled == "true" and string.len(ring_group_forward_destination) > 0) then
|
||||
--forward the ring group
|
||||
session:setVariable("toll_allow",ring_group_forward_toll_allow);
|
||||
session:execute("transfer", ring_group_forward_destination.." XML "..context);
|
||||
else
|
||||
--get the strategy of the ring group, if random, we use random() to order the destinations
|
||||
|
||||
Reference in New Issue
Block a user