Merge remote-tracking branch 'origin/5.3.0dev'

Added License info for the Fugue icon set

CHANGELOG

@@ -280,4 +280,5 @@
         is enabled.
     - Validate all date and time fields to prevent user entered invalid date
         formats from crashing php.
-    
+    - Fixed profile page to automatically refresh page to show the results 
+        when a user changes their color preferences.

INSTALL

@@ -4,32 +4,30 @@
 
     SPDX-License-Identifier: GPL-2.0
 
-
 Installation of OpenLog is straightforward.
 
 1. Gather the required information.
-You'll need to know how to configure your web server. This means where
-you want to put the files to be served and any configuration required to
-allow clients to reach them. You'll also need to know the username and
-password of the MySQL administrator.
+   You'll need to know how to configure your web server. This means where
+   you want to put the files to be served and any configuration required to
+   allow clients to reach them. You'll also need to know the username and
+   password of the MySQL administrator.
 
 2. Unpack
-Unpack the distribution in a convenient place (such as /tmp or My Documents).
-A directory will be created called OpenLog-x.x.x.
+   Unpack the distribution in a convenient place (such as /tmp or My Documents).
+   A directory will be created called OpenLog-x.x.x.
 
 3. Review License
-Change to the openlog-x.x.x directory and review the LICENSE file.
+   Change to the openlog-x.x.x directory and review the LICENSE file.
 
 4. Run the install script
-If installing on a Linux or Unix based system, type ./install.sh at a 
-command prompt. If installing on a Windows based system, double click 
-install.bat. Follow the prompts.
+   If installing on a Linux or Unix based system, type ./install.sh at a
+   command prompt. If installing on a Windows based system, double click
+   install.bat. Follow the prompts.
 
 5. Check and set Configuration
-Click on the Administration menu option on the main page to adjust the initial 
-settings. You will need to log in as OpenLogAdmin. The initial default password
-is "OpenLog-1". From the Administration page, you can click on the links at the
-top to add techs, subjects, shifts, etc. 
-
-7. Start using OpenLog.
+   Click on the Administration menu option on the main page to adjust the initial
+   settings. You will need to log in as OpenLogAdmin. The initial default password
+   is "OpenLog-1". From the Administration page, you can click on the links at the
+   top to add techs, subjects, shifts, etc.
 
+6. Start using OpenLog.

db.php.template

@@ -14,10 +14,10 @@
 **                            DO NOT EDIT                             **
 ************************************************************************
 */
