Version 5.0.13
This commit is contained in:
1 parent
b89858b2ff
commit
5efe744c5f
1407 files changed
+69690
-30177
No files matched your search
@@ -19,6 +19,7 @@ use IPS\Data\Store;
|
||||
use IPS\Db;
|
||||
use IPS\Dispatcher;
|
||||
use IPS\Extensions\SSOAbstract;
|
||||
use IPS\File;
|
||||
use IPS\GeoLocation;
|
||||
use IPS\Helpers\Form;
|
||||
use IPS\Helpers\Form\Address;
|
||||
@@ -27,11 +28,14 @@ use IPS\Helpers\Form\Number;
|
||||
use IPS\Helpers\Form\Radio;
|
||||
use IPS\Helpers\Form\Stack;
|
||||
use IPS\Helpers\Form\Tel;
|
||||
use IPS\Helpers\Form\Translatable;
|
||||
use IPS\Helpers\Form\Url as FormUrl;
|
||||
use IPS\Helpers\Form\YesNo;
|
||||
use IPS\Helpers\Wizard;
|
||||
use IPS\Http\Request\Exception;
|
||||
use IPS\Http\Url;
|
||||
use IPS\IPS;
|
||||
use IPS\Lang;
|
||||
use IPS\Login as LoginClass;
|
||||
use IPS\Login\Handler;
|
||||
use IPS\Member;
|
||||
@@ -96,6 +100,12 @@ class login extends Controller
|
||||
{
|
||||
$buttons['add']['link'] = $buttons['add']['link']->setQueryString( '_new', 1 );
|
||||
}
|
||||
|
||||
/* No add button for managed */
|
||||
if( !IPS::canManageResources() )
|
||||
{
|
||||
unset( $buttons['add'] );
|
||||
}
|
||||
|
||||
return $buttons;
|
||||
}
|
||||
@@ -476,6 +486,20 @@ class login extends Controller
|
||||
'0' => 'force_reg_terms_0',
|
||||
'1' => 'force_reg_terms_1',
|
||||
) ) ) );
|
||||
$form->add( new YesNo( 'reg_welcome_email', Settings::i()->reg_welcome_email, false, [ 'togglesOn' => [ 'reg_welcome_email_text' ] ] ) );
|
||||
|
||||
$defaultMessage = Member::loggedIn()->language()->addToStack( 'email_reg_complete', false, [ 'sprintf' => [ Settings::i()->board_name ] ] ) . Member::loggedIn()
|
||||
->language()->addToStack( 'email_reg_complete_pass' );
|
||||
$form->add( new Translatable( 'reg_welcome_email_text', Member::loggedIn()->language()->checkKeyExists( 'reg_welcome_email_message' ) ? null : $defaultMessage, null, [
|
||||
'app' => 'core',
|
||||
'key' => 'reg_welcome_email_message',
|
||||
'editor' => [
|
||||
'app' => 'core',
|
||||
'key' => 'Admin',
|
||||
'allowAttachments' => false,
|
||||
'autoSaveKey' => 'core-Admin-reg_welcome_email_message',
|
||||
]
|
||||
], id: 'reg_welcome_email_text' ) );
|
||||
|
||||
/* Save */
|
||||
if ( $values = $form->values() )
|
||||
@@ -490,6 +514,24 @@ class login extends Controller
|
||||
{
|
||||
$values['coppa_address'] = json_encode( $values['coppa_address'] );
|
||||
}
|
||||
|
||||
if( isset( $values['reg_welcome_email_text'] ) )
|
||||
{
|
||||
/* We only want to save this if it doesn't match the default */
|
||||
Member::loggedIn()->language()->parseOutputForDisplay( $defaultMessage );
|
||||
if( strip_tags( $values['reg_welcome_email_text'][ Member::loggedIn()->language()->id ] ) != trim( strip_tags( $defaultMessage ) ) )
|
||||
{
|
||||
Lang::saveCustom( 'core', 'reg_welcome_email_message', $values['reg_welcome_email_text'] );
|
||||
}
|
||||
else
|
||||
{
|
||||
Lang::deleteCustom( 'core', 'reg_welcome_email_message' );
|
||||
}
|
||||
|
||||
File::claimAttachments( 'core-Admin-reg_welcome_email_message', null, null, 'reg_welcome_email_message', true );
|
||||
|
||||
unset( $values['reg_welcome_email_text'] );
|
||||
}
|
||||
|
||||
$form->saveAsSettings( $values );
|
||||
Session::i()->log( 'acplogs__registration_settings' );
|
||||
|
||||
Reference in new issue
Block a user