fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-11 04:52:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Clean up method of loading default sender info #2661

Browse source
This commit is contained in:
Kijin Sung 2026-02-05 22:36:31 +09:00
parent d9a6c577fd
commit d824bc9da3
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/admin/controllers/systemconfig/Notification.php
View file

@ -20,17 +20,16 @@ class Notification extends Base
public function dispAdminConfigNotification() public function dispAdminConfigNotification()
{ {
// Load advanced mailer module (for lang). // Load advanced mailer module (for lang).
$oAdvancedMailerAdminView = \Advanced_mailerAdminView::getInstance(); $oAdvancedMailerController = \Advanced_mailerController::getInstance();
// Load advanced mailer config. // Load advanced mailer config.
$advanced_mailer_config = $oAdvancedMailerAdminView->getConfig(); $advanced_mailer_config = $oAdvancedMailerController->getConfig();
Context::set('advanced_mailer_config', $advanced_mailer_config); Context::set('advanced_mailer_config', $advanced_mailer_config);
// Load member config. // Load member config.
$member_config = ModuleModel::getModuleConfig('member'); $default_identity = $oAdvancedMailerController->getDefaultEmailIdentity();
Context::set('member_config', $member_config); Context::set('webmaster_name', $default_identity[1]);
Context::set('webmaster_name', !empty($member_config->webmaster_name) ? $member_config->webmaster_name : 'webmaster'); Context::set('webmaster_email', $default_identity[0]);
Context::set('webmaster_email', $member_config->webmaster_email ?? '');
// Load module config. // Load module config.
$module_config = ModuleModel::getModuleConfig('module'); $module_config = ModuleModel::getModuleConfig('module');
@ -89,7 +88,7 @@ class Notification extends Base
$vars = Context::getRequestVars(); $vars = Context::getRequestVars();
// Load advanced mailer module (for lang). // Load advanced mailer module (for lang).
$oAdvancedMailerAdminView = \Advanced_mailerAdminView::getInstance(); $oAdvancedMailerController = \Advanced_mailerController::getInstance();
// Validate the mail sender's information. // Validate the mail sender's information.
if (!$vars->mail_default_name) if (!$vars->mail_default_name)