Fixed notice about $USER when not logged in
This commit is contained in:
@@ -56,8 +56,20 @@ $options['0'] = get_string('none');
|
||||
$options = array_merge($options, $charsets);
|
||||
$temp->add(new admin_setting_configselect('sitemailcharset', get_string('sitemailcharset', 'admin'), get_string('configsitemailcharset','admin'), '', $options));
|
||||
$temp->add(new admin_setting_configcheckbox('allowusermailcharset', get_string('allowusermailcharset', 'admin'), get_string('configallowusermailcharset', 'admin'), 0));
|
||||
$temp->add(new admin_setting_configtext('supportname', get_string('supportname', 'admin'), get_string('configsupportname', 'admin'), fullname($USER), PARAM_NOTAGS));
|
||||
$temp->add(new admin_setting_configtext('supportemail', get_string('supportemail', 'admin'), get_string('configsupportemail', 'admin'), $USER->email, PARAM_NOTAGS));
|
||||
if (empty($USER)) {
|
||||
if ($mainadmin = get_admin()) {
|
||||
$primaryadminemail = $mainadmin->email;
|
||||
$primaryadminname = fullname($mainadmin);
|
||||
} else {
|
||||
$primaryadminemail = '';
|
||||
$primaryadminname = '';
|
||||
}
|
||||
} else {
|
||||
$primaryadminemail = $USER->email;
|
||||
$primaryadminname = fullname($USER);
|
||||
}
|
||||
$temp->add(new admin_setting_configtext('supportname', get_string('supportname', 'admin'), get_string('configsupportname', 'admin'), $primaryadminname, PARAM_NOTAGS));
|
||||
$temp->add(new admin_setting_configtext('supportemail', get_string('supportemail', 'admin'), get_string('configsupportemail', 'admin'), $primaryadminemail, PARAM_NOTAGS));
|
||||
$temp->add(new admin_setting_configtext('supportpage', get_string('supportpage', 'admin'), get_string('configsupportpage', 'admin'), '', PARAM_URL));
|
||||
$ADMIN->add('server', $temp, 100);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user