', _('Edit Box'), "
\n"; sid); ?>
-
+
', _('Edit cable'), "
\n";
-
+
cabletype);
@@ -267,7 +267,7 @@ form_create_select('cablecond', _('Condition'), $opt_cablecond, $cable->cablecon
?>
-
+
fetch(PDO::FETCH_OBJ);
echo "", $company->compname, "
\n"; echo 'Referenced in equipment:
\n"; + echo '', _('Referenced in equipment'), ":
\n"; echo "- \n";
foreach ($sth->fetchAll() as $row) {
echo "
- ", $row['ename'], ' ';
@@ -353,11 +353,11 @@ $company = $sth->fetch(PDO::FETCH_OBJ);
- +- +@@ -378,47 +378,47 @@ form_create_select('comptype2', _('Secondary company type'), $g_opt_none + $opt_ ?>\n", '- +- +- +- +- +- +- +- +- +- +- +fetch(PDO::FETCH_OBJ); echo '
', _('Delete Company'), "
\n"; echo '', sprintf(_('Record no. %d'), $id), "
\n"; -echo 'Name: ', $company->compname, "
"; -echo 'Remarks: ', $company->remarks, "
"; +echo 'Name: ', h($company->compname), "
"; +echo 'Remarks: ', h($company->remarks, br:true), "
"; // Still used as a supplier or manufacturer for equipment? $sql = "SELECT COUNT(*) FROM equipment WHERE supplier=:id OR manufacturer=:id"; diff --git a/webgui/documents.php b/webgui/documents.php index da5583b..821d248 100644 --- a/webgui/documents.php +++ b/webgui/documents.php @@ -488,7 +488,7 @@ if ($document->doctype == 'picture') { echo ''; echo ''; // echo ''; // gallery ?> @@ -535,11 +535,11 @@ if ($document->docsize == 0) { } echo ''; - echo '
'; + echo '
', _('Mimetype')," ", $document->mimetype, " ', _('Filename')," ", $document->filename, " ', _('Filename')," ", h($document->filename), " ', _('File size')," ", format_filesize($document->docsize), " ', _('Upload date')," ", $document->doctime, " ', _('Title')," ", $document->title, " ', _('Remarks')," ", $document->remarks, " ', _('Title')," ", h($document->title), " ', _('Remarks')," ", h($document->remarks, br:true), " ', "\n"; // column break @@ -780,7 +780,7 @@ if ($document->mimetype == 'application/pdf') { ?>\n"; // row 2 diff --git a/webgui/inventory.php b/webgui/inventory.php index 418adc3..40a6898 100644 --- a/webgui/inventory.php +++ b/webgui/inventory.php @@ -396,7 +396,7 @@ echo "- +diff --git a/webgui/equipment.php b/webgui/equipment.php index b07955f..8e8d941 100644 --- a/webgui/equipment.php +++ b/webgui/equipment.php @@ -455,18 +455,18 @@ echo ''; echo '\n"; echo "'; echo ''; // container // Buttons at bottom of data area form_view_buttons($g_scriptname, $id); +// Annotations +echo '', _('Annotations'), "
\n"; + +$sql = "SELECT noteid, annotation " + . "FROM note " + . "WHERE notetype='equip' AND refid=?"; +$sth = $pdo->prepare($sql); +$sth->execute([$id]); +if ($sth->rowCount() > 0) { + $n = 0; + foreach ($sth->fetchAll() as $row) { + $n += 1; + echo "($n) {$row['annotation']}"; + echo ' '; + echo "
\n"; + } +} else { + echo '', _('No annotations for this equipment'), "
\n"; +} +echo '', "\n"; +echo ''; +echo _('Add note'), "\n"; +echo "\n"; + // Maintenance records echo '', _('Maintenances'), "
"; @@ -649,20 +673,20 @@ $equipment = $sth->fetch(PDO::FETCH_OBJ);- +- +manufacturer); ?>- +- +@@ -682,7 +706,7 @@ form_create_select('category', _('Category'), $g_opt_unknown + $opt_ecat, $equip ?>- +fetch(PDO::FETCH_OBJ); echo '', _('Delete equipment'),"
\n"; echo '', sprintf(_('Record no. %d'), $id), "
\n"; -echo 'Name: ', $equipment->ename, "
"; -echo 'Remarks: ', $equipment->remarks, "
"; +echo 'Name: ', h($equipment->ename), "
"; +echo 'Remarks: ', h($equipment->remarks, br:true), "
"; echo '', _('Deleting an equipment item is final. There is no way back. Only delete if you are absolute sure.'), "
\n"; diff --git a/webgui/fuse.php b/webgui/fuse.php index 6bd568e..fdcf3ee 100644 --- a/webgui/fuse.php +++ b/webgui/fuse.php @@ -173,7 +173,7 @@ foreach ($res as $row) { echo "", $row['description'], " \n"; // Edit current record button echo ""; - echo '', "\n"; + echo '', "\n"; echo " \n"; echo "\n"; } @@ -234,7 +234,7 @@ echo '', _('Current')," ", $fuse->current, "A ', _('Location')," ", $opt_location[$fuse->location], " ', _('Cable')," ", $fuse->cableid, " ', _('Equipment')," ", $fuse->eid, " ', _('Remarks')," ", nl2br($fuse->remarks), " ', _('Remarks')," ", h($fuse->remarks, br:true), " ', _('Edit fuse'), "
\n";- +query($sql); + foreach ($sth->fetchAll(PDO::FETCH_NUM) as $row) { + $list[$row[0]] = h($row[1]); + } + return $list; +} + function db_get_filter($user, $sno, $fields = []) { // if fields supplied empting missing field are created global $pdo; @@ -1233,6 +1249,18 @@ function format_currency($val) { } } +function format_date($date) { + global $user; + // $user->datefmt; + /*'Y-m-d' => _('YYYY-MM-DD'). $curdate->format(' - Y-m-d'), + 'Y/m/d' => _('YYYY/MM/DD'). $curdate->format(' - Y/m/d'), + 'd.m.Y' => _('DD.MM.YYYY'). $curdate->format(' - d.m.Y'), + 'd/m/Y' => _('DD/MM/YYYY'). $curdate->format(' - d/m/Y'), + 'm-d-Y' => _('MM/DD/YYYY'). $curdate->format(' - m-d-Y') */ + + return ''; +} + function format_color($color) { $colstr = ' tags + $value = htmlspecialchars($value, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'); + return $br ? nl2br($value) : $value; } function header_location($location, $message=NULL) { diff --git a/webgui/index.php b/webgui/index.php index 3e0222a..f6ce651 100644 --- a/webgui/index.php +++ b/webgui/index.php @@ -171,7 +171,7 @@ if ($vessel->shipyard && $vessel->shipyard > 0) { } } if (strlen($vessel->remarks) > 0) { - echo nl2br($vessel->remarks); + echo h($vessel->remarks, br:true); } echo "", _('Weight'), " ", format_float($inventory->weight, 2, ' echo " ", _('Price'), " ", format_currency($inventory->price), " ", _('Purchase date'), " ", $inventory->purchdate, " ", _('Condition'), " ", $opt_invcond[$inventory->invcond], " ", _('Remarks'), " ", nl2br($inventory->remarks), " ", _('Remarks'), " ", h($inventory->remarks, br:true), " - +@@ -464,7 +464,7 @@ foreach ($cond as $k => $v) { eid); ?>- +\n" "Language-Team: LANGUAGE', _('View Maintenance'), "
\n"; +// load maintenance record $sql = "SELECT m.activities, m.eid, m.remarks, m.series, m.maintstate, e.ename " . "FROM maintenance AS m LEFT OUTER JOIN equipment AS e USING (eid) " . "WHERE m.maintid=?"; $sth = $pdo->prepare($sql); $sth->execute([$id]); $maint = $sth->fetch(PDO::FETCH_OBJ); - -if (isset($maint->eid)) { +if ($maint !== false && isset($maint->eid)) { + // if available load document references $sql = "SELECT r.docid, d.filename, d.title, d.hash, d.extension " . "FROM docref AS r INNER JOIN document AS d USING (docid) " . "WHERE r.reftype='equipment' AND r.refid=?"; @@ -260,6 +261,7 @@ if (isset($maint->eid)) { $sth->execute([$maint->eid]); $docs = $sth->fetchAll(); } else { + $maint = new stdClass(); $maint->ename = _('n/a'); unset($docs); } @@ -271,13 +273,13 @@ echo ''; echo '', _('Edit Maintenance'), "
\n";- +eid); ?>- +diff --git a/webgui/measurement.php b/webgui/measurement.php index 13ecdac..04292e2 100644 --- a/webgui/measurement.php +++ b/webgui/measurement.php @@ -300,15 +300,15 @@ $measurement = $sth->fetch(PDO::FETCH_OBJ); echo 'stat); +filter_create_checks('flt_stat', _('Status'), $opt_status, $flt->stat ?? []); ?>', _('Measurement'), "
\n"; echo '', "\n"; -echo '
\n"; diff --git a/webgui/note.php b/webgui/note.php index 8120a0a..1310ac2 100644 --- a/webgui/note.php +++ b/webgui/note.php @@ -130,7 +130,7 @@ echo '', _('Name')," ", $measurement->mname, " ', _('Unit')," ", $opt_unit[$measurement->unit], " ', _('Values')," $measurement->nval ', _('Value 1')," $measurement->val1 ', _('Value 2')," $measurement->val2 ', _('Value 3')," $measurement->val3 ', _('Accuracy')," $measurement->accuracy ', _('Date')," $measurement->mdate ', _('Note')," $measurement->note ', _('Name')," ", h($measurement->mname), " ', _('Unit'), ' ', $opt_unit[$measurement->unit], " ', _('Values'), ' ', $measurement->nval, " ', _('Value 1'), ' ', $measurement->val1, " ', _('Value 2'), ' ', $measurement->val2, " ', _('Value 3'), ' ', $measurement->val3, " ', _('Accuracy'), ' ', get_enum($measurement->accuracy), " ', _('Date'), ' ', $measurement->mdate, " ', _('Note'), ' ', h($measurement->note), " ', _('Equipment'), ' ', $opt_equipment[$measurement->eid], " ', _('Add Note'), "
\n"; $notetype = gpc_get_enum($_REQUEST, 't', $opt_notetype); -// get task info for reference +// get object info for reference if ($notetype == 'task') { $sql = "SELECT taskname FROM task WHERE taskid=?"; $sth = $pdo->prepare($sql); @@ -143,6 +143,12 @@ if ($notetype == 'task') { $sth->execute([$id]); $activities = $sth->fetchColumn(); echo '', sprintf(_('Maintenance: %s'), $activities), "
\n"; +} elseif ($notetype == 'equip') { + $sql = "SELECT ename FROM equipment WHERE eid=?"; + $sth = $pdo->prepare($sql); + $sth->execute([$id]); + $ename = $sth->fetchColumn(); + echo '', sprintf(_('Equipment: %s'), $ename), "
\n"; } ?> diff --git a/webgui/projects.php b/webgui/projects.php index af07016..b124070 100644 --- a/webgui/projects.php +++ b/webgui/projects.php @@ -307,14 +307,14 @@ $sth->execute([$id]); $project = $sth->fetch(PDO::FETCH_OBJ); echo "", $project->projname, "
\n"; echo '', "\n"; -echo '
\n"; form_view_buttons($g_scriptname, $id); @@ -401,7 +401,7 @@ form_create_select('projstate', _('Status'), $opt_state, $project->projstate); ?>', _('Name')," ", $project->projname, " ', _('Name')," ", h($project->projname), " ', _('Responsible')," ", $opt_user[$project->responsible], " ', _('Start date')," ", $project->startdate, " ', _('Duration')," ", $project->duration, " ', _('Costs plan')," ", format_currency($project->costs_plan), " ', _('Costs final')," ", format_currency($project->costs_final), " ', _('State')," ", get_enum($project->projstate), " ', _('Remarks')," ", nl2br($project->remarks), " ', _('Remarks')," ", h($project->remarks, br:true), " - +diff --git a/webgui/provisions.php b/webgui/provisions.php index 3d96043..93a4131 100644 --- a/webgui/provisions.php +++ b/webgui/provisions.php @@ -292,7 +292,7 @@ echo '', _('Storedate')," ", $prov->storedate, " ', _('Shelflife')," ", $prov->shelflife, " ', _('Price'), " ", format_currency($prov->price), " ', _('Storage')," ", ($opt_storage[$prov->sid] ?? ''), " ', _('Remarks')," ", nl2br($prov->remarks), " ', _('Remarks')," ", h($prov->remarks, br:true), " - +', _('Location (x, y, z)')," (", $storage->x, ', ', $stora echo ' ', _('Width (wx, wy, wz)')," (", $storage->wx, ', ', $storage->wy, ', ', $storage->wz, ") ', _('Angle')," ", $storage->angle, "° ', _('Color')," ", $storage->color, " ', _('Remarks')," ", $storage->remarks, " ', _('Remarks')," ", h($storage->remarks), " - +stype); @@ -358,7 +358,7 @@ form_create_select('stype', _('Type'), $opt_stype, $storage->stype); capaunit); ?>- +@@ -377,8 +377,8 @@ $storage = $sth->fetch(PDO::FETCH_OBJ); echo '', _('Delete Storage'), "
\n"; echo '', sprintf(_('Record no. %d'), $id), "
\n"; -echo 'Name: ', $storage->sname, "
"; -echo 'Remarks: ', $storage->remarks, "
"; +echo 'Name: ', h($storage->sname), "
"; +echo 'Remarks: ', h($storage->remarks, br:true), "
"; echo '', _('Deleting a storage is final. There is no way back. Only delete if you are absolute sure.'), "
\n"; diff --git a/webgui/task.php b/webgui/task.php index b1e9151..a9cdaf5 100644 --- a/webgui/task.php +++ b/webgui/task.php @@ -127,7 +127,6 @@ page_caption_search($pagetitle); // load filter from db $flt = db_get_filter($user->id, 206, ['txt', 'prio', 'stat', 'proj']); - $w = array('(t.vid=:vid OR t.vid IS NULL)'); $p = array(':vid' => $user->vid); if (strlen($flt->txt) > 1) { @@ -215,7 +214,7 @@ filter_create_select('flt_prio', _('Priority'), $g_opt_all + $g_opt_none + $opt_