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

Database transactions

Browse Source 
Change the select statement to a left outer join so when either domain_uuid or user_uuid is null it will still be able to display the data. This will keep the total number of records the same as the count done above

* dos2unix on app/database_transactions/database_transactions.php
This commit is contained in:
Mafoo
2017-06-14 07:22:01 -07:00
committed by FusionPBX
parent bc42f4fac3
commit 9abe2ca4a0
1 changed files with 204 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/database_transactions/database_transactions.php
+204 -204
View File
@@ -1,204 +1,204 @@
<?php <?php
/* /*
FusionPBX FusionPBX
Version: MPL 1.1 Version: MPL 1.1
The contents of this file are subject to the Mozilla Public License Version The contents of this file are subject to the Mozilla Public License Version
1.1 (the "License"); you may not use this file except in compliance with 1.1 (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at the License. You may obtain a copy of the License at
http://www.mozilla.org/MPL/ http://www.mozilla.org/MPL/
Software distributed under the License is distributed on an "AS IS" basis, Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
for the specific language governing rights and limitations under the for the specific language governing rights and limitations under the
License. License.
The Original Code is FusionPBX The Original Code is FusionPBX
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) 2016 Portions created by the Initial Developer are Copyright (C) 2016
the Initial Developer. All Rights Reserved. the Initial Developer. All Rights Reserved.
Contributor(s): Contributor(s):
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
*/ */
//includes //includes
require_once "root.php"; require_once "root.php";
require_once "resources/require.php"; require_once "resources/require.php";
//check permissions //check permissions
require_once "resources/check_auth.php"; require_once "resources/check_auth.php";
if (permission_exists('database_transaction_view')) { if (permission_exists('database_transaction_view')) {
//access granted //access granted
} }
else { else {
echo "access denied"; echo "access denied";
exit; exit;
} }
//add multi-lingual support //add multi-lingual support
$language = new text; $language = new text;
$text = $language->get(); $text = $language->get();
//get variables used to control the order //get variables used to control the order
$order_by = check_str($_GET["order_by"]); $order_by = check_str($_GET["order_by"]);
$order = check_str($_GET["order"]); $order = check_str($_GET["order"]);
//add the search term //add the search term
$search = strtolower(check_str($_GET["search"])); $search = strtolower(check_str($_GET["search"]));
if (strlen($search) > 0) { if (strlen($search) > 0) {
$sql_search = "and ("; $sql_search = "and (";
$sql_search .= " lower(transaction_code) like '%".$search."%' "; $sql_search .= " lower(transaction_code) like '%".$search."%' ";
$sql_search .= " or lower(transaction_address) like '%".$search."%' "; $sql_search .= " or lower(transaction_address) like '%".$search."%' ";
$sql_search .= " or lower(transaction_type) like '%".$search."%' "; $sql_search .= " or lower(transaction_type) like '%".$search."%' ";
$sql_search .= " or lower(app_name) like '%".$search."%' "; $sql_search .= " or lower(app_name) like '%".$search."%' ";
$sql_search .= ") "; $sql_search .= ") ";
} }
//additional includes //additional includes
require_once "resources/header.php"; require_once "resources/header.php";
require_once "resources/paging.php"; require_once "resources/paging.php";
//prepare to page the results //prepare to page the results
$sql = "select count(database_transaction_uuid) as num_rows from v_database_transactions "; $sql = "select count(database_transaction_uuid) as num_rows from v_database_transactions ";
$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' "; $sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
$sql .= $sql_search; $sql .= $sql_search;
if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; } if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
$prep_statement = $db->prepare($sql); $prep_statement = $db->prepare($sql);
if ($prep_statement) { if ($prep_statement) {
$prep_statement->execute(); $prep_statement->execute();
$row = $prep_statement->fetch(PDO::FETCH_ASSOC); $row = $prep_statement->fetch(PDO::FETCH_ASSOC);
if ($row['num_rows'] > 0) { if ($row['num_rows'] > 0) {
$num_rows = $row['num_rows']; $num_rows = $row['num_rows'];
} }
else { else {
$num_rows = '0'; $num_rows = '0';
} }
} }
//prepare to page the results //prepare to page the results
$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
$param = ""; $param = "";
$page = $_GET['page']; $page = $_GET['page'];
if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page); list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page);
$offset = $rows_per_page * $page; $offset = $rows_per_page * $page;
//get the list //get the list
$sql = "select "; $sql = "select ";
$sql .= "t.database_transaction_uuid, d.domain_name, u.username, t.user_uuid, t.app_name, t.app_uuid, "; $sql .= "t.database_transaction_uuid, d.domain_name, u.username, t.user_uuid, t.app_name, t.app_uuid, ";
$sql .= "t.transaction_code, t.transaction_address, t.transaction_type, t.transaction_date "; $sql .= "t.transaction_code, t.transaction_address, t.transaction_type, t.transaction_date ";
$sql .= "from v_database_transactions as t, v_domains as d, v_users as u "; $sql .= "from v_database_transactions as t ";
$sql .= "where t.domain_uuid = '".$_SESSION['domain_uuid']."' "; $sql .= "LEFT OUTER JOIN v_domains as d USING (domain_uuid) ";
$sql .= "and t.user_uuid = u.user_uuid "; $sql .= "LEFT OUTER JOIN v_users as u USING (user_uuid) ";
$sql .= "and t.domain_uuid = d.domain_uuid "; $sql .= "where t.domain_uuid = '".$_SESSION['domain_uuid']."' ";
$sql .= $sql_search; $sql .= $sql_search;
if (strlen($order_by) == 0) { if (strlen($order_by) == 0) {
$sql .= "order by transaction_date desc "; $sql .= "order by transaction_date desc ";
} }
else { else {
$sql .= "order by $order_by $order "; $sql .= "order by $order_by $order ";
} }
$sql .= "limit $rows_per_page offset $offset "; $sql .= "limit $rows_per_page offset $offset ";
$prep_statement = $db->prepare(check_sql($sql)); $prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute(); $prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED); $result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
unset ($prep_statement, $sql); unset ($prep_statement, $sql);
//alternate the row style //alternate the row style
$c = 0; $c = 0;
$row_style["0"] = "row_style0"; $row_style["0"] = "row_style0";
$row_style["1"] = "row_style1"; $row_style["1"] = "row_style1";
//show the content //show the content
echo "<table width='100%' border='0'>\n"; echo "<table width='100%' border='0'>\n";
echo " <tr>\n"; echo " <tr>\n";
echo " <td width='50%' align='left' nowrap='nowrap'><b>".$text['title-database_transactions']."</b></td>\n"; echo " <td width='50%' align='left' nowrap='nowrap'><b>".$text['title-database_transactions']."</b></td>\n";
echo " <form method='get' action=''>\n"; echo " <form method='get' action=''>\n";
echo " <td width='50%' style='vertical-align: top; text-align: right; white-space: nowrap;'>\n"; echo " <td width='50%' style='vertical-align: top; text-align: right; white-space: nowrap;'>\n";
echo " <input type='text' class='txt' style='width: 150px' name='search' id='search' value='".$search."'>\n"; echo " <input type='text' class='txt' style='width: 150px' name='search' id='search' value='".$search."'>\n";
echo " <input type='submit' class='btn' name='submit' value='".$text['button-search']."'>\n"; echo " <input type='submit' class='btn' name='submit' value='".$text['button-search']."'>\n";
echo " </td>\n"; echo " </td>\n";
echo " </form>\n"; echo " </form>\n";
echo " </tr>\n"; echo " </tr>\n";
echo "</table>\n"; echo "</table>\n";
echo "<table class='tr_hover' width='100%' border='0' cellpadding='0' cellspacing='0'>\n"; echo "<table class='tr_hover' width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
echo "<tr>\n"; echo "<tr>\n";
echo th_order_by('domain_name', $text['label-domain'], $order_by, $order); echo th_order_by('domain_name', $text['label-domain'], $order_by, $order);
echo th_order_by('username', $text['label-user_uuid'], $order_by, $order); echo th_order_by('username', $text['label-user_uuid'], $order_by, $order);
echo th_order_by('app_name', $text['label-app_name'], $order_by, $order); echo th_order_by('app_name', $text['label-app_name'], $order_by, $order);
echo th_order_by('transaction_code', $text['label-transaction_code'], $order_by, $order); echo th_order_by('transaction_code', $text['label-transaction_code'], $order_by, $order);
echo th_order_by('transaction_address', $text['label-transaction_address'], $order_by, $order); echo th_order_by('transaction_address', $text['label-transaction_address'], $order_by, $order);
//echo th_order_by('transaction_type', $text['label-transaction_type'], $order_by, $order); //echo th_order_by('transaction_type', $text['label-transaction_type'], $order_by, $order);
echo th_order_by('transaction_date', $text['label-transaction_date'], $order_by, $order); echo th_order_by('transaction_date', $text['label-transaction_date'], $order_by, $order);
//echo th_order_by('transaction_old', $text['label-transaction_old'], $order_by, $order); //echo th_order_by('transaction_old', $text['label-transaction_old'], $order_by, $order);
//echo th_order_by('transaction_new', $text['label-transaction_new'], $order_by, $order); //echo th_order_by('transaction_new', $text['label-transaction_new'], $order_by, $order);
//echo th_order_by('transaction_result', $text['label-transaction_result'], $order_by, $order); //echo th_order_by('transaction_result', $text['label-transaction_result'], $order_by, $order);
echo "<td class='list_control_icons'>"; echo "<td class='list_control_icons'>";
if (permission_exists('database_transaction_add')) { if (permission_exists('database_transaction_add')) {
echo "<a href='database_transaction_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>"; echo "<a href='database_transaction_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>";
} }
else { else {
echo "&nbsp;\n"; echo "&nbsp;\n";
} }
echo "</td>\n"; echo "</td>\n";
echo "<tr>\n"; echo "<tr>\n";
if (is_array($result)) { if (is_array($result)) {
foreach($result as $row) { foreach($result as $row) {
if (permission_exists('database_transaction_edit')) { if (permission_exists('database_transaction_edit')) {
$tr_link = "href='database_transaction_edit.php?id=".$row['database_transaction_uuid']."'"; $tr_link = "href='database_transaction_edit.php?id=".$row['database_transaction_uuid']."'";
} }
echo "<tr ".$tr_link.">\n"; echo "<tr ".$tr_link.">\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['domain_name']."&nbsp;</td>\n"; echo " <td valign='top' class='".$row_style[$c]."'>".$row['domain_name']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['username']."&nbsp;</td>\n"; echo " <td valign='top' class='".$row_style[$c]."'>".$row['username']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['app_name']."&nbsp;</td>\n"; echo " <td valign='top' class='".$row_style[$c]."'>".$row['app_name']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['transaction_code']."&nbsp;</td>\n"; echo " <td valign='top' class='".$row_style[$c]."'>".$row['transaction_code']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['transaction_address']."&nbsp;</td>\n"; echo " <td valign='top' class='".$row_style[$c]."'>".$row['transaction_address']."&nbsp;</td>\n";
//echo " <td valign='top' class='".$row_style[$c]."'>".$row['transaction_type']."&nbsp;</td>\n"; //echo " <td valign='top' class='".$row_style[$c]."'>".$row['transaction_type']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['transaction_date']."&nbsp;</td>\n"; echo " <td valign='top' class='".$row_style[$c]."'>".$row['transaction_date']."&nbsp;</td>\n";
//echo " <td valign='top' class='".$row_style[$c]."'>".$row['transaction_old']."&nbsp;</td>\n"; //echo " <td valign='top' class='".$row_style[$c]."'>".$row['transaction_old']."&nbsp;</td>\n";
//echo " <td valign='top' class='".$row_style[$c]."'>".$row['transaction_new']."&nbsp;</td>\n"; //echo " <td valign='top' class='".$row_style[$c]."'>".$row['transaction_new']."&nbsp;</td>\n";
//echo " <td valign='top' class='".$row_style[$c]."'>".$row['transaction_result']."&nbsp;</td>\n"; //echo " <td valign='top' class='".$row_style[$c]."'>".$row['transaction_result']."&nbsp;</td>\n";
echo " <td class='list_control_icons'>"; echo " <td class='list_control_icons'>";
if (permission_exists('database_transaction_edit')) { if (permission_exists('database_transaction_edit')) {
echo "<a href='database_transaction_edit.php?id=".$row['database_transaction_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>"; echo "<a href='database_transaction_edit.php?id=".$row['database_transaction_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>";
} }
if (permission_exists('database_transaction_delete')) { if (permission_exists('database_transaction_delete')) {
echo "<a href='database_transaction_delete.php?id=".$row['database_transaction_uuid']."' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>"; echo "<a href='database_transaction_delete.php?id=".$row['database_transaction_uuid']."' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>";
} }
echo " </td>\n"; echo " </td>\n";
echo "</tr>\n"; echo "</tr>\n";
if ($c==0) { $c=1; } else { $c=0; } if ($c==0) { $c=1; } else { $c=0; }
} //end foreach } //end foreach
unset($sql, $result, $row_count); unset($sql, $result, $row_count);
} //end if results } //end if results
echo "<tr>\n"; echo "<tr>\n";
echo "<td colspan='11' align='left'>\n"; echo "<td colspan='11' align='left'>\n";
echo " <table width='100%' cellpadding='0' cellspacing='0'>\n"; echo " <table width='100%' cellpadding='0' cellspacing='0'>\n";
echo " <tr>\n"; echo " <tr>\n";
echo " <td width='33.3%' nowrap='nowrap'>&nbsp;</td>\n"; echo " <td width='33.3%' nowrap='nowrap'>&nbsp;</td>\n";
echo " <td width='33.3%' align='center' nowrap='nowrap'>$paging_controls</td>\n"; echo " <td width='33.3%' align='center' nowrap='nowrap'>$paging_controls</td>\n";
echo " <td class='list_control_icons'>"; echo " <td class='list_control_icons'>";
if (permission_exists('database_transaction_add')) { if (permission_exists('database_transaction_add')) {
echo "<a href='database_transaction_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>"; echo "<a href='database_transaction_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>";
} }
else { else {
echo "&nbsp;"; echo "&nbsp;";
} }
echo " </td>\n"; echo " </td>\n";
echo " </tr>\n"; echo " </tr>\n";
echo " </table>\n"; echo " </table>\n";
echo "</td>\n"; echo "</td>\n";
echo "</tr>\n"; echo "</tr>\n";
echo "</table>"; echo "</table>";
echo "<br /><br />"; echo "<br /><br />";
//include the footer //include the footer
require_once "resources/footer.php"; require_once "resources/footer.php";
?> ?>