Skip to content

com_groups: add option to allow HTML in group restrict message #1929

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
denphi wants to merge 1 commit into
base: 2.4-main
Choose a base branch
from
Open

com_groups: add option to allow HTML in group restrict message #1929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions core/components/com_groups/admin/language/en-GB/en-GB.com_groups.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,8 @@ COM_GROUPS_CONFIG_MEMBERSHIP_MAX_TERM="Maximum term (days)"
COM_GROUPS_CONFIG_MEMBERSHIP_MAX_TERM_DESC="Longest end date a group manager may set, in days from today. Zero means no limit."
COM_GROUPS_CONFIG_MEMBERSHIP_BATCH="Expiration batch size"
COM_GROUPS_CONFIG_MEMBERSHIP_BATCH_DESC="How many lapsed memberships to revoke in a single cron run. The remainder is picked up on the next run."
COM_GROUPS_CONFIG_RESTRICT_MSG_ALLOW_HTML="Allow HTML in restricted join message"
COM_GROUPS_CONFIG_RESTRICT_MSG_ALLOW_HTML_DESC="Render the group's restricted-membership message as HTML on the join request page instead of escaping it as plain text. Off by default; only enable if group managers are trusted to enter safe markup."
COM_GROUPS_MEMBERSHIP_REAPER_STALLED="Membership end dates are not being enforced."
COM_GROUPS_MEMBERSHIP_REAPER_STALLED_DESC="The 'Group Membership Expiration' cron job has not run in the last 24 hours. Until it runs, memberships past their end date keep their access. Check that cron is running and the job is enabled."
COM_GROUPS_MEMBERSHIP_REAPER_OK="Membership expiration last ran %s."
Expand Down
4 changes: 4 additions & 0 deletions core/components/com_groups/config/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@
<field name="membership_expiration_grace_hours" type="text" default="0" label="COM_GROUPS_CONFIG_MEMBERSHIP_GRACE_HOURS" description="COM_GROUPS_CONFIG_MEMBERSHIP_GRACE_HOURS_DESC" size="10" />
<field name="membership_max_term_days" type="text" default="0" label="COM_GROUPS_CONFIG_MEMBERSHIP_MAX_TERM" description="COM_GROUPS_CONFIG_MEMBERSHIP_MAX_TERM_DESC" size="10" />
<field name="membership_expiration_batch" type="text" default="500" label="COM_GROUPS_CONFIG_MEMBERSHIP_BATCH" description="COM_GROUPS_CONFIG_MEMBERSHIP_BATCH_DESC" size="10" />
<field name="restrict_msg_allow_html" type="list" default="0" label="COM_GROUPS_CONFIG_RESTRICT_MSG_ALLOW_HTML" description="COM_GROUPS_CONFIG_RESTRICT_MSG_ALLOW_HTML_DESC">
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
</fieldset>

<fieldset name="email" label="COM_GROUPS_CONFIG_FIELDSET_EMAIL">
Expand Down
10 changes: 9 additions & 1 deletion core/components/com_groups/site/views/membership/tmpl/request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,15 @@
<legend><?php echo Lang::txt('COM_GROUPS_JOIN_SECTION_TITLE'); ?></legend>

<?php if ($this->group->get('restrict_msg')) { ?>
<p class="warning"><?php echo Lang::txt('NOTE') . ': ' . $this->escape(stripslashes($this->group->get('restrict_msg'))); ?></p>
<div class="warning">
<?php
$restrictMsg = stripslashes($this->group->get('restrict_msg'));
echo Lang::txt('NOTE') . ': ';
echo \Component::params('com_groups')->get('restrict_msg_allow_html', 0)
? $restrictMsg
: $this->escape($restrictMsg);
?>
</div>
<?php } ?>

<label for="reason">
Expand Down
Loading