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

add domain column when showing all domains (#6905)

This commit is contained in:
frytimo 2024-02-26 11:57:36 -04:00 committed by GitHub
parent 672922def0
commit d5cbebadd8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/emergency/emergency.php
View File

@ -25,6 +25,11 @@ if (!empty($_POST['emergency_logs']) && is_array($_POST['emergency_logs'])) {
$emergency_logs = $_POST['emergency_logs']; $emergency_logs = $_POST['emergency_logs'];
} }
//prepare the database object
$database = new database;
$database->app_name = 'emergency_logs';
$database->app_uuid = 'de63b1ae-7750-11ee-b3a5-005056a27559';
//process the http post data by action //process the http post data by action
if (!empty($action) && !empty($emergency_logs) && is_array($emergency_logs) && @sizeof($emergency_logs) != 0) { if (!empty($action) && !empty($emergency_logs) && is_array($emergency_logs) && @sizeof($emergency_logs) != 0) {
@ -45,11 +50,6 @@ if (!empty($action) && !empty($emergency_logs) && is_array($emergency_logs) && @
} }
} }
//prepare the database object
$database = new database;
$database->app_name = 'emergency_logs';
$database->app_uuid = 'de63b1ae-7750-11ee-b3a5-005056a27559';
//send the array to the database class //send the array to the database class
if (!empty($action) && $action == 'delete') { if (!empty($action) && $action == 'delete') {
$database->delete($array); $database->delete($array);
@ -94,7 +94,6 @@ if (!empty($search)) {
$sql .= ") "; $sql .= ") ";
$parameters['search'] = '%'.$search.'%'; $parameters['search'] = '%'.$search.'%';
} }
$database = new database;
$num_rows = $database->select($sql, $parameters ?? null, 'column'); $num_rows = $database->select($sql, $parameters ?? null, 'column');
unset($sql, $parameters); unset($sql, $parameters);
@ -140,7 +139,6 @@ if (!empty($search)) {
$sql .= "order by insert_date desc "; $sql .= "order by insert_date desc ";
$sql .= limit_offset($rows_per_page, $offset); $sql .= limit_offset($rows_per_page, $offset);
$parameters['time_zone'] = $time_zone; $parameters['time_zone'] = $time_zone;
$database = new database;
$emergency_logs = $database->select($sql, $parameters ?? null, 'all'); $emergency_logs = $database->select($sql, $parameters ?? null, 'all');
unset($sql, $parameters); unset($sql, $parameters);
@ -187,6 +185,9 @@ echo "<br /><br />\n";
echo "<table class='list'>\n"; echo "<table class='list'>\n";
echo "<tr class='list-header'>\n"; echo "<tr class='list-header'>\n";
if (!empty($show) && $show == 'all' && permission_exists('emergency_logs_view_all')) {
echo th_order_by('domain_name', $text['label-domain'], $order_by, $order);
}
echo "<th class='left'>".$text['label-emergency_time']."</th>\n"; echo "<th class='left'>".$text['label-emergency_time']."</th>\n";
echo "<th class='left'>".$text['label-emergency_date']."</th>\n"; echo "<th class='left'>".$text['label-emergency_date']."</th>\n";
echo "<th class='left'>".$text['label-emergency_extension']."</th>\n"; echo "<th class='left'>".$text['label-emergency_extension']."</th>\n";
@ -197,6 +198,9 @@ if (!empty($emergency_logs) && is_array($emergency_logs) && @sizeof($emergency_l
$x = 0; $x = 0;
foreach ($emergency_logs as $row) { foreach ($emergency_logs as $row) {
echo "<tr class='list-row'>\n"; echo "<tr class='list-row'>\n";
if (!empty($_GET['show']) && $_GET['show'] == 'all' && permission_exists('emergency_logs_view_all')) {
echo " <td>".escape($_SESSION['domains'][$row['domain_uuid']]['domain_name'])."</td>\n";
}
echo " <td>".escape($row['time_formatted'])."</td>\n"; echo " <td>".escape($row['time_formatted'])."</td>\n";
echo " <td>".escape($row['date_formatted'])."</td>\n"; echo " <td>".escape($row['date_formatted'])."</td>\n";
echo " <td>".escape($row['extension'])."</td>\n"; echo " <td>".escape($row['extension'])."</td>\n";