dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Destination Summary: Mitigate PHP 8.x warnings, fix search criteria on CSV export.

This commit is contained in:
fusionate 2024-05-13 12:17:14 -06:00
parent fc90314009
commit 5c73ea7bbb
No known key found for this signature in database
2 changed files with 49 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
app/destinations/destination_summary.php
View File

@ -44,9 +44,11 @@
//retrieve submitted data //retrieve submitted data
if (!empty($_REQUEST)) { if (!empty($_REQUEST)) {
$quick_select = $_REQUEST['quick_select']; $quick_select = $_REQUEST['quick_select'] ?? '';
$start_stamp_begin = $_REQUEST['start_stamp_begin']; if (empty($quick_select)) {
$start_stamp_end = $_REQUEST['start_stamp_end']; $start_stamp_begin = $_REQUEST['start_stamp_begin'] ?? '';
$start_stamp_end = $_REQUEST['start_stamp_end'] ?? '';
}
//$include_internal = $_REQUEST['include_internal']; //$include_internal = $_REQUEST['include_internal'];
} }
else { else {
@ -56,9 +58,13 @@
//get the summary //get the summary
$destination = new destinations; $destination = new destinations;
$destination->domain_uuid = $_SESSION['domain_uuid']; $destination->domain_uuid = $_SESSION['domain_uuid'];
$destination->quick_select = $quick_select; if (!empty($quick_select)) {
$destination->start_stamp_begin = $start_stamp_begin ?? null; $destination->quick_select = $quick_select;
$destination->start_stamp_end = $start_stamp_end ?? null; }
else {
$destination->start_stamp_begin = $start_stamp_begin ?? '';
$destination->start_stamp_end = $start_stamp_end ?? '';
}
//$destination->include_internal = $include_internal ?? null; //$destination->include_internal = $include_internal ?? null;
$summary = $destination->destination_summary(); $summary = $destination->destination_summary();
@ -71,32 +77,36 @@
//show the column names on the first line //show the column names on the first line
$z = 0; $z = 0;
foreach($summary[1] as $key => $val) { if (!empty($summary) && is_array($summary)) {
if ($z == 0) { foreach ($summary[1] as $key => $val) {
echo '"'.$key.'"';
}
else {
echo ',"'.$key.'"';
}
$z++;
}
echo "\n";
//add the values to the csv
$x = 0;
foreach($summary as $users) {
$z = 0;
foreach($users as $key => $val) {
if ($z == 0) { if ($z == 0) {
echo '"'.$summary[$x][$key].'"'; echo '"'.$key.'"';
} }
else { else {
echo ',"'.$summary[$x][$key].'"'; echo ',"'.$key.'"';
} }
$z++; $z++;
} }
echo "\n"; echo "\n";
$x++; }
//add the values to the csv
$x = 0;
if (!empty($summary) && is_array($summary)) {
foreach ($summary as $users) {
$z = 0;
foreach ($users as $key => $val) {
if ($z == 0) {
echo '"'.$summary[$x][$key].'"';
}
else {
echo ',"'.$summary[$x][$key].'"';
}
$z++;
}
echo "\n";
$x++;
}
} }
exit; exit;
} }
@ -138,13 +148,13 @@
echo " <div class='field'>\n"; echo " <div class='field'>\n";
echo " <select class='formfld' name='quick_select' id='quick_select' onchange=\"if (this.selectedIndex != 0) { document.getElementById('start_stamp_begin').value = ''; document.getElementById('start_stamp_end').value = ''; document.getElementById('frm').submit(); }\">\n"; echo " <select class='formfld' name='quick_select' id='quick_select' onchange=\"if (this.selectedIndex != 0) { document.getElementById('start_stamp_begin').value = ''; document.getElementById('start_stamp_end').value = ''; document.getElementById('frm').submit(); }\">\n";
echo " <option value=''></option>\n"; echo " <option value=''></option>\n";
echo " <option value='1' ".(($quick_select == 1) ? "selected='selected'" : null).">".$text['option-last_seven_days']."</option>\n"; echo " <option value='1' ".($quick_select == 1 ? "selected='selected'" : null).">".$text['option-last_seven_days']."</option>\n";
echo " <option value='2' ".(($quick_select == 2) ? "selected='selected'" : null).">".$text['option-last_hour']."</option>\n"; echo " <option value='2' ".($quick_select == 2 ? "selected='selected'" : null).">".$text['option-last_hour']."</option>\n";
echo " <option value='3' ".(($quick_select == 3) ? "selected='selected'" : null).">".$text['option-today']."</option>\n"; echo " <option value='3' ".($quick_select == 3 ? "selected='selected'" : null).">".$text['option-today']."</option>\n";
echo " <option value='4' ".(($quick_select == 4) ? "selected='selected'" : null).">".$text['option-yesterday']."</option>\n"; echo " <option value='4' ".($quick_select == 4 ? "selected='selected'" : null).">".$text['option-yesterday']."</option>\n";
echo " <option value='5' ".(($quick_select == 5) ? "selected='selected'" : null).">".$text['option-this_week']."</option>\n"; echo " <option value='5' ".($quick_select == 5 ? "selected='selected'" : null).">".$text['option-this_week']."</option>\n";
echo " <option value='6' ".(($quick_select == 6) ? "selected='selected'" : null).">".$text['option-this_month']."</option>\n"; echo " <option value='6' ".($quick_select == 6 ? "selected='selected'" : null).">".$text['option-this_month']."</option>\n";
echo " <option value='7' ".(($quick_select == 7) ? "selected='selected'" : null).">".$text['option-this_year']."</option>\n"; echo " <option value='7' ".($quick_select == 7 ? "selected='selected'" : null).">".$text['option-this_year']."</option>\n";
echo " </select>\n"; echo " </select>\n";
echo " </div>\n"; echo " </div>\n";
echo " </div>\n"; echo " </div>\n";
@ -205,7 +215,7 @@
echo " <th class='hide-sm-dn'>".$text['label-description']."</th>\n"; echo " <th class='hide-sm-dn'>".$text['label-description']."</th>\n";
echo " </tr>\n"; echo " </tr>\n";
if (is_array($summary)) { if (!empty($summary) && is_array($summary)) {
foreach ($summary as $key => $row) { foreach ($summary as $key => $row) {
echo "<tr class='list-row'>\n"; echo "<tr class='list-row'>\n";
if (!empty($_GET['show']) && $_GET['show'] === "all" && permission_exists('destination_summary_all')) { if (!empty($_GET['show']) && $_GET['show'] === "all" && permission_exists('destination_summary_all')) {

7
app/destinations/resources/classes/destinations.php
View File

@ -34,10 +34,13 @@ if (!class_exists('destinations')) {
class destinations { class destinations {
/** /**
* destinations array * declare public variables
*/ */
public $destinations; public $destinations;
public $domain_uuid; public $domain_uuid;
public $start_stamp_begin;
public $start_stamp_end;
public $quick_select;
/** /**
* declare private variables * declare private variables
@ -1132,7 +1135,7 @@ if (!class_exists('destinations')) {
} }
//build the date range //build the date range
if ((!empty($this->start_stamp_begin) && strlen($this->start_stamp_begin) > 0) || !empty($this->start_stamp_end)) { if (!empty($this->start_stamp_begin) || !empty($this->start_stamp_end)) {
unset($this->quick_select); unset($this->quick_select);
if (strlen($this->start_stamp_begin) > 0 && !empty($this->start_stamp_end)) { if (strlen($this->start_stamp_begin) > 0 && !empty($this->start_stamp_end)) {
$sql_date_range = " and start_stamp between :start_stamp_begin::timestamptz and :start_stamp_end::timestamptz \n"; $sql_date_range = " and start_stamp between :start_stamp_begin::timestamptz and :start_stamp_end::timestamptz \n";