Version 4.7.8

This commit is contained in:
Neo committed 2025-12-19 16:10:42 -08:00
1 parent 7b7404e741
commit fd22d99e69
688 files changed
+19814 -10890

No files matched your search

@@ -611,7 +611,7 @@ class _members extends \IPS\Helpers\CoverPhoto\Controller
if ( $member->member_id )
{
$member->datalayer_collect_pii = (bool) !$member->datalayer_collect_pii;
$member->members_bitoptions['datalayer_pii_optout'] = (bool) !$member->members_bitoptions['datalayer_pii_optout'];
$member->save();
}
$_SESSION['member_datalayer_changed'] = 1;
@@ -2829,7 +2829,7 @@ class _members extends \IPS\Helpers\CoverPhoto\Controller
else
{
/* Get existing banned IPs */
$bannedIps = iterator_to_array( \IPS\Db::i()->select( 'ban_content', 'core_banfilters', array( 'ban_type=?', 'ip' ) )->setKeyField( 'ban_content' ) );
$bannedIps = iterator_to_array( \IPS\Db::i()->select( 'ban_content', 'core_banfilters', array( 'ban_type=?', 'ip' ) ) );
/* Build form */
$form = new \IPS\Helpers\Form;
@@ -2842,7 +2842,12 @@ class _members extends \IPS\Helpers\CoverPhoto\Controller
if ( $member->temp_ban === 0 )
{
$form->add( new \IPS\Helpers\Form\Select( 'member_ban_group', $member->member_group_id, FALSE, array( 'options' => \IPS\Member\Group::groups( FALSE, FALSE ), 'parse' => 'normal' ), NULL, NULL, NULL, 'member_ban_group' ) );
$memberIps = array_keys( $member->ipAddresses() );
$memberIps = array();
foreach( $member->ipAddresses() as $k => $v )
{
$memberIps[ $k ] = $k;
}
$form->add( new \IPS\Helpers\Form\CheckboxSet( 'member_ban_ips', array_intersect( $memberIps, $bannedIps ), FALSE, array( 'options' => $memberIps, 'multiple' => TRUE ), NULL, NULL, NULL, 'member_ban_ips' ) );
}
@@ -2868,8 +2873,8 @@ class _members extends \IPS\Helpers\CoverPhoto\Controller
{
$member->logHistory( 'core', 'warning', array( 'restrictions' => array( 'ban' => array( 'old' => $_existingValue, 'new' => $member->temp_ban ) ) ) );
}
if ( isset( $values['member_ban_group'] ) )
if ( isset( $values['member_ban_group'] ) AND $values['member_ban_group'] != $member->member_group_id )
{
$member->logHistory( 'core', 'group', array( 'type' => 'primary', 'by' => 'manual', 'old' => $member->member_group_id, 'new' => $values['member_ban_group'] ) );
$member->member_group_id = $values['member_ban_group'];