Incorporate changes made for old version 5.2.4.2

This commit is contained in:
2026-02-10 15:01:54 -05:00
parent 3a0cf99432
commit 6b720a6163
9 changed files with 45 additions and 16 deletions

View File

@@ -84,6 +84,7 @@ if ($search) {
$srchpname=trim($srchpname);
$srchploc=trim($srchploc);
$srchnha=trim($srchnha);
if ($target[0]=="") $target=[];
if (in_array("log",$target)) {
// define the query constraints
// log note id
@@ -188,6 +189,7 @@ if ($search) {
$logwhereclause=implode(" and ",$logconstraints);
$logrowqry=mysqli_query($db,"select lognotes.* from $logfromclause where $logwhereclause order by lognotes.date asc, lognotes.time asc");
}
if ($target[0]=="") $target=[];
if (in_array("maintform",$target)) {
// maintforms search
// define the query constraints
@@ -284,6 +286,7 @@ if ($search) {
$mfwhereclause=implode(" and ",$mfconstraints);
$mfrowqry=mysqli_query($db,"select maintforms.* from $mffromclause where $mfwhereclause order by maintforms.mfdate asc, maintforms.mftime asc");
}
if ($target[0]=="") $target=[];
if (in_array("part",$target)) {
// parts search
// define the query constraints
@@ -491,6 +494,7 @@ if (!$print) {
echo "
<b>Search in:</b>&nbsp;&nbsp;
";
if ($target[0]=="") $target=[];
if (in_array("log", $target)) {
echo "<input type=\"checkbox\" name=\"target[]\" value=\"log\" title=\"Search in Logbook\" checked>Logbook&nbsp;&nbsp;";
} else {
@@ -590,6 +594,7 @@ if (!$print) {
$flagcount=1;
while ($flagcheckbox=mysqli_fetch_assoc($flagslist)) {
if ($srchflags) {
if ($srchflags[0]=="") $srchflags=[];
if (in_array($flagcheckbox["flagid"],$srchflags)) {
printf("<font color=\"%s\">%s</font>",
$flagcheckbox["flagcolor"],$flagcheckbox["flagsym"]);
@@ -607,6 +612,7 @@ if (!$print) {
<br><br>
";
if ($doparts) {
if ($target[0]=="") $target=[];
echo "
<b>Search in:</b>&nbsp;&nbsp;
";
@@ -629,6 +635,7 @@ if (!$print) {
}
if ($search) {
if ($target[0]=="") $target=[];
if (in_array("log",$target)) {
// run lognotes query and show results
if(mysqli_num_rows($logrowqry)) {
@@ -686,6 +693,7 @@ if ($search) {
echo "<font size=\"+1\">No Logbook notes match your search criteria.</font><br><hr>";
}
}
if ($target[0]=="") $target=[];
if (in_array("maintform",$target)) {
// run maintforms query and show results
if(mysqli_num_rows($mfrowqry)) {
@@ -748,6 +756,7 @@ if ($search) {
echo "<font size=\"+1\">No Maintenance Forms match your search criteria.</font><br><hr>";
}
}
if ($target[0]=="") $target=[];
if (in_array("part",$target)) {
// run parts query and show results
if(mysqli_num_rows($prowqry)) {