---
web/html/css/aurweb.css | 6 ++++++
web/lib/pkgbasefuncs.inc.php | 9 ++++++---
web/template/pkg_comments.php | 15 +++++++++++++++
3 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css
index 47166d3..a9f1514 100644
--- a/web/html/css/aurweb.css
+++ b/web/html/css/aurweb.css
@@ -100,6 +100,12 @@
float: left;
}
+.edited {
+ font-size: 0.9em;
+ font-style: italic;
+ color: #666;
+}
+
legend {
padding: 1em 0;
}
diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php
index b7bef2c..01f5ace 100644
--- a/web/lib/pkgbasefuncs.inc.php
+++ b/web/lib/pkgbasefuncs.inc.php
@@ -47,9 +47,12 @@ function pkgbase_comments($base_id, $limit,
$include_deleted) {
}
$dbh = DB::connect();
- $q = "SELECT PackageComments.ID, UserName, UsersID, Comments, ";
- $q.= "CommentTS, DelUsersID FROM PackageComments LEFT JOIN Users ";
- $q.= "ON PackageComments.UsersID = Users.ID ";
+ $q = "SELECT PackageComments.ID, A.UserName AS UserName, UsersID,
Comments, ";
+ $q.= "CommentTS, EditedTS, B.UserName AS EditUserName, ";
+ $q.= "DelUsersID, C.UserName AS DelUserName FROM PackageComments ";
+ $q.= "LEFT JOIN Users A ON PackageComments.UsersID = A.ID ";
+ $q.= "LEFT JOIN Users B ON PackageComments.EditedUsersID = B.ID ";
+ $q.= "LEFT JOIN Users C ON PackageComments.DelUsersID = C.ID ";
$q.= "WHERE PackageBaseID = " . $base_id . " ";
if (!$include_deleted) {
$q.= "AND DelUsersID IS NULL ";
diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php
index 938f620..79e08d2 100644
--- a/web/template/pkg_comments.php
+++ b/web/template/pkg_comments.php
@@ -18,6 +18,12 @@ $count = pkgbase_comments_count($base_id, $include_deleted);
<?php while (list($indx, $row) = each($comments)): ?>
<?php if ($row['UserName'] && $SID):
$row['UserName'] = "<a href=\"" .
get_user_uri($row['UserName']) . "\">{$row['UserName']}</a>";
+ endif;
+ if ($row['DelUserName'] && $SID):
+ $row['DelUserName'] = "<a href=\"" .
get_user_uri($row['DelUserName']) . "\">{$row['DelUserName']}</a>";
+ endif;
+ if ($row['EditUserName'] && $SID):
+ $row['EditUserName'] = "<a href=\"" .
get_user_uri($row['EditUserName']) . "\">{$row['EditUserName']}</a>";
endif; ?>
<h4<?php if ($row['DelUsersID']): ?>
class="comment-deleted"<?php endif; ?>>
<?php if (!$row['DelUsersID'] &&
can_delete_comment_array($row)): ?>
@@ -53,6 +59,15 @@ $count = pkgbase_comments_count($base_id, $include_deleted);
<p>
<?= parse_comment($row['Comments']) ?>
</p>
+ <?php if ($row['EditedTS']): ?>
+ <p class="edited">
+ <?php if ($row['DelUsersID']) {
+ echo __('Deleted %s by %s',
gmdate('Y-m-d H:i', $row['EditedTS']), $row['DelUserName']);
+ } else {
+ echo __('Last edited %s by %s',
gmdate('Y-m-d H:i', $row['EditedTS']), $row['EditUserName']);
+ }?>
+ </p>
+ <?php endif; ?>
</div>
<?php endwhile; ?>
</div>
--
2.4.5
