summaryrefslogtreecommitdiff
path: root/modules/user/views
diff options
context:
space:
mode:
Diffstat (limited to 'modules/user/views')
-rw-r--r--modules/user/views/admin_users.html.php20
-rw-r--r--modules/user/views/admin_users_group.html.php10
-rw-r--r--modules/user/views/login.html.php12
-rw-r--r--modules/user/views/login_ajax.html.php4
-rw-r--r--modules/user/views/reset_password.html.php6
-rw-r--r--modules/user/views/user_languages_block.html.php19
6 files changed, 46 insertions, 25 deletions
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index b469f82d..c065e4b1 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -28,7 +28,7 @@
{},
function(data) {
$("#group-" + group_id).html(data);
- $("#group-" + group_id + " .gDialogLink").bind("click", handleDialogEvent);
+ $("#group-" + group_id + " .gDialogLink").gallery_dialog();
});
}
@@ -44,7 +44,7 @@
<div class="gBlock">
<a href="<?= url::site("admin/users/add_user_form") ?>"
class="gDialogLink gButtonLink right ui-icon-left ui-state-default ui-corner-all"
- title="<?= t("Create a new user") ?>">
+ title="<?= t("Create a new user")->for_html_attr() ?>">
<span class="ui-icon ui-icon-circle-plus"></span>
<?= t("Add a new user") ?>
</a>
@@ -66,18 +66,18 @@
<? foreach ($users as $i => $user): ?>
<tr id="gUser-<?= $user->id ?>" class="<?= text::alternate("gOddRow", "gEvenRow") ?> user <?= $user->admin ? "admin" : "" ?>">
<td id="user-<?= $user->id ?>" class="core-info gDraggable">
- <img src="<?= $user->avatar_url(20, $theme->theme_url("images/avatar.jpg", true)) ?>"
- title="<?= t("Drag user onto group below to add as a new member") ?>"
- alt="<?= p::clean($user->name) ?>"
+ <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
+ title="<?= t("Drag user onto group below to add as a new member")->for_html_attr() ?>"
+ alt="<?= html::clean_attribute($user->name) ?>"
width="20"
height="20" />
- <?= p::clean($user->name) ?>
+ <?= html::clean($user->name) ?>
</td>
<td>
- <?= p::clean($user->full_name) ?>
+ <?= html::clean($user->full_name) ?>
</td>
<td>
- <?= p::clean($user->email) ?>
+ <?= html::clean($user->email) ?>
</td>
<td>
<?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?>
@@ -92,7 +92,7 @@
class="gDialogLink gButtonLink ui-state-default ui-corner-all ui-icon-left">
<span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
<? else: ?>
- <span title="<?= t("This user cannot be deleted") ?>"
+ <span title="<?= t("This user cannot be deleted")->for_html_attr() ?>"
class="gButtonLink ui-state-disabled ui-corner-all ui-icon-left">
<span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></span>
<? endif ?>
@@ -106,7 +106,7 @@
<div id="gGroupAdmin" class="gBlock">
<a href="<?= url::site("admin/users/add_group_form") ?>"
class="gDialogLink gButtonLink right ui-icon-left ui-state-default ui-corner-all"
- title="<?= t("Create a new group") ?>">
+ title="<?= t("Create a new group")->for_html_attr() ?>">
<span class="ui-icon ui-icon-circle-plus"></span>
<?= t("Add a new group") ?>
</a>
diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php
index bfd79dba..476e0817 100644
--- a/modules/user/views/admin_users_group.html.php
+++ b/modules/user/views/admin_users_group.html.php
@@ -1,13 +1,13 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<h4>
- <?= p::clean($group->name) ?>
+ <?= html::clean($group->name) ?>
<? if (!$group->special): ?>
<a href="<?= url::site("admin/users/delete_group_form/$group->id") ?>"
- title="<?= t("Delete the %name group", array("name" => p::clean($group->name))) ?>"
+ title="<?= t("Delete the %name group", array("name" => $group->name))->for_html_attr() ?>"
class="gDialogLink gButtonLink ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
<? else: ?>
- <a title="<?= t("This default group cannot be deleted") ?>"
+ <a title="<?= t("This default group cannot be deleted")->for_html_attr() ?>"
class="gDialogLink gButtonLink ui-state-disabled ui-corner-all ui-icon-left">
<span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
<? endif ?>
@@ -17,12 +17,12 @@
<ul>
<? foreach ($group->users as $i => $user): ?>
<li class="gUser">
- <?= p::clean($user->name) ?>
+ <?= html::clean($user->name) ?>
<? if (!$group->special): ?>
<a href="javascript:remove_user(<?= $user->id ?>, <?= $group->id ?>)"
class="gButtonLink ui-state-default ui-corner-all ui-icon-left"
title="<?= t("Remove %user from %group group",
- array("user" => p::clean($user->name), "group" => p::clean($group->name))) ?>">
+ array("user" => $user->name, "group" => $group->name))->for_html_attr() ?>">
<span class="ui-icon ui-icon-closethick"><?= t("remove") ?></span>
</a>
<? endif ?>
diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php
index 7617d131..bb670d51 100644
--- a/modules/user/views/login.html.php
+++ b/modules/user/views/login.html.php
@@ -3,19 +3,19 @@
<? if ($user->guest): ?>
<li class="first">
<a href="<?= url::site("login/ajax") ?>"
- title="<?= t("Login to Gallery") ?>"
+ title="<?= t("Login to Gallery")->for_html_attr() ?>"
id="gLoginLink"><?= t("Login") ?></a>
</li>
<? else: ?>
<li class="first">
- <?= t('Logged in as %name', array('name' =>
- '<a href="' . url::site("form/edit/users/{$user->id}") .
- '" title="' . t("Edit Your Profile") .
+ <?= t('Logged in as %name', array('name' => html::mark_clean(
+ '<a href="' . url::site("form/edit/users/{$user->id}") .
+ '" title="' . t("Edit Your Profile")->for_html_attr() .
'" id="gUserProfileLink" class="gDialogLink">' .
- p::clean(empty($user->full_name) ? $user->name : $user->full_name) . '</a>')) ?>
+ html::clean($user->display_name()) . '</a>'))) ?>
</li>
<li>
- <a href="<?= url::site("logout?csrf=$csrf&continue=" . url::current(true)) ?>"
+ <a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(url::current(true))) ?>"
id="gLogoutLink"><?= t("Logout") ?></a>
</li>
<? endif ?>
diff --git a/modules/user/views/login_ajax.html.php b/modules/user/views/login_ajax.html.php
index 56a6f111..56bc1cbd 100644
--- a/modules/user/views/login_ajax.html.php
+++ b/modules/user/views/login_ajax.html.php
@@ -6,7 +6,7 @@
url: "<?= url::site("password/reset") ?>",
success: function(data) {
$("div#gLoginView").html(data);
- $("#ui-dialog-title-gDialog").text("<?= t("Reset Password") ?>");
+ $("#ui-dialog-title-gDialog").html(<?= t("Reset Password")->for_js() ?>);
ajaxify_login_reset_form();
}
});
@@ -38,7 +38,7 @@
</div>
</li>
<li>
- <a href="#" id="gForgotPasswordLink"><?= t("Forgot your Password?") ?></a>
+ <a href="#" id="gForgotPasswordLink"><?= t("Forgot Your Password?") ?></a>
</li>
</ul>
</div>
diff --git a/modules/user/views/reset_password.html.php b/modules/user/views/reset_password.html.php
index 4c4672ee..92ca4917 100644
--- a/modules/user/views/reset_password.html.php
+++ b/modules/user/views/reset_password.html.php
@@ -6,10 +6,12 @@
<body>
<h2><?= t("Password Reset Request") ?> </h2>
<p>
- <?= t("Hello, %name,", array("name" => p::clean($user->full_name ? $user->full_name : $user->name))) ?>
+ <?= t("Hello, %name,", array("name" => $user->full_name ? $user->full_name : $user->name)) ?>
</p>
<p>
- <?= t("We received a request to reset your password for <a href=\"%site_url\">%site_url</a>. If you made this request, you can confirm it by <a href=\"%confirm_url\">clicking this link</a>. If you didn't request this password reset, it's ok to ignore this mail.", array("site_url" => url::base(false, "http"), "confirm_url" => $confirm_url)) ?>
+ <?= t("We received a request to reset your password for <a href=\"%site_url\">%site_url</a>. If you made this request, you can confirm it by <a href=\"%confirm_url\">clicking this link</a>. If you didn't request this password reset, it's ok to ignore this mail.",
+ array("site_url" => html::mark_clean(url::base(false, "http")),
+ "confirm_url" => $confirm_url)) ?>
</p>
</body>
</html>
diff --git a/modules/user/views/user_languages_block.html.php b/modules/user/views/user_languages_block.html.php
new file mode 100644
index 00000000..b5ae674c
--- /dev/null
+++ b/modules/user/views/user_languages_block.html.php
@@ -0,0 +1,19 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<?= form::dropdown("gSelectSessionLocale", $installed_locales, $selected) ?>
+<script type="text/javascript">
+ $("#gSelectSessionLocale").change(function() {
+ var old_locale_preference = <?= html::js_string($selected) ?>;
+ var locale = $(this).val();
+ if (old_locale_preference == locale) {
+ return;
+ }
+
+ var expires = -1;
+ if (locale) {
+ expires = 365;
+ }
+ $.cookie("g_locale", locale, {"expires": expires, "path": "/"});
+ window.location.reload(true);
+ });
+</script>
+
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-16 10:05:44 +0000