Skip to content

Commit 2e8f0cb

Browse files
committed
Use getPacketId to format it nicely
1 parent b7a2dff commit 2e8f0cb

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

libraries/Packet.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,9 @@ public function getPacketName() {
163163
return $this->packet_name;
164164
}
165165

166-
public function getPacketId() {
167-
return $this->packet_id;
166+
public function getPacketId($format = false) {
167+
if (!$format) return $this->packet_id;
168+
return "0x" . strtoupper(substr("0" . dechex($this->packet_id), -2));
168169
}
169170

170171
public function getPacketRemarks($prepare) {

templates/Packet/Index.phtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@ require("./header.inc.phtml");
3939
$user_url = Common::relativeUrlToAbsolute("/user/" . urlencode($user->getId()) . "/" . Common::sanitizeForUrl($user->getName(), true));
4040
$avatar_url = "https:" . $getAvatar($avatars, $user)->getUrl(22, "identicon");
4141
}
42+
$packet_id = $packet->getPacketId(true);
4243
?>
4344
<tr>
44-
<td><a href="<?php echo Common::relativeUrlToAbsolute("/packet/" . urlencode($packet->getId()) . "/" . Common::sanitizeForUrl($packet->getPacketName(), true)); ?>"><?php echo htmlspecialchars($packet->getPacketName(), ENT_HTML5, "UTF-8"); ?></a></td>
45+
<td><a href="<?php echo Common::relativeUrlToAbsolute("/packet/" . urlencode($packet->getId()) . "/" . Common::sanitizeForUrl($packet->getPacketName(), true)); ?>"><?php echo htmlspecialchars($packet_id . " " . $packet->getPacketName(), ENT_HTML5, "UTF-8"); ?></a></td>
4546
<td><?php if ($user) { ?><a href="<?php echo $user_url; ?>"><img class="avatar" src="<?php echo $avatar_url; ?>"/> <?php echo htmlspecialchars($user->getName(), ENT_HTML5, "UTF-8"); ?></a><?php } else { ?>Anonymous<?php } ?></td>
4647
</tr>
4748
<?php } ?>

templates/Packet/View.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $url = Common::relativeUrlToAbsolute("/packet/" . urlencode($object_id));
1919
if ($object) {
2020
$url .= "/" . Common::sanitizeForUrl($object->getPacketName(), true);
2121

22-
$packet_id = "0x" . strtoupper(substr("0" . dechex($object->getPacketId()), -2));
22+
$packet_id = $object->getPacketId(true);
2323
$title = $packet_id . " " . $title;
2424
}
2525

0 commit comments

Comments
 (0)