Commit d8b2eb4b authored by canyonknight's avatar canyonknight Committed by Lukas Fleischer
Browse files

pkg_comments.php: Overhaul to match archweb

* Limit PHP echoing XHTML as much as possible, and use pure XHTML
* Switch to alternative syntax in control structures for better readability of
inter-mixed XHTML
* Remove box for every comment and switch to archweb news post style

Signed-off-by: default avatarcanyonknight <>
Signed-off-by: default avatarLukas Fleischer <>
parent 941f3100
<div class="pgbox">
$uid = uid_from_sid($SID);
while (list($indx, $carr) = each($comments)) { ?>
<div class="comment-header"><?php
if ($SID) {
$carr['UserName'] = "<a href=\"account.php?Action=AccountInfo&amp;ID={$carr['UsersID']}\">{$carr['UserName']}</a>";
$commentHeader = '<p style="display:inline;">' . __('Comment by: %s on %s', $carr['UserName'], gmdate('Y-m-d H:i', $carr['CommentTS'])) . '</p>';
if (canDeleteCommentArray($carr, $atype, $uid)) {
$durl = '<form method="post" action="packages.php?ID='.$row['ID'].'">';
$durl.= '<fieldset style="display:inline;">';
$durl.= '<input type="hidden" name="action" value="do_DeleteComment" />';
$durl.= '<input type="hidden" name="comment_id" value="'.$carr['ID'].'" />';
$durl.= '<input type="image" src="images/x.png" ';
$durl.= ' alt="'.__("Delete comment").'" name="submit" value="1" ';
$durl.= ' />&nbsp;';
$durl.= '</fieldset>';
$commentHeader = $durl.$commentHeader."</form>";
echo $commentHeader;
<blockquote class="comment-body">
<?php echo parse_comment($carr['Comments']) ?>
$count = package_comments_count($_GET['ID']);
<div id="news">
<a href="<?php echo htmlentities($_SERVER['REQUEST_URI'], ENT_QUOTES) ?>&amp;comments=all" title="<?php echo __('View all %s comments' , $count) ?>"><?php echo __('Latest Comments') ?></a>
<span class="arrow"></span>
<?php while (list($indx, $row) = each($comments)): ?>
<?php if ($SID):
$row['UserName'] = "<a href=\"account.php?Action=AccountInfo&amp;ID={$row['UsersID']}\">{$row['UserName']}</a>";
endif; ?>
<?php if (canDeleteCommentArray($row, $atype, $uid)): ?>
<form method="post" action="packages.php?ID=<?php echo $row['ID'] ?>">
<fieldset style="display:inline;">
<input type="hidden" name="action" value="do_DeleteComment" />
<input type="hidden" name="comment_id" value="<?php echo $row['ID'] ?>" />
<input type="image" src="images/x.png" alt="<?php echo __('Delete comment') ?> name="submit" value="1" />
<?php endif; ?>
<?php echo __('Comment by %s', $row['UserName']) ?>
<p class="timestamp"><?php echo gmdate('Y-m-d H:i', $row['CommentTS']) ?></p>
<div class="article-content">
<?php echo parse_comment($row['Comments']) ?>
<?php endwhile; ?>
$count = package_comments_count(isset($_GET['ID']) ? $_GET['ID'] : pkgid_from_name($_GET['N']));
if ($count > 10 && !isset($_GET['comments'])) {
echo '<div class="pgbox">';
echo '<a href="'. $_SERVER['REQUEST_URI'] . '&amp;comments=all">'. __('Show all %s comments', $count) . '</a>';
echo '</div>';
<?php if ($count > 10 && !isset($_GET['comments'])): ?>
<div id="news">
<a href="<?php echo $_SERVER['REQUEST_URI'] ?>&amp;comments=all" title="<?php echo __('View all %s comments', $count) ?>"><?php echo __('All comments', $count) ?></a>
<?php endif; ?>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment