diff --git a/classes/event/user_created.php b/classes/event/user_created.php index eb128e5..94ae7fc 100644 --- a/classes/event/user_created.php +++ b/classes/event/user_created.php @@ -52,7 +52,7 @@ public function get_description() { */ protected function init() { $this->context = \context_system::instance(); - $this->data['crud'] = 'r'; + $this->data['crud'] = 'c'; $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'user'; } diff --git a/classes/form/adminsetting/iconselect.css b/classes/form/adminsetting/iconselect.css new file mode 100644 index 0000000..6fe4121 --- /dev/null +++ b/classes/form/adminsetting/iconselect.css @@ -0,0 +1,26 @@ +label.iconselect { + display: inline-block !important; + padding: 0 !important; + margin: 5px; +} +label.iconselect img { + width: 25px; + height: 25px; + padding: 10px; +} +input.iconselect { + display: none; +} +input[type="radio"].iconselect:checked + label.iconselect { + outline: 1px solid #007fec; +} +body.ie input.iconselect { + display: inline-block; +} +body.ie label.iconselect { + margin-left: 0; + margin-right: 20px; +} +body.ie label.iconselect img { + padding: 5px; +} \ No newline at end of file diff --git a/classes/form/adminsetting/iconselect.php b/classes/form/adminsetting/iconselect.php index b14b2c6..f28da02 100644 --- a/classes/form/adminsetting/iconselect.php +++ b/classes/form/adminsetting/iconselect.php @@ -86,35 +86,9 @@ public function write_setting($data) { * @return string The setting HTML. */ public function output_html($data, $query = '') { - global $OUTPUT; - $html = ''; + global $CFG, $OUTPUT; + $attrs = array('type' => 'text/css', 'rel' => 'stylesheet', 'href' => new \moodle_url('/auth/oidc/classes/form/adminsetting/iconselect.css')); + $html = \html_writer::empty_tag('link', $attrs); $html .= \html_writer::start_tag('div', ['style' => 'max-width: 390px']); $selected = (!empty($data)) ? $data : $this->defaultsetting; foreach ($this->choices as $icon) { diff --git a/settings.php b/settings.php index 5db82ce..1729f9c 100644 --- a/settings.php +++ b/settings.php @@ -23,146 +23,146 @@ require_once(__DIR__.'/lib.php'); -$configkey = get_string('cfg_opname_key', 'auth_oidc'); -$configdesc = get_string('cfg_opname_desc', 'auth_oidc'); -$configdefault = get_string('pluginname', 'auth_oidc'); +$configkey = new lang_string('cfg_opname_key', 'auth_oidc'); +$configdesc = new lang_string('cfg_opname_desc', 'auth_oidc'); +$configdefault = new lang_string('pluginname', 'auth_oidc'); $settings->add(new admin_setting_configtext('auth_oidc/opname', $configkey, $configdesc, $configdefault, PARAM_TEXT)); -$configkey = get_string('cfg_clientid_key', 'auth_oidc'); -$configdesc = get_string('cfg_clientid_desc', 'auth_oidc'); +$configkey = new lang_string('cfg_clientid_key', 'auth_oidc'); +$configdesc = new lang_string('cfg_clientid_desc', 'auth_oidc'); $settings->add(new admin_setting_configtext('auth_oidc/clientid', $configkey, $configdesc, '', PARAM_TEXT)); -$configkey = get_string('cfg_clientsecret_key', 'auth_oidc'); -$configdesc = get_string('cfg_clientsecret_desc', 'auth_oidc'); +$configkey = new lang_string('cfg_clientsecret_key', 'auth_oidc'); +$configdesc = new lang_string('cfg_clientsecret_desc', 'auth_oidc'); $settings->add(new admin_setting_configtext('auth_oidc/clientsecret', $configkey, $configdesc, '', PARAM_TEXT)); -$configkey = get_string('cfg_authendpoint_key', 'auth_oidc'); -$configdesc = get_string('cfg_authendpoint_desc', 'auth_oidc'); +$configkey = new lang_string('cfg_authendpoint_key', 'auth_oidc'); +$configdesc = new lang_string('cfg_authendpoint_desc', 'auth_oidc'); $configdefault = 'https://login.microsoftonline.com/common/oauth2/authorize'; $settings->add(new admin_setting_configtext('auth_oidc/authendpoint', $configkey, $configdesc, $configdefault, PARAM_TEXT)); -$configkey = get_string('cfg_tokenendpoint_key', 'auth_oidc'); -$configdesc = get_string('cfg_tokenendpoint_desc', 'auth_oidc'); +$configkey = new lang_string('cfg_tokenendpoint_key', 'auth_oidc'); +$configdesc = new lang_string('cfg_tokenendpoint_desc', 'auth_oidc'); $configdefault = 'https://login.microsoftonline.com/common/oauth2/token'; $settings->add(new admin_setting_configtext('auth_oidc/tokenendpoint', $configkey, $configdesc, $configdefault, PARAM_TEXT)); -$configkey = get_string('cfg_oidcresource_key', 'auth_oidc'); -$configdesc = get_string('cfg_oidcresource_desc', 'auth_oidc'); +$configkey = new lang_string('cfg_oidcresource_key', 'auth_oidc'); +$configdesc = new lang_string('cfg_oidcresource_desc', 'auth_oidc'); $configdefault = 'https://graph.windows.net'; $settings->add(new admin_setting_configtext('auth_oidc/oidcresource', $configkey, $configdesc, $configdefault, PARAM_TEXT)); -$configkey = get_string('cfg_redirecturi_key', 'auth_oidc'); -$configdesc = get_string('cfg_redirecturi_desc', 'auth_oidc'); +$configkey = new lang_string('cfg_redirecturi_key', 'auth_oidc'); +$configdesc = new lang_string('cfg_redirecturi_desc', 'auth_oidc'); $settings->add(new \auth_oidc\form\adminsetting\redirecturi('auth_oidc/redirecturi', $configkey, $configdesc)); -$configkey = get_string('cfg_autoappend_key', 'auth_oidc'); -$configdesc = get_string('cfg_autoappend_desc', 'auth_oidc'); +$configkey = new lang_string('cfg_autoappend_key', 'auth_oidc'); +$configdesc = new lang_string('cfg_autoappend_desc', 'auth_oidc'); $configdefault = ''; $settings->add(new admin_setting_configtext('auth_oidc/autoappend', $configkey, $configdesc, $configdefault, PARAM_TEXT)); -$configkey = get_string('cfg_domainhint_key', 'auth_oidc'); -$configdesc = get_string('cfg_domainhint_desc', 'auth_oidc'); +$configkey = new lang_string('cfg_domainhint_key', 'auth_oidc'); +$configdesc = new lang_string('cfg_domainhint_desc', 'auth_oidc'); $configdefault = ''; $settings->add(new admin_setting_configtext('auth_oidc/domainhint', $configkey, $configdesc, $configdefault, PARAM_TEXT)); -$configkey = get_string('cfg_loginflow_key', 'auth_oidc'); +$configkey = new lang_string('cfg_loginflow_key', 'auth_oidc'); $configdesc = ''; $configdefault = 'authcode'; $settings->add(new \auth_oidc\form\adminsetting\loginflow('auth_oidc/loginflow', $configkey, $configdesc, $configdefault)); -$configkey = get_string('cfg_userrestrictions_key', 'auth_oidc'); -$configdesc = get_string('cfg_userrestrictions_desc', 'auth_oidc'); +$configkey = new lang_string('cfg_userrestrictions_key', 'auth_oidc'); +$configdesc = new lang_string('cfg_userrestrictions_desc', 'auth_oidc'); $configdefault = ''; $settings->add(new admin_setting_configtextarea('auth_oidc/userrestrictions', $configkey, $configdesc, $configdefault, PARAM_TEXT)); -$label = get_string('cfg_debugmode_key', 'auth_oidc'); -$desc = get_string('cfg_debugmode_desc', 'auth_oidc'); +$label = new lang_string('cfg_debugmode_key', 'auth_oidc'); +$desc = new lang_string('cfg_debugmode_desc', 'auth_oidc'); $settings->add(new \admin_setting_configcheckbox('auth_oidc/debugmode', $label, $desc, '0')); -$configkey = get_string('cfg_icon_key', 'auth_oidc'); -$configdesc = get_string('cfg_icon_desc', 'auth_oidc'); +$configkey = new lang_string('cfg_icon_key', 'auth_oidc'); +$configdesc = new lang_string('cfg_icon_desc', 'auth_oidc'); $configdefault = 'auth_oidc:o365'; $icons = [ [ 'pix' => 'o365', - 'alt' => get_string('cfg_iconalt_o365', 'auth_oidc'), + 'alt' => new lang_string('cfg_iconalt_o365', 'auth_oidc'), 'component' => 'auth_oidc', ], [ 'pix' => 't/locked', - 'alt' => get_string('cfg_iconalt_locked', 'auth_oidc'), + 'alt' => new lang_string('cfg_iconalt_locked', 'auth_oidc'), 'component' => 'moodle', ], [ 'pix' => 't/lock', - 'alt' => get_string('cfg_iconalt_lock', 'auth_oidc'), + 'alt' => new lang_string('cfg_iconalt_lock', 'auth_oidc'), 'component' => 'moodle', ], [ 'pix' => 't/go', - 'alt' => get_string('cfg_iconalt_go', 'auth_oidc'), + 'alt' => new lang_string('cfg_iconalt_go', 'auth_oidc'), 'component' => 'moodle', ], [ 'pix' => 't/stop', - 'alt' => get_string('cfg_iconalt_stop', 'auth_oidc'), + 'alt' => new lang_string('cfg_iconalt_stop', 'auth_oidc'), 'component' => 'moodle', ], [ 'pix' => 't/user', - 'alt' => get_string('cfg_iconalt_user', 'auth_oidc'), + 'alt' => new lang_string('cfg_iconalt_user', 'auth_oidc'), 'component' => 'moodle', ], [ 'pix' => 'u/user35', - 'alt' => get_string('cfg_iconalt_user2', 'auth_oidc'), + 'alt' => new lang_string('cfg_iconalt_user2', 'auth_oidc'), 'component' => 'moodle', ], [ 'pix' => 'i/permissions', - 'alt' => get_string('cfg_iconalt_key', 'auth_oidc'), + 'alt' => new lang_string('cfg_iconalt_key', 'auth_oidc'), 'component' => 'moodle', ], [ 'pix' => 'i/cohort', - 'alt' => get_string('cfg_iconalt_group', 'auth_oidc'), + 'alt' => new lang_string('cfg_iconalt_group', 'auth_oidc'), 'component' => 'moodle', ], [ 'pix' => 'i/groups', - 'alt' => get_string('cfg_iconalt_group2', 'auth_oidc'), + 'alt' => new lang_string('cfg_iconalt_group2', 'auth_oidc'), 'component' => 'moodle', ], [ 'pix' => 'i/mnethost', - 'alt' => get_string('cfg_iconalt_mnet', 'auth_oidc'), + 'alt' => new lang_string('cfg_iconalt_mnet', 'auth_oidc'), 'component' => 'moodle', ], [ 'pix' => 'i/permissionlock', - 'alt' => get_string('cfg_iconalt_userlock', 'auth_oidc'), + 'alt' => new lang_string('cfg_iconalt_userlock', 'auth_oidc'), 'component' => 'moodle', ], [ 'pix' => 't/more', - 'alt' => get_string('cfg_iconalt_plus', 'auth_oidc'), + 'alt' => new lang_string('cfg_iconalt_plus', 'auth_oidc'), 'component' => 'moodle', ], [ 'pix' => 't/approve', - 'alt' => get_string('cfg_iconalt_check', 'auth_oidc'), + 'alt' => new lang_string('cfg_iconalt_check', 'auth_oidc'), 'component' => 'moodle', ], [ 'pix' => 't/right', - 'alt' => get_string('cfg_iconalt_rightarrow', 'auth_oidc'), + 'alt' => new lang_string('cfg_iconalt_rightarrow', 'auth_oidc'), 'component' => 'moodle', ], ]; $settings->add(new \auth_oidc\form\adminsetting\iconselect('auth_oidc/icon', $configkey, $configdesc, $configdefault, $icons)); -$configkey = get_string('cfg_customicon_key', 'auth_oidc'); -$configdesc = get_string('cfg_customicon_desc', 'auth_oidc'); +$configkey = new lang_string('cfg_customicon_key', 'auth_oidc'); +$configdesc = new lang_string('cfg_customicon_desc', 'auth_oidc'); $setting = new admin_setting_configstoredfile('auth_oidc/customicon', $configkey, $configdesc, 'customicon'); $setting->set_updatedcallback('auth_oidc_initialize_customicon'); $settings->add($setting); \ No newline at end of file