Fax - Logs: Updates for PHP 8.1
This commit is contained in:
+15
-14
@@ -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) 2008-2020
|
Portions created by the Initial Developer are Copyright (C) 2008-2023
|
||||||
the Initial Developer. All Rights Reserved.
|
the Initial Developer. All Rights Reserved.
|
||||||
|
|
||||||
Contributor(s):
|
Contributor(s):
|
||||||
@@ -50,17 +50,17 @@
|
|||||||
$fax_uuid = $_REQUEST["id"];
|
$fax_uuid = $_REQUEST["id"];
|
||||||
|
|
||||||
//get variables used to control the order
|
//get variables used to control the order
|
||||||
$order_by = $_GET["order_by"];
|
$order_by = $_GET["order_by"] ?? null;
|
||||||
$order = $_GET["order"];
|
$order = $_GET["order"] ?? null;
|
||||||
|
|
||||||
//get the http post data
|
//get the http post data
|
||||||
if (is_array($_POST['fax_logs'])) {
|
if (!empty($_POST['fax_logs']) && is_array($_POST['fax_logs'])) {
|
||||||
$action = $_POST['action'];
|
$action = $_POST['action'];
|
||||||
$fax_logs = $_POST['fax_logs'];
|
$fax_logs = $_POST['fax_logs'];
|
||||||
}
|
}
|
||||||
|
|
||||||
//process the http post data by action
|
//process the http post data by action
|
||||||
if ($action != '' && is_array($fax_logs) && @sizeof($fax_logs) != 0) {
|
if (!empty($action) && !empty($fax_logs) && is_array($fax_logs) && @sizeof($fax_logs) != 0) {
|
||||||
switch ($action) {
|
switch ($action) {
|
||||||
case 'delete':
|
case 'delete':
|
||||||
if (permission_exists('fax_log_delete')) {
|
if (permission_exists('fax_log_delete')) {
|
||||||
@@ -76,13 +76,14 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
//add the search string
|
//add the search string
|
||||||
$search = strtolower($_GET["search"]);
|
$search = strtolower($_GET["search"] ?? '');
|
||||||
if (!empty($search)) {
|
if (!empty($search)) {
|
||||||
$sql_search = " and (";
|
$sql_search = " and (";
|
||||||
$sql_search .= " lower(fax_result_text) like :search ";
|
$sql_search .= " lower(fax_result_text) like :search ";
|
||||||
$sql_search .= " or lower(fax_file) like :search ";
|
$sql_search .= " or lower(fax_file) like :search ";
|
||||||
$sql_search .= " or lower(fax_local_station_id) like :search ";
|
$sql_search .= " or lower(fax_local_station_id) like :search ";
|
||||||
$sql_search .= " or fax_date::text like :search ";
|
$sql_search .= " or fax_date::text like :search ";
|
||||||
|
$sql_search .= " or fax_uri::text like :search ";
|
||||||
$sql_search .= ") ";
|
$sql_search .= ") ";
|
||||||
$parameters['search'] = '%'.$search.'%';
|
$parameters['search'] = '%'.$search.'%';
|
||||||
}
|
}
|
||||||
@@ -91,7 +92,7 @@
|
|||||||
$sql = "select count(fax_log_uuid) from v_fax_logs ";
|
$sql = "select count(fax_log_uuid) from v_fax_logs ";
|
||||||
$sql .= "where domain_uuid = :domain_uuid ";
|
$sql .= "where domain_uuid = :domain_uuid ";
|
||||||
$sql .= "and fax_uuid = :fax_uuid ";
|
$sql .= "and fax_uuid = :fax_uuid ";
|
||||||
$sql .= $sql_search;
|
$sql .= $sql_search ?? '';
|
||||||
$parameters['domain_uuid'] = $domain_uuid;
|
$parameters['domain_uuid'] = $domain_uuid;
|
||||||
$parameters['fax_uuid'] = $fax_uuid;
|
$parameters['fax_uuid'] = $fax_uuid;
|
||||||
$database = new database;
|
$database = new database;
|
||||||
@@ -110,7 +111,7 @@
|
|||||||
//get the list
|
//get the list
|
||||||
$sql = str_replace('count(fax_log_uuid)', '*', $sql);
|
$sql = str_replace('count(fax_log_uuid)', '*', $sql);
|
||||||
$sql .= order_by($order_by, $order, 'fax_epoch', 'desc');
|
$sql .= order_by($order_by, $order, 'fax_epoch', 'desc');
|
||||||
$sql .= limit_offset($rows_per_page, $offset);
|
$sql .= limit_offset($rows_per_page, $offset ?? 0);
|
||||||
$database = new database;
|
$database = new database;
|
||||||
$fax_logs = $database->select($sql, $parameters, 'all');
|
$fax_logs = $database->select($sql, $parameters, 'all');
|
||||||
unset($sql, $parameters);
|
unset($sql, $parameters);
|
||||||
@@ -137,7 +138,7 @@
|
|||||||
echo "<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
|
echo "<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
|
||||||
echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]);
|
echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]);
|
||||||
echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'fax_logs.php?id='.$fax_uuid,'style'=>($search == '' ? 'display: none;' : null)]);
|
echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'fax_logs.php?id='.$fax_uuid,'style'=>($search == '' ? 'display: none;' : null)]);
|
||||||
if ($paging_controls_mini != '') {
|
if (!empty($paging_controls_mini)) {
|
||||||
echo "<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
|
echo "<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
|
||||||
}
|
}
|
||||||
echo " </form>\n";
|
echo " </form>\n";
|
||||||
@@ -160,7 +161,7 @@
|
|||||||
echo "<tr class='list-header'>\n";
|
echo "<tr class='list-header'>\n";
|
||||||
if (permission_exists('fax_log_delete')) {
|
if (permission_exists('fax_log_delete')) {
|
||||||
echo " <th class='checkbox'>\n";
|
echo " <th class='checkbox'>\n";
|
||||||
echo " <input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($fax_logs ?: "style='visibility: hidden;'").">\n";
|
echo " <input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".(empty($fax_logs) ? "style='visibility: hidden;'" : null).">\n";
|
||||||
echo " </th>\n";
|
echo " </th>\n";
|
||||||
}
|
}
|
||||||
echo th_order_by('fax_epoch', $text['label-fax_date'], $order_by, $order, null, null, "&id=".$fax_uuid);
|
echo th_order_by('fax_epoch', $text['label-fax_date'], $order_by, $order, null, null, "&id=".$fax_uuid);
|
||||||
@@ -181,7 +182,7 @@
|
|||||||
//echo th_order_by('fax_retry_sleep', $text['label-fax_retry_sleep'], $order_by, $order);
|
//echo th_order_by('fax_retry_sleep', $text['label-fax_retry_sleep'], $order_by, $order);
|
||||||
echo th_order_by('fax_uri', $text['label-fax_destination'], $order_by, $order, null, null, "&id=".$fax_uuid);
|
echo th_order_by('fax_uri', $text['label-fax_destination'], $order_by, $order, null, null, "&id=".$fax_uuid);
|
||||||
//echo th_order_by('fax_epoch', $text['label-fax_epoch'], $order_by, $order);
|
//echo th_order_by('fax_epoch', $text['label-fax_epoch'], $order_by, $order);
|
||||||
if ($_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
|
if (!empty($_SESSION['theme']['list_row_edit_button']['boolean']) && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
|
||||||
echo " <td class='action-button'> </td>\n";
|
echo " <td class='action-button'> </td>\n";
|
||||||
}
|
}
|
||||||
echo "</tr>\n";
|
echo "</tr>\n";
|
||||||
@@ -197,7 +198,7 @@
|
|||||||
echo " <input type='hidden' name='fax_logs[$x][uuid]' value='".escape($row['fax_log_uuid'])."' />\n";
|
echo " <input type='hidden' name='fax_logs[$x][uuid]' value='".escape($row['fax_log_uuid'])."' />\n";
|
||||||
echo " </td>\n";
|
echo " </td>\n";
|
||||||
}
|
}
|
||||||
echo " <td><a href='".$list_row_url."'>".($_SESSION['domain']['time_format']['text'] == '12h' ? date("j M Y g:i:sa", $row['fax_epoch']) : date("j M Y H:i:s", $row['fax_epoch']))."</a> </td>\n";
|
echo " <td><a href='".$list_row_url."'>".(!empty($_SESSION['domain']['time_format']['text']) && $_SESSION['domain']['time_format']['text'] == '12h' ? date("j M Y g:i:sa", $row['fax_epoch']) : date("j M Y H:i:s", $row['fax_epoch']))."</a> </td>\n";
|
||||||
echo " <td>".$row['fax_success']." </td>\n";
|
echo " <td>".$row['fax_success']." </td>\n";
|
||||||
echo " <td>".$row['fax_result_code']." </td>\n";
|
echo " <td>".$row['fax_result_code']." </td>\n";
|
||||||
echo " <td>".$row['fax_result_text']." </td>\n";
|
echo " <td>".$row['fax_result_text']." </td>\n";
|
||||||
@@ -215,7 +216,7 @@
|
|||||||
//echo " <td>".$row['fax_retry_sleep']." </td>\n";
|
//echo " <td>".$row['fax_retry_sleep']." </td>\n";
|
||||||
echo " <td>".basename($row['fax_uri'])." </td>\n";
|
echo " <td>".basename($row['fax_uri'])." </td>\n";
|
||||||
//echo " <td>".$row['fax_epoch']." </td>\n";
|
//echo " <td>".$row['fax_epoch']." </td>\n";
|
||||||
if ($_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
|
if (!empty($_SESSION['theme']['list_row_edit_button']['boolean']) && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
|
||||||
echo " <td class='action-button'>\n";
|
echo " <td class='action-button'>\n";
|
||||||
echo button::create(['type'=>'button','title'=>$text['button-view'],'icon'=>$_SESSION['theme']['button_icon_view'],'link'=>$list_row_url]);
|
echo button::create(['type'=>'button','title'=>$text['button-view'],'icon'=>$_SESSION['theme']['button_icon_view'],'link'=>$list_row_url]);
|
||||||
echo " </td>\n";
|
echo " </td>\n";
|
||||||
@@ -228,7 +229,7 @@
|
|||||||
|
|
||||||
echo "</table>\n";
|
echo "</table>\n";
|
||||||
echo "<br />\n";
|
echo "<br />\n";
|
||||||
echo "<div align='center'>".$paging_controls."</div>\n";
|
echo "<div align='center'>".($paging_controls ?? '')."</div>\n";
|
||||||
echo "<input type='hidden' name='id' value='".escape($fax_uuid)."'>\n";
|
echo "<input type='hidden' name='id' value='".escape($fax_uuid)."'>\n";
|
||||||
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";
|
||||||
|
|||||||
Reference in New Issue
Block a user