WebSVN – Moodle – Diff – /lib/classes/hub/site_registration_form.php

 namespace core\hub;
 defined('MOODLE_INTERNAL') || die();
 use context_course;
+use stdClass;
+use html_writer;
-use stdClass;
+use moodle_url;
 global $CFG;
         $strrequired = get_string('required');
         $mform = & $this->_form;
         $admin = get_admin();
+        $site = get_site();
-        $site = get_site();
+        $registered = $this->_customdata['registered'];
         $siteinfo = registration::get_site_info([
             'name' => format_string($site->fullname, true, array('context' => context_course::instance(SITEID))),
             'regioncode' => '-', // Not supported yet.
             'language' => explode('_', current_language())[0],
             'geolocation' => '',
             'emailalert' => 0,
             'commnews' => 0,
-            'policyagreed' => 0
+            'policyagreed' => 0,
+            'organisationtype' => '',
         ]);
         // Fields that need to be highlighted.
         $mform->addElement('text', 'name', get_string('sitename', 'hub'),
             array('class' => 'registration_textfield', 'maxlength' => 255));
         $mform->setType('name', PARAM_TEXT);
         $mform->addHelpButton('name', 'sitename', 'hub');
+        $organisationtypes = registration::get_site_organisation_type_options();
+        \core_collator::asort($organisationtypes);
+        // Prepend the empty/default value here. We are not using array_merge to preserve keys.
+        $organisationtypes = ['' => get_string('siteorganisationtype:donotshare', 'hub')] + $organisationtypes;
+        $mform->addElement('select', 'organisationtype', get_string('siteorganisationtype', 'hub'), $organisationtypes);
+        $mform->setType('organisationtype', PARAM_ALPHANUM);
+        $mform->addHelpButton('organisationtype', 'siteorganisationtype', 'hub');
         $mform->addElement('select', 'privacy', get_string('siteprivacy', 'hub'), registration::site_privacy_options());
         $mform->setType('privacy', PARAM_ALPHA);
         $mform->addHelpButton('privacy', 'siteprivacy', 'hub');
             array('class' => 'registration_textfield'));
         $mform->addRule('contactemail', $strrequired, 'required', null, 'client');
         $mform->setType('contactemail', PARAM_EMAIL);
         $mform->addHelpButton('contactemail', 'siteemail', 'hub');
-        $options = array();
-        $options[0] = get_string("registrationcontactno");
-        $options[1] = get_string("registrationcontactyes");
-        $mform->addElement('select', 'contactable', get_string('siteregistrationcontact', 'hub'), $options);
-        $mform->setType('contactable', PARAM_INT);
-        $mform->addHelpButton('contactable', 'siteregistrationcontact', 'hub');
-        $mform->hideIf('contactable', 'privacy', 'eq', registration::HUB_SITENOTPUBLISHED);
-        unset($options);
+        $this->add_checkbox_with_email('emailalert', 'siteregistrationemail', false, get_string('registrationyes'));
-        $this->add_checkbox_with_email('emailalert', 'siteregistrationemail', false, get_string('registrationyes'));
+        $privacyurl = new moodle_url('https://moodle.com/privacy-notice/');
+        $experttipsandinsightsdesc = html_writer::span(get_string('experttipsandinsightsdesc', 'hub', $privacyurl->out()));
         $this->add_checkbox_with_email(
-            'commnews',
+            elementname: 'commnews',
-            'sitecommnews',
+            stridentifier: 'experttipsandinsights',
+            highlight: in_array('commnews', $highlightfields),
-            in_array('commnews', $highlightfields),
+            checkboxtext: $experttipsandinsightsdesc,
-            get_string('sitecommnewsyes', 'hub')
+            showhelp: false,
         );
         // Display statistic that are going to be retrieve by the sites directory.
         $mform->addElement('static', 'siteinfosummary', get_string('sendfollowinginfo', 'hub'), registration::get_stats_summary($siteinfo));
         // Check if it's a first registration or update.
