\n";
while ($tablerow = mysqli_fetch_assoc($note)) {
- $reftonote=$tablerow["lognoteid"];
- $refs=" ![\"Add](\"icons/plus.png\" "\\"Add") ";
+ $thisnote=$tablerow["lognoteid"];
+ $refs=" ";
if (islink($tablerow["lognoteid"])) {
- $refs=$refs." ![\"View](\"icons/magnifier--arrow.png\" "\\"View") ";
+ $refs=$refs." ";
}
// convert tech number to name
$tname=dblookup($db,"techs","techid","techname",$tablerow["tech"]);
@@ -151,17 +148,13 @@ function shifttable_clean($shift, $tgt_date, $db) {
$fmtnote=convertweblinks($tablerow["lognote"]);
// generate the flags string
$flagstring="";
- $allflagqry=mysqli_query($db,"select flagid from flags");
- while ($allflagids=mysqli_fetch_row($allflagqry)) {
- $flagid=$allflagids[0];
- $flag_tbl="flag_".$flagid;
- if (mysqli_num_rows(mysqli_query($db,"select id from $flag_tbl where target=\"lognotes\" and id=\"$reftonote\""))) {
- $flagparam=mysqli_fetch_assoc(mysqli_query($db,"select * from flags where flagid=\"$flagid\""));
- $flagcolor=$flagparam["flagcolor"];
- $flagsym=$flagparam["flagsym"];
- $flagname=$flagparam["flagname"];
- $flagstring=$flagstring."$flagsym ";
- }
+ $flagqry=mysqli_query($db,"select flagid from flagmap where lognoteid=$thisnote");
+ while ($flagid=mysqli_fetch_row($flagqry)) {
+ $flagparams=mysqli_fetch_assoc(mysqli_query($db,"select * from flags where flagid=\"$flagid[0]\""));
+ $flagcolor=$flagparams["flagcolor"];
+ $flagsym=$flagparams["flagsym"];
+ $flagname=$flagparams["flagname"];
+ $flagstring=$flagstring."$flagsym ";
}
if ($flagstring) {
$fmtnote=$fmtnote."
".$flagstring." ";
@@ -170,8 +163,8 @@ function shifttable_clean($shift, $tgt_date, $db) {
}
if ($doparts) {
// turn on the parts indicator if parts were entered with the note
- if (mysqli_num_rows(mysqli_query($db,"select logpartid from logparts where lognoteid=\"$reftonote\""))) {
- $fmtnote=$fmtnote."PARTS";
+ if (mysqli_num_rows(mysqli_query($db,"select logpartid from logparts where lognoteid=\"$thisnote\""))) {
+ $fmtnote=$fmtnote."PARTS";
}
}
// now print the line in the table
diff --git a/distfiles/maintform.php b/distfiles/maintform.php
index 933db51..ca15206 100644
--- a/distfiles/maintform.php
+++ b/distfiles/maintform.php
@@ -2,7 +2,7 @@
/*
maintform.php
OpenLog Online Logbook
- Copyright (C) 2025 Rod Wright
+ Copyright (C) 2026 Rod Wright
SPDX-License-Identifier: GPL-2.0
*/
diff --git a/distfiles/maintformentry.php b/distfiles/maintformentry.php
index 46a4e26..a714180 100644
--- a/distfiles/maintformentry.php
+++ b/distfiles/maintformentry.php
@@ -2,7 +2,7 @@
/*
maintformentry.php
OpenLog Online Logbook
- Copyright (C) 2025 Rod Wright
+ Copyright (C) 2026 Rod Wright
SPDX-License-Identifier: GPL-2.0
*/
diff --git a/distfiles/partentry.php b/distfiles/partentry.php
index fdd1b94..08a5490 100644
--- a/distfiles/partentry.php
+++ b/distfiles/partentry.php
@@ -2,7 +2,7 @@
/*
partentry.php
OpenLog Online Logbook
- Copyright (C) 2025 Rod Wright
+ Copyright (C) 2026 Rod Wright
SPDX-License-Identifier: GPL-2.0
*/
diff --git a/distfiles/parts.php b/distfiles/parts.php
index 5dbcc08..9d6b6d1 100644
--- a/distfiles/parts.php
+++ b/distfiles/parts.php
@@ -2,7 +2,7 @@
/*
parts.php
OpenLog Online Logbook
- Copyright (C) 2025 Rod Wright
+ Copyright (C) 2026 Rod Wright
SPDX-License-Identifier: GPL-2.0
*/
diff --git a/distfiles/profile.php b/distfiles/profile.php
index c299f66..15af5cb 100644
--- a/distfiles/profile.php
+++ b/distfiles/profile.php
@@ -2,7 +2,7 @@
/*
profile.php
OpenLog Online Logbook
- Copyright (C) 2025 Rod Wright
+ Copyright (C) 2026 Rod Wright
SPDX-License-Identifier: GPL-2.0
*/
diff --git a/distfiles/refchain.php b/distfiles/refchain.php
index db77d8c..d871b7e 100644
--- a/distfiles/refchain.php
+++ b/distfiles/refchain.php
@@ -2,14 +2,14 @@
/*
refchain.php
OpenLog Online Logbook
- Copyright (C) 2025 Rod Wright
+ Copyright (C) 2026 Rod Wright
SPDX-License-Identifier: GPL-2.0
*/
include("functions.php");
-$print=$_REQUEST['print'];
+$print=$_REQUEST['print'] ?? "";
$chainnote=$_REQUEST['chainnote'];
$logname=LOG_NAME;
@@ -59,17 +59,29 @@ while($mptr$flagsym ";
}
}
+
+ //$allflagqry=mysqli_query($db,"select flagid from flags");
+ //while ($allflagids=mysqli_fetch_row($allflagqry)) {
+ //$flagid=$allflagids[0];
+ //$flag_tbl="flag_".$flagid;
+ //if (mysqli_num_rows(mysqli_query($db,"select id from $flag_tbl where target=\"lognotes\" and id=\"$noteid\""))) {
+ //$flagparam=mysqli_fetch_assoc(mysqli_query($db,"select * from flags where flagid=\"$flagid\""));
+ //$flagcolor=$flagparam["flagcolor"];
+ //$flagsym=$flagparam["flagsym"];
+ //$flagstring=$flagstring."$flagsym ";
+ //}
+ //}
+
if ($flagstring) $fmtnote=$fmtnote."
".$flagstring;
printf("
diff --git a/distfiles/schedmaint.php b/distfiles/schedmaint.php
index 62a983a..db5e130 100644
--- a/distfiles/schedmaint.php
+++ b/distfiles/schedmaint.php
@@ -2,7 +2,7 @@
/*
blankpage.php
OpenLog Online Logbook
- Copyright (C) 2025 Rod Wright
+ Copyright (C) 2026 Rod Wright
SPDX-License-Identifier: GPL-2.0
*/
diff --git a/distfiles/search.php b/distfiles/search.php
index 04d774b..0b9e9cb 100644
--- a/distfiles/search.php
+++ b/distfiles/search.php
@@ -2,7 +2,7 @@
/*
search.php
OpenLog Online Logbook
- Copyright (C) 2025 Rod Wright
+ Copyright (C) 2026 Rod Wright
SPDX-License-Identifier: GPL-2.0
*/
diff --git a/distfiles/settings.php b/distfiles/settings.php
index a538c53..cebd1a0 100644
--- a/distfiles/settings.php
+++ b/distfiles/settings.php
@@ -2,7 +2,7 @@
/*
settings.php
OpenLog Online Logbook
- Copyright (C) 2025 Rod Wright
+ Copyright (C) 2026 Rod Wright
SPDX-License-Identifier: GPL-2.0
*/
diff --git a/distfiles/templates.php b/distfiles/templates.php
new file mode 100644
index 0000000..b8fb6d8
--- /dev/null
+++ b/distfiles/templates.php
@@ -0,0 +1,616 @@
+";
+ if ($hastemplates) {
+ // print the user header
+ if ($user=="0") {
+ echo "Global Templates";
+ if ($isadmin) {
+ echo " Create or copy a global template
";
+ }
+ } else {
+ if ($user==$techid) {
+ echo "My templates";
+ echo " Create or copy a template
";
+ } else {
+ echo "Templates for $tblusername";
+ }
+ }
+ // print the table
+ echo "
";
+ echo "| Template Name | Shift | Subject | Note | References |
|---|
";
+ while ($tablerow = mysqli_fetch_assoc($templatequery)) {
+ $templateid=$tablerow["templateid"];
+ $templatename=$tablerow["templatename"];
+ // convert shift number to name
+ $shiftname=dblookup($db,"shifts","shiftid","shiftname",$tablerow["shift"]);
+ // convert subject number to name
+ $subjname=dblookup($db,"subjects","subjectid","subjectname",$tablerow["subject"]);
+ // create links of urls in note
+ $fmtnote=convertweblinks($tablerow["lognote"]);
+ // generate the flags string
+ $flagstring="";
+ $flagqry=mysqli_query($db,"select flagid from flagmap where notetemplateid=$templateid");
+ while ($flagid=mysqli_fetch_row($flagqry)) {
+ $flagparams=mysqli_fetch_assoc(mysqli_query($db,"select * from flags where flagid=\"$flagid[0]\""));
+ $flagcolor=$flagparams["flagcolor"];
+ $flagsym=$flagparams["flagsym"];
+ $flagname=$flagparams["flagname"];
+ $flagstring=$flagstring."$flagsym ";
+ }
+ if ($flagstring) {
+ $fmtnote=$fmtnote."
".$flagstring." ";
+ } else {
+ $fmtnote=$fmtnote."
";
+ }
+ // generate a reference string
+ $refstring=NULL;
+ $refstringqry=mysqli_query($db,"select target from reflinks where templateid=\"$templateid\"");
+ while ($tgt=mysqli_fetch_row($refstringqry)) {
+ $refstring=$refstring." ".$tgt[0];
+ }
+ // now print the line in the table
+ if (!$isadmin && $user=="0") {
+ $nameblock="$templatename";
+ } else {
+ $nameblock="$templatename";
+ }
+ printf(
+ "
+ | %s |
+ %s |
+ %s |
+ %s |
+ %s |
+ \n",
+ $nameblock,
+ $shiftname,
+ $subjname,
+ $fmtnote,
+ $refstring
+ );
+ };
+ echo "
";
+ } else {
+ if ($user=="0") {
+ echo "There are no global templates";
+ if ($isadmin) {
+ echo " Add a new global template";
+ }
+ } else {
+ if ($user==$techid) {
+ echo "You have no templates";
+ } else {
+ echo "$tblusername has no templates";
+ }
+ if (($user==$techid) || $isadmin) {
+ echo " Add a new template
";
+ }
+ }
+ echo "
";
+ }
+ echo "
";
+}
+
+function templateselect($db,$techid) {
+ echo "
+
+ ";
+}
+
+// ******** begin database manipulation ********
+
+if ($usertemplateid) {
+ $templateid=$usertemplateid;
+} else if ($globaltemplateid) {
+ $templateid=$globaltemplateid;
+} else {
+ $loadtemplate=NULL;
+}
+
+if ($add) {
+ if ($submit) {
+ if ($note) {
+ // remove cruft from note text
+ $note=strip_tags($note,"");
+ $note=mysqli_real_escape_string($db,$note);
+
+ if ($add_auth) {
+ // check if name supplied
+ if ($templatename) {
+ $namesupplied=TRUE;
+ // check if supplied name already exists
+ if (! mysqli_num_rows(mysqli_query($db,"select templateid from notetemplates where tech=\"$efftechid\" and templatename=\"$templatename\""))) {
+ // add the record to notetemplates
+ mysqli_query($db,"insert into notetemplates(templatename,shift,tech,subject,lognote) values (\"$templatename\", \"$shift\",\"$efftechid\",\"$subject\",\"$note\")");
+ $newtemplateid=mysqli_insert_id($db);
+
+ // update the flagmap table
+ foreach ($flags as $thisflag) {
+ // set flag for this note
+ mysqli_query($db,"insert into flagmap(flagid,notetemplateid) values(\"$thisflag\",\"$newtemplateid\")");
+ }
+
+ // add references to the reflinks table
+ if (strlen($refstring)) {
+ $refstring=trim($refstring);
+ $refarray=explode(" ",$refstring);
+ foreach ($refarray as $target) {
+ mysqli_query($db,"insert into reflinks(templateid,target) values($newtemplateid,$target)");
+ }
+ }
+ $templateid=$newtemplateid;
+ } else {
+ $nameexists=TRUE;
+ }
+ } else {
+ $namesupplied=FALSE;
+ }
+ }
+ }
+ }
+}
+if ($edit) {
+ if ($submit) {
+ if ($note) {
+ // remove cruft from note text
+ $note=strip_tags($note,"");
+ $note=mysqli_real_escape_string($db,$note);
+
+ if ($edit_auth) {
+ // check if name was supplied
+ if ($templatename) {
+ $namesupplied=TRUE;
+ // update notetemplates
+ mysqli_query($db,"update notetemplates set templatename=\"$templatename\", shift=\"$shift\", tech=\"$efftechid\", subject=\"$subject\", lognote=\"$note\" where templateid=\"$templateid\"");
+
+ // update the flagmap table
+ mysqli_query($db,"delete from flagmap where notetemplateid=\"$templateid\"");
+ foreach ($flags as $thisflag) {
+ // set flag for this note
+ mysqli_query($db,"insert into flagmap(flagid,notetemplateid) values(\"$thisflag\",\"$templateid\")");
+ }
+
+ // update the reflinks table
+ mysqli_query($db,"delete from reflinks where templateid=\"$templateid\"");
+ if (strlen($refstring)) {
+ $refstring=trim($refstring);
+ $refarray=explode(" ",$refstring);
+ foreach ($refarray as $target) {
+ mysqli_query($db,"insert into reflinks(templateid,target) values($templateid,$target)");
+ }
+ }
+ } else {
+ $namesupplied=FALSE;
+ }
+ }
+ }
+ }
+ if ($delete) {
+ if ($del_auth) {
+ // update notetemplates
+ mysqli_query($db,"delete from notetemplates where templateid=\"$templateid\"");
+ // update the flagmap table
+ mysqli_query($db,"delete from flagmap where notetemplateid=\"$templateid\"");
+ // update the reflinks table
+ mysqli_query($db,"delete from reflinks where templateid=\"$templateid\"");
+ $templateid=NULL;
+ $note=NULL;
+ }
+ }
+}
+
+// ******** end database manipulation ********
+
+pagetable("begin");
+if (!$print) {
+ pageblock("left","begin");
+ sidemenu();
+ pageblock("left","end");
+}
+pageblock("right","begin");
+banner($print);
+
+
+if ($submit || $delete) {
+ // show success/failure messages
+ $nameexists=$nameexists ?? NULL;
+ $namesupplied=$namesupplied ?? NULL;
+ if ($delete) {
+ format_message(0,"Template deleted.");
+ } else {
+ $addfail=FALSE;
+ if ($add) {
+ if ($nameexists) {
+ format_message(1,"Template save failed because the name you supplied already exists. Please try again.");
+ $addfail=TRUE;
+ }
+ if (!$namesupplied) {
+ format_message(1,"Template save failed because you didn't supply a name. Please try again.");
+ $addfail=TRUE;
+ }
+ if (!$note) {
+ format_message(1,"Template save failed because you didn't enter any note text. Please try again.");
+ $addfail=TRUE;
+ }
+ if (!$addfail) format_message(0,"Template added.");
+ }
+ $editfail=FALSE;
+ if ($edit) {
+ if (!$namesupplied) {
+ format_message(1,"Template save failed because you didn't supply a name. Please try again.");
+ $editfail=TRUE;
+ }
+ if (!$note) {
+ format_message(1,"Template save failed because you didn't enter any note text. Please try again.");
+ $editfail=TRUE;
+ }
+ if (!$editfail) format_message(0,"Template modified.");
+ }
+ }
+}
+
+if ($delete) {
+ // just show the link back to the templates page
+ echo "
+
Manage templates
+ ";
+} else if ($add || $edit) {
+ // Display the input form
+ if ($loadtemplate) {
+ // make templateid the selected template
+ if ($usertemplateid) {
+ $templateid=$usertemplateid;
+ } else if ($globaltemplateid) {
+ $templateid=$globaltemplateid;
+ } else {
+ $templateid=NULL;
+ }
+ }
+ if ($edit || $loadtemplate) {
+ // use values from the templateid supplied with a defined tech id
+ $loadeddata=mysqli_fetch_assoc(mysqli_query($db,"select * from notetemplates where templateid=\"$templateid\""));
+ $filltemplatename=$loadeddata["templatename"];
+ if ($tech) {
+ $filltech=$tech;
+ } else if ($efftechid) {
+ $filltech=$efftechid;
+ } else {
+ $filltech=$techid;
+ }
+ $fillshift=$loadeddata["shift"];
+ $fillsubject=$loadeddata["subject"];
+ $fillnote=$loadeddata["lognote"];
+ } else {
+ // use empty values with a defined tech id
+ $filltemplatename=NULL;
+ if ($tech) {
+ $filltech=$tech;
+ } else if ($efftechid) {
+ $filltech=$efftechid;
+ } else {
+ $filltech=$techid;
+ }
+ $fillshift=$defaultshift;
+ $fillsubject=NULL;
+ $fillnote=NULL;
+ }
+
+ if ($add) $optext="Adding new";
+ if ($edit) $optext="Editing";
+ if ($isadmin && $filltech==0) {
+ echo "
+
$optext global template
+ ";
+ } else {
+ echo "
+
$optext user template
+ ";
+ }
+
+ // show the template selection line
+ templateselect($db,$techid);
+
+ // start template entry section
+ echo "
+
+
+ ";
+} else {
+ echo "
";
+ // Show my user template table
+ templatetable($db,$techid,$techid);
+
+ // Show global template table
+ templatetable($db,$techid,"0");
+
+ if ($isadmin) {
+ // Show template tables for other users
+ $techqry=mysqli_query($db,"select techid from techs where techid != $techid and techid != 0");
+ while ($techtblrow=(mysqli_fetch_row($techqry))) {
+ templatetable($db,$techid,$techtblrow[0]);
+ }
+ }
+}
+
+
+banner($print);
+pageblock("right","end");
+pagetable("end");
+
+framework("end","","",$print);
+
+?>
diff --git a/files-update.sh b/files-update.sh
index de5086f..962ad47 100755
--- a/files-update.sh
+++ b/files-update.sh
@@ -41,8 +41,3 @@ fi
# ---------- version 5.2.4.4 -----------
# No changes
# --------------------------------------
-
-# ---------- version 5.2.5 -------------
-# No changes
-# --------------------------------------
-
diff --git a/install.sh b/install.sh
index 46fe055..c26db53 100755
--- a/install.sh
+++ b/install.sh
@@ -8,7 +8,7 @@
APP_NAME="OpenLog"
DEFAULT_DB_NAME="openlog"
-APP_VERSION="5.2.5"
+APP_VERSION="5.3.0"
DOC_ROOT="/var/www"
INSTALL_LOC="openlog"
APACHE_CONF_DIR="/etc/apache2/conf-available"
|