mirror of
https://github.com/itflow-org/itflow
synced 2026-03-22 21:45:37 +00:00
More Var Fixes
This commit is contained in:
@@ -36,6 +36,12 @@ if(isset($_GET['o'])){
|
|||||||
$disp = "DESC";
|
$disp = "DESC";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(empty($_GET['canned_date'])) {
|
||||||
|
//Prevents lots of undefined variable errors.
|
||||||
|
// $dtf and $dtt will be set by the below else to 0000-00-00 / 9999-00-00
|
||||||
|
$_GET['canned_date'] = 'custom';
|
||||||
|
}
|
||||||
|
|
||||||
//Date Filter
|
//Date Filter
|
||||||
if($_GET['canned_date'] == "custom" AND !empty($_GET['dtf'])){
|
if($_GET['canned_date'] == "custom" AND !empty($_GET['dtf'])){
|
||||||
$dtf = mysqli_real_escape_string($mysqli,$_GET['dtf']);
|
$dtf = mysqli_real_escape_string($mysqli,$_GET['dtf']);
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ if($_GET['canned_date'] == "custom" AND !empty($_GET['dtf'])){
|
|||||||
//Rebuild URL
|
//Rebuild URL
|
||||||
$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
|
$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
|
||||||
|
|
||||||
$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS expense_date AS transfer_date, expense_amount AS transfer_amount, expense_account_id AS transfer_account_from, revenue_account_id AS transfer_account_to, transfer_expense_id, transfer_revenue_id , transfer_id, transfer_notes FROM transfers, expenses, revenues
|
$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS transfer_created_at, expense_date AS transfer_date, expense_amount AS transfer_amount, expense_account_id AS transfer_account_from, revenue_account_id AS transfer_account_to, transfer_expense_id, transfer_revenue_id , transfer_id, transfer_notes FROM transfers, expenses, revenues
|
||||||
WHERE transfer_expense_id = expense_id
|
WHERE transfer_expense_id = expense_id
|
||||||
AND transfer_revenue_id = revenue_id
|
AND transfer_revenue_id = revenue_id
|
||||||
AND transfers.company_id = $session_company_id
|
AND transfers.company_id = $session_company_id
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<div class="modal-dialog">
|
<div class="modal-dialog">
|
||||||
<div class="modal-content bg-dark">
|
<div class="modal-content bg-dark">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<h5 class="modal-title"><i class="fa fa-fw fa-users"></i> <?php echo $name; ?> Clients</h5>
|
<h5 class="modal-title"><i class="fa fa-fw fa-users"></i> <?php echo $user_name; ?> Clients</h5>
|
||||||
<button type="button" class="close text-white" data-dismiss="modal">
|
<button type="button" class="close text-white" data-dismiss="modal">
|
||||||
<span>×</span>
|
<span>×</span>
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<div class="modal-dialog">
|
<div class="modal-dialog">
|
||||||
<div class="modal-content bg-dark">
|
<div class="modal-content bg-dark">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<h5 class="modal-title"><i class="fa fa-fw fa-building"></i> <?php echo $name; ?> Companies</h5>
|
<h5 class="modal-title"><i class="fa fa-fw fa-building"></i> <?php echo $user_name; ?> Companies</h5>
|
||||||
<button type="button" class="close text-white" data-dismiss="modal">
|
<button type="button" class="close text-white" data-dismiss="modal">
|
||||||
<span>×</span>
|
<span>×</span>
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -147,7 +147,7 @@
|
|||||||
<div class="text-secondary"><?php echo $user_name; ?></div>
|
<div class="text-secondary"><?php echo $user_name; ?></div>
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td>
|
||||||
<td><a href="mailto:<?php echo $email; ?>"><?php echo $user_email; ?></a></td>
|
<td><a href="mailto:<?php echo $user_email; ?>"><?php echo $user_email; ?></a></td>
|
||||||
<td><?php echo $user_role_display; ?></td>
|
<td><?php echo $user_role_display; ?></td>
|
||||||
<td>-</td>
|
<td>-</td>
|
||||||
<td><?php echo $log_created_at; ?> <br> <small class="text-secondary"><?php echo $last_login; ?></small></td>
|
<td><?php echo $log_created_at; ?> <br> <small class="text-secondary"><?php echo $last_login; ?></small></td>
|
||||||
|
|||||||
Reference in New Issue
Block a user