-        if (registration::is_registered()) {
+        if ($registered) {
             $buttonlabel = get_string('updatesiteregistration', 'core_hub');
             $mform->addElement('hidden', 'update', true);
             $mform->setType('update', PARAM_BOOL);
         // Set data. Always require to check policyagreed even if it was checked earlier.
         $this->set_data(['policyagreed' => 0] + $siteinfo);
+    }
-    /**
-     * Add yes/no select with additional checkbox allowing to specify another email
     /**
-     * @deprecated since Moodle 3.11 - MDL-71460 The form elements using this have been converted to checkboxes
-     * @todo MDL-71472 - Will be deleted in 4.3
-     * @see \core\hub\site_registration_form::add_checkbox_with_email()
-     * @param string $elementname
-     * @param string $stridentifier
-     * @param array|null $options options for the select element
-     * @param bool $highlight highlight as a new field
+     * @deprecated since Moodle 3.11 - MDL-71460 The form elements using this have been converted to checkboxes
-     */
-    protected function add_select_with_email($elementname, $stridentifier, $options = null, $highlight = false) {
-        debugging('add_select_with_email() is deprecated. Please use add_checkbox_with_email() instead.', DEBUG_DEVELOPER);
-        $mform = $this->_form;
+     */
-        if ($options === null) {
+    #[\core\attribute\deprecated(
-            $options = [0 => get_string('no'), 1 => get_string('yes')];
-        }
+        '\core\hub\site_registration_form::add_checkbox_with_email()',
-        $group = [
-            $mform->createElement('select', $elementname, get_string($stridentifier, 'hub'), $options),
-            $mform->createElement('static', $elementname . 'sep', '', '<br/>'),
-            $mform->createElement('advcheckbox', $elementname . 'newemail', '', get_string('usedifferentemail', 'hub'),
-                ['onchange' => "this.form.elements['{$elementname}email'].focus();"]),
-            $mform->createElement('text', $elementname . 'email', get_string('email'))
+        since: '3.11',
-        ];
-        $element = $mform->addElement('group', $elementname . 'group', get_string($stridentifier, 'hub'), $group, '', false);
+        mdl: 'MDL-71460',
-        if ($highlight) {
-            $element->setAttributes(['class' => $element->getAttribute('class') . ' needsconfirmation mark']);
+        final: true,
-        }
-        $mform->hideIf($elementname . 'email', $elementname, 'eq', 0);
-        $mform->hideIf($elementname . 'newemail', $elementname, 'eq', 0);
-        $mform->hideIf($elementname . 'email', $elementname . 'newemail', 'notchecked');
+    )]
-        $mform->setType($elementname, PARAM_INT);
-        $mform->setType($elementname . 'email', PARAM_RAW_TRIMMED); // E-mail will be validated in validation().
+    protected function add_select_with_email() {
-        $mform->addHelpButton($elementname . 'group', $stridentifier, 'hub');
         \core\deprecation::emit_deprecation([self::class, __FUNCTION__]);
+    }
     /**
      * Add yes/no checkbox with additional checkbox allowing to specify another email
+     *
      * @param string $elementname
      * @param string $stridentifier
+     * @param bool $highlight highlight as a new field
-     * @param bool $highlight highlight as a new field
+     * @param string $checkboxtext The text to show after the text.
-     * @param string $checkboxtext The text to show after the text.
+     * @param bool $showhelp Show the help icon.
+     */
+    protected function add_checkbox_with_email(
+        string $elementname,
+        string $stridentifier,
+        bool $highlight = false,
+        string $checkboxtext = '',
-     */
+        bool $showhelp = true,
-    protected function add_checkbox_with_email($elementname, $stridentifier, $highlight = false, string $checkboxtext = '') {
+    ): void {
         $mform = $this->_form;
         $mform->hideif($elementname . 'email', $elementname, 'eq', 0);
         $mform->hideif($elementname . 'newemail', $elementname, 'eq', 0);
         $mform->hideif($elementname . 'email', $elementname . 'newemail', 'notchecked');
         $mform->setType($elementname, PARAM_INT);
         $mform->setType($elementname . 'email', PARAM_RAW_TRIMMED); // E-mail will be validated in validation().
+        if ($showhelp) {
-        $mform->addHelpButton($elementname . 'group', $stridentifier, 'hub');
+            $mform->addHelpButton($elementname . 'group', $stridentifier, 'hub');
+        }
+    }
      */
     public function get_data() {
         if ($data = parent::get_data()) {
             // Never return '*newemail' checkboxes, always return 'emailalertemail' and 'commnewsemail' even if not applicable.
             if (empty($data->emailalert) || empty($data->emailalertnewemail)) {
-                $data->emailalertemail = null;
+                $data->emailalertemail = '';
+            }
             unset($data->emailalertnewemail);
             if (empty($data->commnews) || empty($data->commnewsnewemail)) {
-                $data->commnewsemail = null;
+                $data->commnewsemail = '';
+            }
             unset($data->commnewsnewemail);
-            // Always return 'contactable'.
-            $data->contactable = empty($data->contactable) ? 0 : 1;
             if (debugging('', DEBUG_DEVELOPER)) {
                 // Display debugging message for developers who added fields to the form and forgot to add them to registration::FORM_FIELDS.
                 $keys = array_diff(array_keys((array)$data),

Proyectos de Subversion Moodle

(root)/lib/classes/hub/site_registration_form.php – Rev 1 → 1441