updates in work to use fix_date function
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
/*
|
||||
blankpage.php
|
||||
schedmaint.php
|
||||
OpenLog Online Logbook
|
||||
Copyright (C) 2026 Rod Wright
|
||||
|
||||
@@ -73,7 +73,7 @@ $errorstack = array();
|
||||
if ($action) {
|
||||
if ($complete) {
|
||||
// sanitize user input
|
||||
$completedate = mysqli_real_escape_string($db, $completedate);
|
||||
$completedate = fix_date($completedate);
|
||||
// update events
|
||||
mysqli_query($db, "update events set last_date=\"$completedate\", deferred_flag=0, deferred_date=\"0000-00-00\" where eventid=\"$id\"");
|
||||
if ($addlognote) {
|
||||
@@ -88,6 +88,7 @@ if ($action) {
|
||||
}
|
||||
}
|
||||
if ($defer) {
|
||||
$deferuntil = fix_date($deferuntil);
|
||||
// update events
|
||||
mysqli_query($db, "update events set deferred_flag=1, deferred_date=\"$deferuntil\" where eventid=\"$id\"");
|
||||
}
|
||||
@@ -110,9 +111,12 @@ if ($add) {
|
||||
$errorstack[] = "<img src=\"icons/exclamation-red.png\" border=\"0\"> You didn't select a device.<br>";
|
||||
}
|
||||
// sanitize text data
|
||||
$start_date = mysqli_real_escape_string($db, $start_date);
|
||||
$last_date = mysqli_real_escape_string($db, $last_date);
|
||||
$deferred_date = mysqli_real_escape_string($db, $deferred_date);
|
||||
if ($start_date == NULL) $start_date = $today;
|
||||
if ($last_date == NULL) $last_date = "0001-01-01";
|
||||
if ($deferred_date == NULL) $deferred_date = "0001-01-01";
|
||||
$start_date = fix_date($start_date);
|
||||
$last_date = fix_date($last_date);
|
||||
$deferred_date = fix_date($deferred_date);
|
||||
if ($taskselected && $deviceselected) {
|
||||
// determine if device represents a group and break out individual devices
|
||||
if (dblookup($db, "devices", "deviceid", "group_flag", $device)) {
|
||||
@@ -126,9 +130,7 @@ if ($add) {
|
||||
}
|
||||
// run through the memberlist and modify the table
|
||||
foreach ($memberlist as $memberdev) {
|
||||
if ($start_date == NULL) $start_date = $today;
|
||||
if ($last_date == NULL) $last_date = "0000-00-00";
|
||||
if ($deferred_date == NULL) $deferred_date = "0000-00-00";
|
||||
|
||||
$addqry = ("insert into events(task,device,start_date,last_date,deferred_flag,deferred_date,active_flag)
|
||||
values(\"$task\",\"$memberdev\",\"$start_date\",\"$last_date\",\"$deferred_flag\",\"$deferred_date\",\"$active_flag\")");
|
||||
mysqli_query($db, $addqry);
|
||||
@@ -199,13 +201,13 @@ if ($edit) {
|
||||
if ($update) {
|
||||
// do error checking
|
||||
// sanitize text data
|
||||
$start_date = mysqli_real_escape_string($db, $start_date);
|
||||
$last_date = mysqli_real_escape_string($db, $last_date);
|
||||
$deferred_date = mysqli_real_escape_string($db, $deferred_date);
|
||||
// update the tasks table
|
||||
if ($start_date == NULL) $start_date = $today;
|
||||
if ($last_date == NULL) $last_date = "0000-00-00";
|
||||
if ($deferred_date == NULL) $deferred_date = "0000-00-00";
|
||||
if ($last_date == NULL) $last_date = "0001-01-01";
|
||||
if ($deferred_date == NULL) $deferred_date = "0001-01-01";
|
||||
$start_date = fix_date($start_date);
|
||||
$last_date = fix_date($last_date);
|
||||
$deferred_date = fix_date($deferred_date);
|
||||
// update the tasks table
|
||||
mysqli_query($db, "update events
|
||||
set task=\"$task\",device=\"$device\",start_date=\"$start_date\",last_date=\"$last_date\",deferred_flag=\"$deferred_flag\",
|
||||
deferred_date=\"$deferred_date\",active_flag=\"$active_flag\"
|
||||
@@ -404,9 +406,9 @@ if ($action) {
|
||||
} else {
|
||||
$deferredtag = "<input type=\"checkbox\" name=\"deferred_flag\" value=\"1\">";
|
||||
}
|
||||
if ($start_date == "0000-00-00") $start_date = $today;
|
||||
if ($last_date == "0000-00-00") $last_date = "";
|
||||
if ($deferred_date == "0000-00-00") $deferred_date = $tomorrow;
|
||||
if ($start_date == "0001-01-01") $start_date = $today;
|
||||
//if ($last_date == "0001-01-01") $last_date = "";
|
||||
if ($deferred_date == "0001-01-01") $deferred_date = $tomorrow;
|
||||
$deferuntiltag = "<input type=\"text\" name=\"deferred_date\" id=\"deferdatepicker\" size=\"10\" maxlength=\"10\" value=\"$deferred_date\" title=\"Format: YYYY-MM-DD\">";
|
||||
$startdatetag = "<input type=\"text\" name=\"start_date\" id=\"startdatepicker\" size=\"10\" maxlength=\"10\" value=\"$start_date\" title=\"Format: YYYY-MM-DD\">";
|
||||
$lastdatetag = "<input type=\"text\" name=\"last_date\" id=\"completedatepicker\" size=\"10\" maxlength=\"10\" value=\"$last_date\" title=\"Format: YYYY-MM-DD\">";
|
||||
@@ -487,7 +489,7 @@ if ($action) {
|
||||
";
|
||||
while ($tablerow = mysqli_fetch_assoc($existingdata)) {
|
||||
extract($tablerow);
|
||||
if ($start_date == "0000-00-00") $start_date = $today;
|
||||
if ($start_date == "0001-01-01") $start_date = $today;
|
||||
if ($last_date == "0000-00-00") $last_date = "";
|
||||
if ($deferred_date == "0000-00-00") $deferred_date = "";
|
||||
if ($active_flag) {
|
||||
|
||||
Reference in New Issue
Block a user