mirror of
https://github.com/itflow-org/itflow
synced 2026-03-19 04:04:51 +00:00
Fixed Canned Dates issue where seach queries would not work
This commit is contained in:
@@ -47,7 +47,7 @@ if(isset($_GET['o'])){
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Date Filter
|
//Date Filter
|
||||||
if($_GET['canned_date'] =="custom"){
|
if($_GET['canned_date'] == "custom" AND !empty($_GET['dtf'])){
|
||||||
$dtf = $_GET['dtf'];
|
$dtf = $_GET['dtf'];
|
||||||
$dtt = $_GET['dtt'];
|
$dtt = $_GET['dtt'];
|
||||||
}elseif($_GET['canned_date'] == "today"){
|
}elseif($_GET['canned_date'] == "today"){
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ if(isset($_GET['o'])){
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Date Filter
|
//Date Filter
|
||||||
if($_GET['canned_date'] =="custom"){
|
if($_GET['canned_date'] == "custom" AND !empty($_GET['dtf'])){
|
||||||
$dtf = $_GET['dtf'];
|
$dtf = $_GET['dtf'];
|
||||||
$dtt = $_GET['dtt'];
|
$dtt = $_GET['dtt'];
|
||||||
}elseif($_GET['canned_date'] == "today"){
|
}elseif($_GET['canned_date'] == "today"){
|
||||||
@@ -112,7 +112,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
|
|||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label>Canned Date</label>
|
<label>Canned Date</label>
|
||||||
<select class="form-control select2" name="canned_date">
|
<select class="form-control select2" name="canned_date">
|
||||||
<option <?php if($_GET['canned_date'] == "custom"){ echo "selected"; } ?> value="custom">Custom</option>
|
<option <?php if($_GET['canned_date'] == "custom"){ echo "selected"; } ?> value="">Custom</option>
|
||||||
<option <?php if($_GET['canned_date'] == "today"){ echo "selected"; } ?> value="today">Today</option>
|
<option <?php if($_GET['canned_date'] == "today"){ echo "selected"; } ?> value="today">Today</option>
|
||||||
<option <?php if($_GET['canned_date'] == "yesterday"){ echo "selected"; } ?> value="yesterday">Yesterday</option>
|
<option <?php if($_GET['canned_date'] == "yesterday"){ echo "selected"; } ?> value="yesterday">Yesterday</option>
|
||||||
<option <?php if($_GET['canned_date'] == "thisweek"){ echo "selected"; } ?> value="thisweek">This Week</option>
|
<option <?php if($_GET['canned_date'] == "thisweek"){ echo "selected"; } ?> value="thisweek">This Week</option>
|
||||||
|
|||||||
@@ -88,7 +88,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Date Filter
|
//Date Filter
|
||||||
if($_GET['canned_date'] =="custom"){
|
if($_GET['canned_date'] == "custom" AND !empty($_GET['dtf'])){
|
||||||
$dtf = $_GET['dtf'];
|
$dtf = $_GET['dtf'];
|
||||||
$dtt = $_GET['dtt'];
|
$dtt = $_GET['dtt'];
|
||||||
}elseif($_GET['canned_date'] == "today"){
|
}elseif($_GET['canned_date'] == "today"){
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ if(isset($_GET['o'])){
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Date Filter
|
//Date Filter
|
||||||
if($_GET['canned_date'] =="custom"){
|
if($_GET['canned_date'] == "custom" AND !empty($_GET['dtf'])){
|
||||||
$dtf = $_GET['dtf'];
|
$dtf = $_GET['dtf'];
|
||||||
$dtt = $_GET['dtt'];
|
$dtt = $_GET['dtt'];
|
||||||
}elseif($_GET['canned_date'] == "today"){
|
}elseif($_GET['canned_date'] == "today"){
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ if(isset($_GET['o'])){
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Date Filter
|
//Date Filter
|
||||||
if($_GET['canned_date'] =="custom"){
|
if($_GET['canned_date'] == "custom" AND !empty($_GET['dtf'])){
|
||||||
$dtf = $_GET['dtf'];
|
$dtf = $_GET['dtf'];
|
||||||
$dtt = $_GET['dtt'];
|
$dtt = $_GET['dtt'];
|
||||||
}elseif($_GET['canned_date'] == "today"){
|
}elseif($_GET['canned_date'] == "today"){
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ if(isset($_GET['o'])){
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Date Filter
|
//Date Filter
|
||||||
if($_GET['canned_date'] =="custom"){
|
if($_GET['canned_date'] == "custom" AND !empty($_GET['dtf'])){
|
||||||
$dtf = $_GET['dtf'];
|
$dtf = $_GET['dtf'];
|
||||||
$dtt = $_GET['dtt'];
|
$dtt = $_GET['dtt'];
|
||||||
}elseif($_GET['canned_date'] == "today"){
|
}elseif($_GET['canned_date'] == "today"){
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ if(isset($_GET['o'])){
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Date Filter
|
//Date Filter
|
||||||
if($_GET['canned_date'] =="custom"){
|
if($_GET['canned_date'] == "custom" AND !empty($_GET['dtf'])){
|
||||||
$dtf = $_GET['dtf'];
|
$dtf = $_GET['dtf'];
|
||||||
$dtt = $_GET['dtt'];
|
$dtt = $_GET['dtt'];
|
||||||
}elseif($_GET['canned_date'] == "today"){
|
}elseif($_GET['canned_date'] == "today"){
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Date Filter
|
//Date Filter
|
||||||
if($_GET['canned_date'] =="custom"){
|
if($_GET['canned_date'] == "custom" AND !empty($_GET['dtf'])){
|
||||||
$dtf = $_GET['dtf'];
|
$dtf = $_GET['dtf'];
|
||||||
$dtt = $_GET['dtt'];
|
$dtt = $_GET['dtt'];
|
||||||
}elseif($_GET['canned_date'] == "today"){
|
}elseif($_GET['canned_date'] == "today"){
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ if(isset($_GET['o'])){
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Date Filter
|
//Date Filter
|
||||||
if($_GET['canned_date'] =="custom"){
|
if($_GET['canned_date'] == "custom" AND !empty($_GET['dtf'])){
|
||||||
$dtf = $_GET['dtf'];
|
$dtf = $_GET['dtf'];
|
||||||
$dtt = $_GET['dtt'];
|
$dtt = $_GET['dtt'];
|
||||||
}elseif($_GET['canned_date'] == "today"){
|
}elseif($_GET['canned_date'] == "today"){
|
||||||
|
|||||||
@@ -37,7 +37,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Date Filter
|
//Date Filter
|
||||||
if($_GET['canned_date'] =="custom"){
|
if($_GET['canned_date'] == "custom" AND !empty($_GET['dtf'])){
|
||||||
$dtf = $_GET['dtf'];
|
$dtf = $_GET['dtf'];
|
||||||
$dtt = $_GET['dtt'];
|
$dtt = $_GET['dtt'];
|
||||||
}elseif($_GET['canned_date'] == "today"){
|
}elseif($_GET['canned_date'] == "today"){
|
||||||
|
|||||||
Reference in New Issue
Block a user