Version 5.0.14
This commit is contained in:
1 parent
5efe744c5f
commit
dbd774b30c
364 files changed
+7048
-1377
No files matched your search
@@ -100,6 +100,7 @@ use function method_exists;
|
||||
use function str_replace;
|
||||
use function strlen;
|
||||
use function strtotime;
|
||||
use const IPS\CIC;
|
||||
use const IPS\Helpers\Table\HEADER;
|
||||
use const IPS\Helpers\Table\SEARCH_CONTAINS_TEXT;
|
||||
use const IPS\Helpers\Table\SEARCH_DATE_RANGE;
|
||||
@@ -2180,7 +2181,7 @@ class members extends Controller
|
||||
Dispatcher::i()->checkAcpPermission( 'member_edit' );
|
||||
|
||||
/* Managed Only */
|
||||
if( !\IPS\CIC OR ( \IPS\CIC AND !isManaged() ) )
|
||||
if( !CIC OR !isManaged() )
|
||||
{
|
||||
Output::i()->error( 'node_error', '2C114/17', 403, '' );
|
||||
}
|
||||
@@ -2230,7 +2231,7 @@ class members extends Controller
|
||||
$form->add( new Text( 'add_login_link_identifier', NULL, TRUE, customValidationCode: function( $value ) {
|
||||
try
|
||||
{
|
||||
Db::i()->select( '*', 'core_login_links', [ 'token_login_method=? AND token_identifier=?', (int) \IPS\Request::i()->add_login_link_handler, $value ] )->first();
|
||||
Db::i()->select( '*', 'core_login_links', [ 'token_login_method=? AND token_identifier=?', (int) Request::i()->add_login_link_handler, $value ] )->first();
|
||||
throw new DomainException( 'login_identifier_exists' );
|
||||
}
|
||||
catch( UnderflowException ) {}
|
||||
@@ -4379,7 +4380,7 @@ class members extends Controller
|
||||
{
|
||||
if( $method::class != 'IPS\Login\Handler\Standard' AND $method::class != 'IPS\convert\extensions\core\LoginHandler\Converter' )
|
||||
{
|
||||
$columns[ 'core_login_' . $method->_id ] = \IPS\Member::loggedIn()->language()->addToStack( 'import_login_links_suffix', FALSE, [ 'sprintf' => [ $method->_title ] ] );
|
||||
$columns[ 'core_login_' . $method->_id ] = Member::loggedIn()->language()->addToStack( 'import_login_links_suffix', FALSE, [ 'sprintf' => [ $method->_title ] ] );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4685,7 +4686,7 @@ class members extends Controller
|
||||
|
||||
$valueToWrite = match( $field->type ) {
|
||||
'YesNo', 'Checkbox' => $member[ 'field_' . $fieldId ] ? Member::loggedIn()->language()->get('yes') : Member::loggedIn()->language()->get('no'),
|
||||
default => $member[ 'field_' . $fieldId ] ? Field::load( $fieldId )->displayValue( $member[ 'field_' . $fieldId ], FALSE, NULL, 0, NULL, TRUE, ',' ) : ''
|
||||
default => $member[ 'field_' . $fieldId ] ? Field::load( $fieldId )->displayValue( $member[ 'field_' . $fieldId ], FALSE, NULL, 0, NULL, TRUE ) : ''
|
||||
};
|
||||
}
|
||||
else if ( mb_substr( $column, 0, 11 ) == 'core_login_' )
|
||||
@@ -5097,7 +5098,7 @@ class members extends Controller
|
||||
return [ 'delete' => [
|
||||
'icon' => 'times-circle',
|
||||
'title' => 'delete',
|
||||
'link' => $row['rule'] ? NULL : $member->acpUrl()->setQueryString( ['do' => 'deleteBadge', 'id' => $row['badge_id'], 'member_id' => $member->member_id ] ),
|
||||
'link' => $row['rule'] ? NULL : $member->acpUrl()->setQueryString( ['do' => 'deleteBadge', 'id' => $row['badge_id'], 'member_id' => $member->member_id ] )->csrf(),
|
||||
'class' => $row['rule'] ? 'ipsControlStrip_disabled' : '',
|
||||
'data' => $row['rule'] ? [] : [ 'delete' => '' ],
|
||||
'tooltip' => Member::loggedIn()->language()->addToStack( $row['rule'] ? 'acp_badge_cannot_delete' : 'delete' )
|
||||
@@ -5174,6 +5175,8 @@ class members extends Controller
|
||||
*/
|
||||
protected function deleteBadge() : void
|
||||
{
|
||||
Request::i()->confirmedDelete();
|
||||
|
||||
/* Load Member */
|
||||
try
|
||||
{
|
||||
@@ -5206,16 +5209,6 @@ class members extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Request that a member's email is unblocked (via ajax)
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function requestEmailUnblock(): void
|
||||
{
|
||||
Bridge::i()->bounceMemberViewRequestEmailUnblock();
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if the functionality to manually add members is enabled
|
||||
*
|
||||
|
||||
Reference in new issue
Block a user