sydney/IPB
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 5.0.0 beta 9

Browse Source
This commit is contained in:
Neo committed 2025-12-19 17:47:00 -08:00
1 parent 214f649f1d
commit 56979f8ee8
202 files changed
+4403 -1123
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

applications/core/modules/admin/members/members.php
+4 -15
View File
@@ -2013,18 +2013,7 @@ class members extends Controller
/* Change */
$oldEmail = $member->email;
$member->email = Request::i()->email;
$member->save();
foreach ( Login::methods() as $method )
{
try
{
$method->changeEmail( $member, $oldEmail, Request::i()->email );
}
catch( BadMethodCallException $e ) {}
}
$member->logHistory( 'core', 'email_change', array( 'old' => $oldEmail, 'new' => Request::i()->email, 'by' => 'manual' ) );
Event::fire( 'onEmailChange', $member, array( Request::i()->email, $oldEmail ) );
$member->changeEmail( Request::i()->email );
$member->invalidateSessionsAndLogins( TRUE, Session::i()->id );
Session::i()->log( 'acplog__members_edited_email', array( $member->name => FALSE ) );
}
@@ -2845,12 +2834,12 @@ class members extends Controller
/* New Reg */
elseif ( $row['new_reg'] )
{
Email::buildFromTemplate( 'core', 'registration_validate', array( $member, $row['vid'], $plainTextKey ), Email::TYPE_TRANSACTIONAL )->send( $member );
Email::buildFromTemplate( 'core', 'registration_validate', array( $member, $row['vid'], $plainTextKey, $row['new_email'] ), Email::TYPE_TRANSACTIONAL )->send( $member );
}
/* Email Change */
elseif ( $row['email_chg'] )
{
Email::buildFromTemplate( 'core', 'email_change', array( $member, $row['vid'], $plainTextKey ), Email::TYPE_TRANSACTIONAL )->send( $member );
Email::buildFromTemplate( 'core', 'email_change', array( $member, $row['vid'], $plainTextKey, $row['new_email'] ), Email::TYPE_TRANSACTIONAL )->send( $row['new_email'], array(), array(), NULL, NULL, array( 'Reply-To' => Settings::i()->email_in ) );
}
/* Forgot security answers */
elseif ( $row['forgot_security'] )
@@ -3199,7 +3188,7 @@ class members extends Controller
Session::i()->log( 'acplog__deleted_guest_content', array( $values['guest_name_to_delete'] => FALSE ) );
Output::i()->redirect( Url::internal( "app=core&module=moderation&controller=spam&searchResult=guest_captcha" ), 'deleted' );
Output::i()->redirect( Url::internal( "app=core&module=moderation&controller=spam" ), 'deleted' );
}
Output::i()->output = $form;
applications/core/modules/admin/moderation/spam.php
+4 -5
View File
@@ -168,10 +168,10 @@ class spam extends Controller
case 'toggles':
return array(
'none' => array( 'bot_antispam_type_warning' ),
'recaptcha2' => array( 'guest_captcha', 'recaptcha2_public_key', 'recaptcha2_private_key' ),
'invisible' => array( 'guest_captcha', 'recaptcha2_public_key', 'recaptcha2_private_key' ),
'keycaptcha' => array( 'guest_captcha', 'keycaptcha_privatekey' ),
'hcaptcha' => array( 'guest_captcha', 'hcaptcha_sitekey', 'hcaptcha_secret')
'recaptcha2' => array( 'recaptcha2_public_key', 'recaptcha2_private_key' ),
'invisible' => array( 'recaptcha2_public_key', 'recaptcha2_private_key' ),
'keycaptcha' => array( 'keycaptcha_privatekey' ),
'hcaptcha' => array( 'hcaptcha_sitekey', 'hcaptcha_secret')
);
}
@@ -196,7 +196,6 @@ class spam extends Controller
$form->add( new Text( 'keycaptcha_privatekey', Settings::i()->keycaptcha_privatekey, FALSE, array(), NULL, NULL, NULL, 'keycaptcha_privatekey' ) );
$form->add( new Text( 'hcaptcha_sitekey', Settings::i()->hcaptcha_sitekey, FALSE, array(), NULL, NULL, NULL, 'hcaptcha_sitekey' ) );
$form->add( new Text( 'hcaptcha_secret', Settings::i()->hcaptcha_secret, FALSE, array(), NULL, NULL, NULL, 'hcaptcha_secret' ) );
$form->add( new YesNo( 'guest_captcha', Settings::i()->guest_captcha, FALSE, array(), NULL, NULL, NULL, 'guest_captcha' ) );
/* Save values */
if ( $form->values() )
applications/core/modules/admin/settings/login.php
+1
View File
@@ -345,6 +345,7 @@ class login extends Controller
$form->addHeader( 'login_settings' );
$form->add( new YesNo( 'new_device_email', Settings::i()->new_device_email, FALSE ) );
$form->add( new YesNo( 'login_after_inactivity_notification', Settings::i()->login_after_inactivity_notification, FALSE ) );
/* Save */
if ( $values = $form->values() )
applications/core/modules/admin/settings/posting.php
+6 -1
View File
@@ -215,8 +215,13 @@ class posting extends Controller
$x = Member::loggedIn()->language()->addToStack( 'sso_setting_override', FALSE, [ 'pluralize' => [ count( $appBlocks ) ],'htmlsprintf' => [ Member::loggedIn()->language()->formatList( $appBlocks ) ] ] );
Member::loggedIn()->language()->words['post_before_registering_desc'] = $x;
}
elseif( Settings::i()->bot_antispam_type === 'none' )
{
$pbrDisabled = TRUE;
Member::loggedIn()->language()->words['post_before_registering_desc'] = Member::loggedIn()->language()->addToStack('post_before_registering_captcha_req');
}
$form->add( new Radio( 'post_before_registering', Settings::i()->post_before_registering, FALSE, array( 'disabled' => $pbrDisabled,'options' => array( 1 => 'post_before_registering_on', 0 => 'post_before_registering_off' ) ), NULL, NULL, NULL, 'post_before_registering' ) );
$form->add( new Radio( 'post_before_registering', Settings::i()->post_before_registering, FALSE, [ 'disabled' => $pbrDisabled,'options' => [ 1 => 'post_before_registering_on', 0 => 'post_before_registering_off' ] ], id: 'post_before_registering' ) );
}
Member::loggedIn()->language()->words['post_before_registering_on'] = sprintf( Member::loggedIn()->language()->get('post_before_registering_on'), Member::loggedIn()->language()->addToStack( 'core_group_' . Settings::i()->member_group ) );
$form->add( new Number( 'max_title_length', Settings::i()->max_title_length, FALSE, array( 'max' => 255 ), NULL, NULL, Member::loggedIn()->language()->addToStack('max_title_length_suffix') ) );