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

Use the time zone and format the date

Browse Source
This commit is contained in:
FusionPBX
2023-01-02 23:21:40 -07:00
committed by GitHub
parent a93bce2ae4
commit 784bdafccf
1 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/fax/fax_files.php
+36 -10
View File
@@ -17,7 +17,7 @@
The Initial Developer of the Original Code is The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2018-2020 Portions created by the Initial Developer are Copyright (C) 2018-2022
the Initial Developer. All Rights Reserved. the Initial Developer. All Rights Reserved.
Contributor(s): Contributor(s):
@@ -197,7 +197,8 @@
} }
//prepare to page the results //prepare to page the results
$sql = "select count(fax_file_uuid) from v_fax_files "; $sql = "select count(fax_file_uuid) ";
$sql .= "from v_fax_files ";
$sql .= "where fax_uuid = :fax_uuid "; $sql .= "where fax_uuid = :fax_uuid ";
$sql .= "and domain_uuid = :domain_uuid "; $sql .= "and domain_uuid = :domain_uuid ";
if ($_REQUEST['box'] == 'inbox') { if ($_REQUEST['box'] == 'inbox') {
@@ -220,15 +221,42 @@
list($paging_controls_mini, $rows_per_page) = paging($num_rows, $param, $rows_per_page, true); list($paging_controls_mini, $rows_per_page) = paging($num_rows, $param, $rows_per_page, true);
$offset = $rows_per_page * $page; $offset = $rows_per_page * $page;
//set the time zone
if (isset($_SESSION['domain']['time_zone']['name'])) {
$time_zone = $_SESSION['domain']['time_zone']['name'];
}
else {
$time_zone = date_default_timezone_get();
}
$parameters['time_zone'] = $time_zone;
//set the time format options: 12h, 24h
if (isset($_SESSION['domain']['time_format']['text'])) {
if ($_SESSION['domain']['time_format']['text'] == '12h') {
$time_format = 'HH12:MI:SS am';
}
elseif ($_SESSION['domain']['time_format']['text'] == '24h') {
$time_format = 'HH24:MI:SS';
}
}
else {
$time_format = 'HH12:MI:SS am';
}
//get the list //get the list
$sql = "select * from v_fax_files "; $sql = "select domain_uuid, fax_file_uuid, fax_uuid, fax_mode \n";
$sql .= "where fax_uuid = :fax_uuid "; $sql .= "fax_destination, fax_file_type, fax_file_path, fax_caller_id_name \n";
$sql .= "and domain_uuid = :domain_uuid "; $sql .= "fax_caller_id_number, fax_epoch, fax_base64, fax_date, \n";
$sql .= "to_char(timezone(:time_zone, fax_date), 'DD Mon YYYY') as fax_date_formatted, \n";
$sql .= "to_char(timezone(:time_zone, fax_date), '".$time_format."') as fax_time_formatted \n";
$sql .= "from v_fax_files \n";
$sql .= "where fax_uuid = :fax_uuid \n";
$sql .= "and domain_uuid = :domain_uuid \n";
if ($_REQUEST['box'] == 'inbox') { if ($_REQUEST['box'] == 'inbox') {
$sql .= "and fax_mode = 'rx' "; $sql .= "and fax_mode = 'rx' \n";
} }
if ($_REQUEST['box'] == 'sent') { if ($_REQUEST['box'] == 'sent') {
$sql .= "and fax_mode = 'tx' "; $sql .= "and fax_mode = 'tx' \n";
} }
$parameters['fax_uuid'] = $fax_uuid; $parameters['fax_uuid'] = $fax_uuid;
$parameters['domain_uuid'] = $domain_uuid; $parameters['domain_uuid'] = $domain_uuid;
@@ -412,8 +440,7 @@
} }
} }
echo " </td>\n"; echo " </td>\n";
$fax_date = ($_SESSION['domain']['time_format']['text'] == '12h') ? date("F d Y H:i", $row['fax_epoch']) : date("F d Y H:i", $row['fax_epoch']); echo " <td>".$row['fax_date_formatted']." ".$row['fax_time_formatted']."&nbsp;</td>\n";
echo " <td>".$fax_date."&nbsp;</td>\n";
echo "</tr>\n"; echo "</tr>\n";
$x++; $x++;
} }
@@ -426,7 +453,6 @@
echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n"; echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
echo "</form>\n"; echo "</form>\n";
//include the footer //include the footer
require_once "resources/footer.php"; require_once "resources/footer.php";