nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Time Conditions: Bug fixes.

Browse Source
This commit is contained in:
fusionate
2021-01-04 17:41:33 -07:00
parent 597955da06
commit 7f08b92631
1 changed files with 66 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
app/time_conditions/time_condition_edit.php
View File

@@ -50,6 +50,7 @@
if (is_array($_SESSION['time_conditions'][$preset_region])) {
foreach ($_SESSION['time_conditions'][$preset_region] as $json) {
$available_presets[] = json_decode($json, true);
$valid_presets[] = array_key_first(end($available_presets));
}
}
unset($preset_region);
@@ -562,11 +563,6 @@
$sql .= " ) ";
$sql .= " or ( ";
$sql .= " dialplan_detail_tag = 'action' ";
$sql .= " and ";
$sql .= " ( ";
$sql .= " dialplan_detail_data not like 'preset=%' ";
$sql .= " or dialplan_detail_data is null ";
$sql .= " ) ";
$sql .= " ) ";
$sql .= ") ";
$sql .= "order by dialplan_detail_group asc, dialplan_detail_order asc";
@@ -578,46 +574,52 @@
//load current conditions into array (combined by group), and retrieve action and anti-action
$c = 0;
if (is_array($dialplan_details)) {
foreach ($dialplan_details as $row) {
if (is_array($dialplan_details) && @sizeof($dialplan_details) != 0) {
//detect dialplan detail group has valid preset
$dialplan_detail_group_max = 0;
foreach ($dialplan_details as $i => $row) {
if ($row['dialplan_detail_tag'] == 'action' && $row['dialplan_detail_type'] == 'set' && strpos($row['dialplan_detail_data'], 'preset=') === 0) {
$preset_name = explode('=',$row['dialplan_detail_data'])[1];
if (in_array($preset_name, $valid_presets)) {
$dialplan_detail_group_preset[$row['dialplan_detail_group']] = $preset_name;
}
else {
$invalid_presets_dialplan_detail_groups[] = $row['dialplan_detail_group'];
unset($dialplan_details[$i]);
}
}
if ($row['dialplan_detail_group'] > $dialplan_detail_group_max) { $dialplan_detail_group_max = $row['dialplan_detail_group']; }
}
//reorder any invalid preset dialplan detail groups
if (is_array($invalid_presets_dialplan_detail_groups) && @sizeof($invalid_presets_dialplan_detail_groups) != 0) {
foreach ($dialplan_details as $i => $row) {
if (in_array($row['dialplan_detail_group'], $invalid_presets_dialplan_detail_groups)) {
$dialplan_details[$i]['dialplan_detail_group'] = $dialplan_detail_group_max + 5;
}
}
}
//parse out dialplan actions, anti-actions and conditions
foreach ($dialplan_details as $i => $row) {
if ($row['dialplan_detail_tag'] == 'action') {
if ($row['dialplan_detail_group'] == '999') {
$dialplan_anti_action = $row['dialplan_detail_type'].($row['dialplan_detail_data'] != '' || $row['dialplan_detail_type'] == 'hangup' ? ':'.$row['dialplan_detail_data'] : null);
}
else {
$dialplan_actions[$row['dialplan_detail_group']] = $row['dialplan_detail_type'].($row['dialplan_detail_data'] != '' || $row['dialplan_detail_type'] == 'hangup' ? ':'.$row['dialplan_detail_data'] : null);
$dialplan_detail_group = $dialplan_detail_group_preset[$row['dialplan_detail_group']] ?: $row['dialplan_detail_group'];
$dialplan_actions[$dialplan_detail_group] = $row['dialplan_detail_type'].($row['dialplan_detail_data'] != '' || $row['dialplan_detail_type'] == 'hangup' ? ':'.$row['dialplan_detail_data'] : null);
}
}
else if ($row['dialplan_detail_tag'] == 'condition') {
$current_conditions[$row['dialplan_detail_group']][$row['dialplan_detail_type']] = $row['dialplan_detail_data'];
$dialplan_detail_group = $dialplan_detail_group_preset[$row['dialplan_detail_group']] ?: $row['dialplan_detail_group'];
$current_conditions[$dialplan_detail_group][$row['dialplan_detail_type']] = $row['dialplan_detail_data'];
}
}
}
// //find the selected presets
// if (is_array($available_presets)) {
// foreach ($available_presets as $preset_number => &$preset) {
// if (is_array($preset)) {
// foreach ($preset as $preset_name => $preset_variables) {
// $preset_checked[$preset_name] = 'false';
// if (is_array($dialplan_details)) {
// foreach ($dialplan_details as $row) {
// if ($row['dialplan_detail_tag'] == 'action') {
// if ($row['dialplan_detail_data'] == 'preset='.$preset_name) {
// $preset_checked[$preset_name] = 'true';
// }
// }
// }
// }
// }
// }
// }
// }
//loop through available presets (if any)
if (is_array($available_presets)) {
if (is_array($available_presets) && @sizeof($available_presets) != 0) {
foreach ($available_presets as $preset_number => $preset) {
if (is_array($preset)) {
if (is_array($preset) && @sizeof($preset) != 0) {
foreach ($preset as $preset_name => $preset_variables) {
//loop through each condition group
if (is_array($current_conditions)) {
@@ -631,8 +633,17 @@
}
//if all preset variables found, then condition is a preset
if ($matches == sizeof($preset_variables)) {
$current_presets[$preset_number] = $group_id;
//preset found
if (!is_numeric($group_id)) {
$current_presets[] = $group_id;
}
//preset *conditions* found, but wasn't marked as a preset in the dialplan, so promote and update current conditions and dialplan actions
else {
$current_presets[] = $preset_name;
$current_conditions[$preset_name] = $current_conditions[$group_id];
$dialplan_actions[$preset_name] = $dialplan_actions[$group_id];
unset($current_conditions[$group_id], $dialplan_actions[$group_id]);
}
}
}
}
@@ -640,6 +651,11 @@
}
}
}
//sort arrays by keys
if (is_array($dialplan_actions)) { ksort($dialplan_actions); }
if (is_array($current_conditions)) { ksort($current_conditions); }
}
//set the defaults
@@ -653,6 +669,16 @@
$document['title'] = $text['title-time_condition'];
require_once "resources/header.php";
//debug
// echo "<div style='overflow: auto; font-family: courier; width: 100%; height: 200px; border: 1px solid #ccc; padding: 20px;'>\n";
// echo "<b>".'$dialplan_details'."</b>\n"; view_array($dialplan_details, false);
// echo "<b>".'$dialplan_anti_action'."</b>\n"; view_array($dialplan_anti_action, false);
// echo "<b>".'$dialplan_actions'."</b>\n"; view_array($dialplan_actions, false); //
// echo "<b>".'$current_conditions'."</b>\n"; view_array($current_conditions, false); //
// echo "<b>".'$available_presets'."</b>\n"; view_array($available_presets, false);
// echo "<b>".'$current_presets'."</b>\n"; view_array($current_presets, false); //
// echo "</div><br><br>\n";
?>
<script type="text/javascript">
@@ -1030,7 +1056,7 @@ if ($action == 'update') {
}
}
//used to determine largest custom group id in use
$largest_group_id = ($group_id > $largest_group_id) ? $group_id : $largest_group_id;
$largest_group_id = (is_numeric($group_id) && $group_id > $largest_group_id) ? $group_id : $largest_group_id;
}
}
}
@@ -1062,10 +1088,8 @@ if ($action == 'update') {
foreach ($available_presets as $preset_number => $preset) {
if (is_array($preset)) {
foreach ($preset as $preset_name => $preset_variables) {
$checked = (is_array($current_presets) && $current_presets[$preset_number] != '') ? "checked='checked'" : null;
// $checked = (is_array($current_presets) && $preset_checked[$preset_name] == 'true') ? "checked='checked'" : null;
$preset_group_id = ($checked) ? $current_presets[$preset_number] : $preset_group_id = $preset_number * 5 + 100;
$checked = is_array($current_presets) && in_array($preset_name, $current_presets) ? "checked='checked'" : null;
$preset_group_id = $preset_number * 5 + 100;
if (strlen($text['label-preset_'.$preset_name]) > 0) {
$label_preset_name = $text['label-preset_'.$preset_name];
}
@@ -1086,17 +1110,17 @@ if ($action == 'update') {
echo " </tr>";
echo " <tr>";
echo " <td colspan='4' style='padding-top: 10px;'>";
echo $destination->select('dialplan', 'dialplan_action['.$preset_group_id.']', $dialplan_actions[$preset_group_id]);
echo $destination->select('dialplan', 'dialplan_action['.$preset_group_id.']', $dialplan_actions[$preset_name]);
echo " </td>";
echo " </tr>";
echo " </table>";
echo " <br />";
echo "</div>";
if ($action == 'update' && is_array($current_presets) && $current_presets[$preset_number] != '') {
if ($action == 'update' && is_array($current_presets) && in_array($preset_name, $current_presets)) {
//add (potentially customized) preset conditions and populate
if (is_array($current_conditions[$preset_group_id])) {
foreach ($current_conditions[$preset_group_id] as $cond_var => $cond_val) {
if (is_array($current_conditions[$preset_name])) {
foreach ($current_conditions[$preset_name] as $cond_var => $cond_val) {
$range_indicator = ($cond_var == 'date-time') ? '~' : '-';
$tmp = explode($range_indicator, $cond_val);
$cond_val_start = $tmp[0];