Skip to content

Commit 697c138

Browse files
carlbennettcarlbennett
committed
Add getURI function to User class
1 parent 7ae57e3 commit 697c138

File tree

9 files changed

+21
-17
lines changed

9 files changed

+21
-17
lines changed

‎src/libraries/User.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,14 @@ public function getPasswordSalt() {
267267
return $this->password_salt;
268268
}
269269

270+
public function getURI() {
271+
return Common::relativeUrlToAbsolute(
272+
"/user/" . $this->getId() . "/" . Common::sanitizeForUrl(
273+
$this->getName(), true
274+
)
275+
);
276+
}
277+
270278
public function getUsername() {
271279
return $this->username;
272280
}

‎src/templates/Credits.phtml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ require("./header.inc.phtml");
4545
$pfx = ""; $sfx = "";
4646
} else {
4747
if (!isset($users[$item->user_id])) $users[$item->user_id] = new User($item->user_id);
48-
$pfx = "<a href=\"" . Common::relativeUrlToAbsolute("/user/" . urlencode($item->user_id) . "/"
49-
. Common::sanitizeForUrl($users[$item->user_id]->getName(), true)) . "\">"
48+
$pfx = "<a href=\"" . $users[$item->user_id]->getURI() . "\">"
5049
. "<img class=\"avatar\" src=\"https:"
5150
. $getAvatar($avatars, $users[$item->user_id])->getUrl(22, "identicon")
5251
. "\"/> ";
@@ -72,8 +71,7 @@ require("./header.inc.phtml");
7271
$pfx = ""; $sfx = "";
7372
} else {
7473
if (!isset($users[$item->user_id])) $users[$item->user_id] = new User($item->user_id);
75-
$pfx = "<a href=\"" . Common::relativeUrlToAbsolute("/user/" . urlencode($item->user_id) . "/"
76-
. Common::sanitizeForUrl($users[$item->user_id]->getName(), true)) . "\">"
74+
$pfx = "<a href=\"" . $users[$item->user_id]->getURI() . "\">"
7775
. "<img class=\"avatar\" src=\"https:"
7876
. $getAvatar($avatars, $users[$item->user_id])->getUrl(22, "identicon")
7977
. "\"/> ";

‎src/templates/Document/Index.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ require("./header.inc.phtml");
3636
<?php foreach ($this->getContext()->documents as $document) {
3737
$user = $document->getUser();
3838
if ($user) {
39-
$user_url = Common::relativeUrlToAbsolute("/user/" . urlencode($user->getId()) . "/" . Common::sanitizeForUrl($user->getName(), true));
39+
$user_url = $user->getURI();
4040
$avatar_url = "https:" . $getAvatar($avatars, $user)->getUrl(22, "identicon");
4141
}
4242
?>

‎src/templates/Document/View.phtml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ if ($object) {
2929

3030
$user_name = $object->getUser()->getName();
3131
$user_id = $object->getUserId();
32-
$user_url = Common::relativeUrlToAbsolute("/user/" . $user_id . "/" . Common::sanitizeForUrl($user_name, true));
32+
$user_url = $object->getUser()->getURI();
3333
$user_avatar = "https:" . (new Gravatar($object->getUser()->getEmail()))->getUrl(22, "identicon");
3434

3535
} else {
@@ -70,7 +70,7 @@ require("./header.inc.phtml");
7070
$a_uploaddate = $a->getCreatedDateTime()->format("l, F j, Y");
7171
$a_author_name = $a->getUser()->getName();
7272
$a_author_id = $a->getUserId();
73-
$a_author_url = Common::relativeUrlToAbsolute("/user/" . $a_author_id . "/" . Common::sanitizeForUrl($a_author_name, true));
73+
$a_author_url = $a->getUser()->getURI();
7474
$a_author_avatar = "https:" . (new Gravatar($a->getUser()->getEmail()))->getUrl(22, "identicon");
7575
?>
7676
<tr><td><a href="<?php echo $a_url; ?>"><?php echo $a_filename; ?></a></td><td><?php echo $a_size; ?></td><td><?php echo $a_uploaddate; ?></td><td><a href="<?php echo $a_author_url; ?>"><img class="avatar" src="<?php echo $a_author_avatar; ?>"/> <?php echo htmlspecialchars($a_author_name, ENT_HTML5, "UTF-8"); ?></a></td></tr>
@@ -90,7 +90,7 @@ require("./header.inc.phtml");
9090
$c_user = $c->getUser();
9191
$c_user_name = $c_user->getName();
9292
$c_user_id = $c->getUserId();
93-
$c_user_url = Common::relativeUrlToAbsolute("/user/" . $c_user_id . "/" . Common::sanitizeForUrl($c_user_name, true));
93+
$c_user_url = $c_user->getURI();
9494
$c_user_avatar = "https:" . (new Gravatar($c_user->getEmail()))->getUrl(22, "identicon");
9595
?>
9696
<tr><td><a href="<?php echo $c_user_url; ?>"><img class="avatar" src="<?php echo $c_user_avatar; ?>"/> <?php echo htmlspecialchars($c_user_name, ENT_HTML5, "UTF-8"); ?></a><br/><time class="comment_timestamp" datetime="<?php echo $c->getCreatedDateTime()->format("c"); ?>"><?php echo $c->getCreatedDateTime()->format("D M j, Y g:ia T"); ?></time></td><td><?php echo $c->getContent(true); ?></td></tr>

‎src/templates/News.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ if (is_null($news_posts) || empty($news_posts)) {
6969
<?php } ?>
7070
<section class="news"><img class="category" alt="<?php echo $news_post->getCategory()->getLabel(); ?>" title="<?php echo $news_post->getCategory()->getLabel(); ?>" src="<?php echo Common::relativeUrlToAbsolute("/a/news_categories/" . $news_post->getCategory()->getFilename()); ?>"/><?php echo $news_post->getContent(true); ?></section>
7171
<footer>
72-
<span class="float-left"><a href="<?php echo Common::relativeUrlToAbsolute("/user/" . urlencode($user_id) . "/" . Common::sanitizeForUrl($users[$user_id]->getName(), true)); ?>"><img class="avatar" src="<?php echo $avatar; ?>"/> <?php echo htmlspecialchars($users[$user_id]->getName(), ENT_HTML5, "UTF-8"); ?></a></span>
72+
<span class="float-left"><a href="<?php echo $users[$user_id]->getURI(); ?>"><img class="avatar" src="<?php echo $avatar; ?>"/> <?php echo htmlspecialchars($users[$user_id]->getName(), ENT_HTML5, "UTF-8"); ?></a></span>
7373
<span class="float-right"><?php echo $news_post->getPublishedDateTime()->format("l, F j, Y"); ?></span>
7474
</footer>
7575
</article>

‎src/templates/News/View.phtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ if ($object) {
4343
$url .= "/" . Common::sanitizeForUrl($object->getTitle(), true);
4444
$user_name = $object->getUser()->getName();
4545
$user_id = $object->getUserId();
46-
$user_url = Common::relativeUrlToAbsolute("/user/" . $user_id . "/" . Common::sanitizeForUrl($user_name, true));
46+
$user_url = $object->getUser()->getURI();
4747
$user_avatar = "https:" . (new Gravatar($object->getUser()->getEmail()))->getUrl(22, "identicon");
4848
}
4949

@@ -84,7 +84,7 @@ require("./header.inc.phtml");
8484
$c_user = $c->getUser();
8585
$c_user_name = $c_user->getName();
8686
$c_user_id = $c->getUserId();
87-
$c_user_url = Common::relativeUrlToAbsolute("/user/" . $c_user_id . "/" . Common::sanitizeForUrl($c_user_name, true));
87+
$c_user_url = $c_user->getURI();
8888
$c_user_avatar = "https:" . (new Gravatar($c_user->getEmail()))->getUrl(22, "identicon");
8989
?>
9090
<tr><td><a href="<?php echo $c_user_url; ?>"><img class="avatar" src="<?php echo $c_user_avatar; ?>"/> <?php echo htmlspecialchars($c_user_name, ENT_HTML5, "UTF-8"); ?></a><br/><time class="comment_timestamp" datetime="<?php echo $c->getCreatedDateTime()->format("c"); ?>"><?php echo $c->getCreatedDateTime()->format("D M j, Y g:ia T"); ?></time></td><td><?php echo $c->getContent(true); ?></td></tr>

‎src/templates/Packet/Index.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ require("./header.inc.phtml");
4343
<?php foreach ($this->getContext()->packets as $packet) {
4444
$user = $packet->getUser();
4545
if ($user) {
46-
$user_url = Common::relativeUrlToAbsolute("/user/" . urlencode($user->getId()) . "/" . Common::sanitizeForUrl($user->getName(), true));
46+
$user_url = $user->getURI();
4747
$avatar_url = "https:" . $getAvatar($avatars, $user)->getUrl(22, "identicon");
4848
}
4949
$packet_id = $packet->getPacketId(true);

‎src/templates/Packet/View.phtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ if ($object) {
3232
if ($object->getUserId() !== null) {
3333
$user_name = $object->getUser()->getName();
3434
$user_id = $object->getUserId();
35-
$user_url = Common::relativeUrlToAbsolute("/user/" . $user_id . "/" . Common::sanitizeForUrl($user_name, true));
35+
$user_url = $object->getUser()->getURI();
3636
$user_avatar = "https:" . (new Gravatar($object->getUser()->getEmail()))->getUrl(22, "identicon");
3737
} else {
3838
$user_name = null;
@@ -107,7 +107,7 @@ require("./header.inc.phtml");
107107
$c_user = $c->getUser();
108108
$c_user_name = $c_user->getName();
109109
$c_user_id = $c->getUserId();
110-
$c_user_url = Common::relativeUrlToAbsolute("/user/" . $c_user_id . "/" . Common::sanitizeForUrl($c_user_name, true));
110+
$c_user_url = $c_user->getURI();
111111
$c_user_avatar = "https:" . (new Gravatar($c_user->getEmail()))->getUrl(22, "identicon");
112112
?>
113113
<tr><td><a href="<?php echo $c_user_url; ?>"><img class="avatar" src="<?php echo $c_user_avatar; ?>"/> <?php echo htmlspecialchars($c_user_name, ENT_HTML5, "UTF-8"); ?></a><br/><time class="comment_timestamp" datetime="<?php echo $c->getCreatedDateTime()->format("c"); ?>"><?php echo $c->getCreatedDateTime()->format("D M j, Y g:ia T"); ?></time></td><td><?php echo $c->getContent(true); ?></td></tr>

‎src/templates/header.inc.phtml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ use \BNETDocs\Libraries\User;
88

99
if (isset($this->getContext()->user_session)) {
1010
$_header_user = new User($this->getContext()->user_session->user_id);
11-
$_header_user_url = Common::relativeUrlToAbsolute(
12-
"/user/" . $_header_user->getId() . "/" . Common::sanitizeForUrl($_header_user->getName(), true)
13-
);
11+
$_header_user_url = $_header_user->getURI();
1412
$_header_staff = ($_header_user && $_header_user->isStaff());
1513
} else {
1614
$_header_user = null;

0 commit comments

Comments
 (0)