-$appname="APPNAME";
-$dbname="DBNAME";
-$username="DBUSER";
-$dbpass="DBPASS";
+$appname = "APPNAME";
+$dbname = "DBNAME";
+$username = "DBUSER";
+$dbpass = "DBPASS";
 
 function dberrmsg($dbname) {
     echo "
@@ -34,7 +34,7 @@ function dberrmsg($dbname) {
         exit();
 }
 
-$db=@mysqli_connect("localhost",$username,$dbpass,$dbname);
+$db = @mysqli_connect("localhost",$username,$dbpass,$dbname);
 if (mysqli_errno($db)) {
     dberrmsg($dbname);
 }

distfiles/CHANGELOG

@@ -280,4 +280,7 @@
         is enabled.
     - Validate all date and time fields to prevent user entered invalid date
         formats from crashing php.
+    - Fixed profile page to automatically refresh page to show the results 
+        when a user changes their color preferences.
+
     

distfiles/admin.php

@@ -764,6 +764,7 @@ switch ($table) {
                 ";
                 // pull current values from database
                 $currentvalues = mysqli_fetch_assoc(mysqli_query($db, "select * from techs where techid=$id"));
+                if (!empty($currentvalues)) {
                     $name = $currentvalues["techname"];
                     $pass = $passconf = "password_is_unchanged";
                     $shift = $currentvalues["shift"];
@@ -777,6 +778,13 @@ switch ($table) {
                     } else {
                         $activetag = "<input type=\"checkbox\" name=\"active\">";
                     }
+                } else {
+                    $name = NULL;
+                    $pass = NULL;
+                    $shift = NULL;
+                    $admintag = "<input type=\"checkbox\" name=\"admin\">";
+                    $activetag = "<input type=\"checkbox\" name=\"active\">";
+                }
             } else {
                 // set form options for add
                 $sectiontitle = "<b>Add New Tech</b><br><br>";
@@ -878,12 +886,17 @@ switch ($table) {
                 ";
                 // pull current values from database
                 $currentvalues = mysqli_fetch_assoc(mysqli_query($db, "select * from shifts where shiftid=$id"));
+                if (!empty($currentvalues)) {
                     $name = $currentvalues["shiftname"];
                     if ($currentvalues["status"] == 1) {
                         $activetag = "<input type=\"checkbox\" name=\"active\" checked>";
                     } else {
                         $activetag = "<input type=\"checkbox\" name=\"active\">";
                     }
+                } else {
+                    $name = NULL;
+                    $activetag = "<input type=\"checkbox\" name=\"active\">";
+                }
             } else {
                 // set form options for add
                 $sectiontitle = "<b>Add New Shift</b><br><br>";
@@ -952,12 +965,17 @@ switch ($table) {
                 ";
                 // pull current values from database
                 $currentvalues = mysqli_fetch_assoc(mysqli_query($db, "select * from subjects where subjectid=$id"));
+                if (!empty($currentvalues)) {
                     $name = $currentvalues["subjectname"];
                     if ($currentvalues["status"] == 1) {
                         $activetag = "<input type=\"checkbox\" name=\"active\" checked>";
                     } else {
                         $activetag = "<input type=\"checkbox\" name=\"active\">";
                     }
+                } else {
+                    $name = "";
+                    $activetag = "<input type=\"checkbox\" name=\"active\">";
+                }
             } else {
                 // set form options for add
                 $sectiontitle = "<b>Add New Subject</b><br><br>";
@@ -1026,6 +1044,7 @@ switch ($table) {
                 ";
                 // pull current values from database
                 $currentvalues = mysqli_fetch_assoc(mysqli_query($db, "select * from links where linkid=$id"));
+                if (!empty($currentvalues)) {
                     $name = $currentvalues["displaytxt"];
                     $priority = $currentvalues["linkpriority"];
                     $url = $currentvalues["urltxt"];
@@ -1034,6 +1053,12 @@ switch ($table) {
                     } else {
                         $activetag = "<input type=\"checkbox\" name=\"active\">";
                     }
+                } else {
+                    $name = NULL;
+                    $priority = NULL;
+                    $url = NULL;
+                    $activetag = "<input type=\"checkbox\" name=\"active\">";
+                }
                 // determine where we are in the priority stack
                 $prow = mysqli_fetch_assoc(mysqli_query($db, "select min(linkpriority) as highest from links"));
                 if ($prow["highest"] == $priority) {
@@ -1145,10 +1170,22 @@ switch ($table) {
                 ";
                 // pull current values from database
                 $currentvalues = mysqli_fetch_assoc(mysqli_query($db, "select * from flags where flagid=$id"));
+                if (!empty($currentvalues)) {
                     $name = $currentvalues["flagname"];
                     $flagsym = $currentvalues["flagsym"];
                     $flagcolor = $currentvalues["flagcolor"];
                     $flagcoloropts = "";
+                    if ($currentvalues["status"] == 1) {
+                        $activetag = "<input type=\"checkbox\" name=\"active\" checked>";
+                    } else {
+                        $activetag = "<input type=\"checkbox\" name=\"active\">";
+                    }
+                } else {
+                    $name = NULL;
+                    $flagsym = NULL;
+                    $flagcolor = NULL;
+                    $activetag = "<input type=\"checkbox\" name=\"active\">";
+                }
                 foreach ($basic_colors as $cname => $chex) {
                     if ($chex == $flagcolor) {
                         $flagcoloropts = $flagcoloropts . "<option value=\"$chex\" selected>$cname</option>";
@@ -1156,11 +1193,6 @@ switch ($table) {
                         $flagcoloropts = $flagcoloropts . "<option value=\"$chex\">$cname</option>";
                     }
                 }
-                if ($currentvalues["status"] == 1) {
-                    $activetag = "<input type=\"checkbox\" name=\"active\" checked>";
-                } else {
-                    $activetag = "<input type=\"checkbox\" name=\"active\">";
-                }
             } else {
                 // set form options for add
                 $sectiontitle = "<b>Add New Flag</b><br><br>";
@@ -1246,12 +1278,17 @@ switch ($table) {
                 ";
                 // pull current values from database
                 $currentvalues = mysqli_fetch_assoc(mysqli_query($db, "select * from logpartactions where lpactionid=$id"));
+                if (!empty($currentvalues)) {
                     $name = $currentvalues["lpactionname"];
                     if ($currentvalues["status"] == 1) {
                         $activetag = "<input type=\"checkbox\" name=\"active\" checked>";
                     } else {
                         $activetag = "<input type=\"checkbox\" name=\"active\">";
                     }
+                } else {
+                    $name = NULL;
+                    $activetag = "<input type=\"checkbox\" name=\"active\">";
+                }
             } else {
                 // set form options for add
                 $sectiontitle = "<b>Add New Part Action</b><br><br>";
@@ -1320,9 +1357,15 @@ switch ($table) {
                 ";
                 // pull current values from database
                 $currentvalues = mysqli_fetch_assoc(mysqli_query($db, "select * from banners where bannerid=$id"));
+                if (!empty($currentvalues)) {
                     $name = $currentvalues["bannername"];
                     $bnrcolor = $currentvalues["bannercolor"];
                     $bnrtextcolor = $currentvalues["textcolor"];
+                } else {
+                    $name = NULL;
+                    $bnrcolor = NULL;
+                    $bnrtextcolor = NULL;
+                }
                 $bnrcoloropts = "";
                 foreach ($basic_colors as $cname => $chex) {
                     if ($chex == $bnrcolor) {

distfiles/functions.php

@@ -968,15 +968,15 @@ function templateselect($techid, $operation)
     <td>
     <select name=\"usertemplateid\" title=\"Select the user template you'd like to load and click the Load Template button. User template selection takes precedence.\">
     ";
-    if ($isadmin && $operation!=NULL) {
+    if ($isadmin && $operation != NULL) {
         $templaterow = mysqli_query($db, "select * from notetemplates where tech!=\"0\" order by tech asc, templatename asc");
     } else {
         $templaterow = mysqli_query($db, "select * from notetemplates where tech=\"$techid\" order by templatename asc");
     }
     printf("<option value=\"%s\" selected>%s</option>", "0", "Select user template");
     while ($templateitem = mysqli_fetch_assoc($templaterow)) {
-        if ($isadmin && $operation!=NULL) {
-            $techname=dblookup($db, "techs", "techid", "techname", $templateitem["tech"]);
+        if ($isadmin && $operation != NULL) {
+            $techname = dblookup($db, "techs", "techid", "techname", $templateitem["tech"]);
             printf("<option value=\"%s\">%s(%s)</option>", $templateitem["templateid"], $templateitem["templatename"], $techname);
         } else {
             printf("<option value=\"%s\">%s</option>", $templateitem["templateid"], $templateitem["templatename"]);
@@ -1020,7 +1020,7 @@ function fix_date($datestring)
 
     if (!$datestring) $datestring = $today;
     $datepatt = '/^\d{4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|[12]\d|3[01])$/';
-    if (!preg_match($datepatt,$datestring)) $datestring = $today;
+    if (!preg_match($datepatt, $datestring)) $datestring = $today;
     $datestring = mysqli_real_escape_string($db, $datestring);
     return $datestring;
 }
@@ -1034,7 +1034,7 @@ function fix_time($timestring)
 
     if (!$timestring) $timestring = $now;
     $timepatt = '/^([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]$/';
-    if (!preg_match($timepatt,$timestring)) $timestring = $now;
+    if (!preg_match($timepatt, $timestring)) $timestring = $now;
     $timestring = mysqli_real_escape_string($db, $timestring);
     return $timestring;
 }

distfiles/logentry.php

@@ -9,7 +9,7 @@
 
 include("functions.php");
 
-if (!array_key_exists("login",$_SESSION) && !array_key_exists("partview",$_REQUEST)) {
+if (!array_key_exists("login", $_SESSION) && !array_key_exists("partview", $_REQUEST)) {
     header("Location: login.php");
 }
 
@@ -500,7 +500,7 @@ if ($delete) {
     format_message(0, "<strong>Note deleted.</strong> <a href=\"lognotes.php\">Return to main page.</a>");
 }
 
-if (array_key_exists('login',$_SESSION)) {
+if (array_key_exists('login', $_SESSION)) {
     // show the template selection line
     templateselect($techid, NULL);
 }

distfiles/maintformentry.php

@@ -178,7 +178,7 @@ if ($mfadd) {
 
                 // add the record to maintforms
                 if (! $pdatamismatch) {
-                    $lognoteid = ($lognoteid==NULL) ? 0 : $lognoteid;
+                    $lognoteid = ($lognoteid == NULL) ? 0 : $lognoteid;
                     mysqli_query($db, "insert into maintforms(mfdate,mftime,mftech,mfpart,mfpartloc,mfmalfunction,nha,repord,lognoteid,pending)
                      values (\"$mfdate\", \"$mftime\",\"$loggedinas\",\"$mfpart\",\"$mfpartloc\",\"$mfmalfunction\",\"$nha\",\"$repord\",\"$lognoteid\",\"$pending\")");
                     $newmaintformid = mysqli_insert_id($db);

distfiles/profile.php

@@ -116,6 +116,8 @@ if (!$print) {
         // color settings
         $hexcolor = "#" . ltrim($hexcolor);
         putsetting($modcolor, $hexcolor, $techid);
+        $currentpage = $_SERVER['PHP_SELF'];
+        header("Refresh: .1; url=$currentpage");
     }
     if ($resetcustom) mysqli_query($db, "delete from customs where customtech=\"$techid\"");
 

distfiles/schedmaint.php

@@ -130,7 +130,6 @@ if ($add) {
             }
             // run through the memberlist and modify the table
             foreach ($memberlist as $memberdev) {
-                
                 $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);

distfiles/search.php

@@ -35,7 +35,7 @@ $srchploc = $_REQUEST['srchploc'] ?? NULL;
 $srchnha = $_REQUEST['srchnha'] ?? NULL;
 $srchrepord = $_REQUEST['srchrepord'] ?? NULL;
 $srchflags = $_POST['srchflags'] ?? [];
-$target = $_REQUEST['target'] ?? NULL;
+$target = $_REQUEST['target'] ?? ["log", "maintform", "part"];
 
 $doparts = PARTS_FUNCTIONS;
 $logname = LOG_NAME;
@@ -56,7 +56,7 @@ framework("begin", "$logname Search", "Search", $print);
 
 // echo "REQUEST variables: <br>";
 // var_dump($_REQUEST);
-
+// echo "<br>";
 
 // ******** begin database manipulation ********
 
@@ -92,7 +92,6 @@ 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
@@ -131,23 +130,6 @@ if ($search) {
             $logfromtables[] = "lognotes";
             $logconstraints[] = "lognotes.lognote like \"%$srchtext%\"";
         }
-        // flags
-        if (!empty($srchflags)) {
-            unset($flagconstraints);
-            $flagcount = count($srchflags);
-            $logfromtables[] = "lognotes";
-            $logfromtables[] = "flagmap";
-            $flagconstraints[] = "flagmap.lognoteid=lognotes.lognoteid and flagmap.flagid in (";
-            foreach ($srchflags as $flagid) {
-                $flagconstraints[] = "\"$flagid\"";
-                $flagconstraints[] = ",";
-            }
-            // remove final comma
-            array_splice($flagconstraints, -1, 1);
-            $flagconstraints[] = ") group by flagmap.lognoteid having count(distinct flagmap.flagid)=$flagcount";
-            // make flagconstraints a single string so that the final implode doesn't split it
-            $logconstraints[] = join('', $flagconstraints);
-        }
         // uid
         if ($srchuid != "any" && $srchuid != "") {
             $logfromtables[] = "lognotes";
@@ -200,12 +182,28 @@ if ($search) {
             $logfromtables[] = "maintforms";
             $logconstraints[] = "lognotes.lognoteid=logparts.lognoteid and logparts.partid=parts.partid and maintforms.mfpart=parts.partid and maintforms.repord=\"{$srchrepord}\"";
         }
+        // flags
+        if (!empty($srchflags)) {
+            unset($flagconstraints);
+            $flagcount = count($srchflags);
+            $logfromtables[] = "lognotes";
+            $logfromtables[] = "flagmap";
+            $flagconstraints[] = "flagmap.lognoteid=lognotes.lognoteid and flagmap.flagid in (";
+            foreach ($srchflags as $flagid) {
+                $flagconstraints[] = "\"$flagid\"";
+                $flagconstraints[] = ",";
+            }
+            // remove final comma
+            array_splice($flagconstraints, -1, 1);
+            $flagconstraints[] = ") group by flagmap.lognoteid having count(distinct flagmap.flagid)=$flagcount";
+            // make flagconstraints a single string so that the final implode doesn't split it
+            $logconstraints[] = join('', $flagconstraints);
+        }
         // build the clauses and run the query
         $logfromclause = implode(",", array_unique($logfromtables));
         $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 
@@ -248,23 +246,6 @@ if ($search) {
             $mffromtables[] = "maintactions";
             $mfconstraints[] = "maintforms.mfmalfunction like \"%$srchtext%\" or (maintactions.action like \"%$srchtext%\" and maintforms.maintformid=maintactions.maintformnum)";
         }
-        // flags
-        if (!empty($srchflags)) {
-            unset($flagconstraints);
-            $flagcount = count($srchflags);
-            $mffromtables[] = "maintforms";
-            $mffromtables[] = "flagmap";
-            $flagconstraints[] = "flagmap.maintformid=maintforms.maintformid and flagmap.flagid in (";
-            foreach ($srchflags as $thisflagid) {
-                $flagconstraints[] = "\"$thisflagid\"";
-                $flagconstraints[] = ",";
-            }
-            // remove final comma
-            array_splice($flagconstraints, -1, 1);
-            $flagconstraints[] = ") group by flagmap.maintformid having count(distinct flagmap.flagid)=$flagcount";
-            // make flagconstraints a single string so that the final implode doesn't split it
-            $mfconstraints[] = join('', $flagconstraints);
-        }
         // uid
         if ($srchuid != "any" && $srchuid != "") {
             $mffromtables[] = "maintforms";
@@ -307,12 +288,28 @@ if ($search) {
             $mffromtables[] = "maintforms";
             $mfconstraints[] = "maintforms.mfpart=parts.partid and maintforms.repord=\"{$srchrepord}\"";
         }
+        // flags
+        if (!empty($srchflags)) {
+            unset($flagconstraints);
+            $flagcount = count($srchflags);
+            $mffromtables[] = "maintforms";
+            $mffromtables[] = "flagmap";
+            $flagconstraints[] = "flagmap.maintformid=maintforms.maintformid and flagmap.flagid in (";
+            foreach ($srchflags as $thisflagid) {
+                $flagconstraints[] = "\"$thisflagid\"";
+                $flagconstraints[] = ",";
+            }
+            // remove final comma
+            array_splice($flagconstraints, -1, 1);
+            $flagconstraints[] = ") group by flagmap.maintformid having count(distinct flagmap.flagid)=$flagcount";
+            // make flagconstraints a single string so that the final implode doesn't split it
+            $mfconstraints[] = join('', $flagconstraints);
+        }
         // build the clauses and run the query
         $mffromclause = implode(",", array_unique($mffromtables));
         $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 
@@ -334,7 +331,6 @@ if ($search) {
         // tech doesn't apply to parts
         // subject doesn't apply to parts
         // search text doesn't apply to parts
-        // flags doesn't apply to parts
         // uid
         if ($srchuid != "any" && $srchuid != "") {
             $pfromtables[] = "parts";
@@ -373,6 +369,7 @@ if ($search) {
             $pfromtables[] = "maintforms";
             $pconstraints[] = "maintforms.mfpart=parts.partid and maintforms.repord=\"{$srchrepord}\"";
         }
+        // flags doesn't apply to parts
         // build the clauses and run the query
         $pfromclause = implode(",", array_unique($pfromtables));
         $pwhereclause = implode(" and ", $pconstraints);

distfiles/templates.php

@@ -163,9 +163,9 @@ if ($usertemplateid) {
 }
 
 // determine original owner of template
-$orig_owner=dblookup($db, "notetemplates","templateid","tech",$templateid);
+$orig_owner = dblookup($db, "notetemplates", "templateid", "tech", $templateid);
 if ($efftechid != NULL && $efftechid != $orig_owner) {
-    $operation="add";
+    $operation = "add";
 }
 
 if ($operation == "add") {

install.sh

@@ -202,7 +202,7 @@ then
             else
                 # proceed with upgrade
                 # put app in maintenance mode
-                echo "Putting the applocation in maintenance mode..."
+                echo "Putting the application in maintenance mode..."
                 # make sure mod_rewrite is enabled
                 if [[ ! -e "$APACHE_CONF_DIR/../mods-enabled/rewrite.load" ]]
                 then