From b3245b758ce315bd505096b6a2c40641234ec6da Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Mon, 4 Jun 2012 19:22:06 +0800 Subject: [PATCH] Merge branch 'MD-31803' of git://github.com/mouneyrac/moodle Conflicts: admin/index.php admin/renderer.php version.php --- admin/index.php | 5 +- admin/registration/confirmregistration.php | 2 +- admin/registration/forms.php | 28 ++++----- admin/registration/hubselector.php | 68 ---------------------- admin/registration/index.php | 67 +++++++++++++++++---- admin/registration/register.php | 21 +++++-- admin/registration/renderer.php | 68 ++++++---------------- admin/registration/renewregistration.php | 2 +- admin/renderer.php | 25 +++++++- admin/settings/server.php | 3 +- admin/settings/top.php | 10 ++-- lang/en/admin.php | 10 ++++ lang/en/hub.php | 14 +---- version.php | 2 +- 14 files changed, 154 insertions(+), 171 deletions(-) delete mode 100644 admin/registration/hubselector.php diff --git a/admin/index.php b/admin/index.php index c868fce2197..d4a7d4e285b 100644 --- a/admin/index.php +++ b/admin/index.php @@ -430,6 +430,8 @@ $availableupdates = $updateschecker->get_update_info('core', $availableupdatesfetch = $updateschecker->get_last_timefetched(); $buggyiconvnomb = (!function_exists('mb_convert_encoding') and @iconv('UTF-8', 'UTF-8//IGNORE', '100'.chr(130).'€') !== '100€'); +//check if the site is registered on Moodle.org +$registered = $DB->count_records('registration_hubs', array('huburl' => HUB_MOODLEORGHUBURL, 'confirmed' => 1)); admin_externalpage_setup('adminnotifications'); @@ -441,4 +443,5 @@ if ($fetchupdates) { $output = $PAGE->get_renderer('core', 'admin'); echo $output->admin_notifications_page($maturity, $insecuredataroot, $errorsdisplayed, - $cronoverdue, $dbproblems, $maintenancemode, $availableupdates, $availableupdatesfetch, $buggyiconvnomb); + $cronoverdue, $dbproblems, $maintenancemode, $availableupdates, $availableupdatesfetch, $buggyiconvnomb, + $registered); diff --git a/admin/registration/confirmregistration.php b/admin/registration/confirmregistration.php index 12afb50dbd8..e7c82889cfa 100644 --- a/admin/registration/confirmregistration.php +++ b/admin/registration/confirmregistration.php @@ -44,7 +44,7 @@ $hubname = optional_param('hubname', '', PARAM_TEXT); $token = optional_param('token', '', PARAM_TEXT); $error = optional_param('error', '', PARAM_ALPHANUM); -admin_externalpage_setup('registrationindex'); +admin_externalpage_setup('registrationhubs'); if (!empty($error) and $error == 'urlalreadyexist') { throw new moodle_exception('urlalreadyregistered', 'hub', diff --git a/admin/registration/forms.php b/admin/registration/forms.php index 48c2cd9dfe2..0126722d9f9 100644 --- a/admin/registration/forms.php +++ b/admin/registration/forms.php @@ -236,6 +236,7 @@ class site_registration_form extends moodleform { $geolocation = get_config('hub', 'site_geolocation_' . $cleanhuburl); $contactable = get_config('hub', 'site_contactable_' . $cleanhuburl); $emailalert = get_config('hub', 'site_emailalert_' . $cleanhuburl); + $emailalert = ($emailalert === 0) ? 0 : 1; $coursesnumber = get_config('hub', 'site_coursesnumber_' . $cleanhuburl); $usersnumber = get_config('hub', 'site_usersnumber_' . $cleanhuburl); $roleassignmentsnumber = get_config('hub', 'site_roleassignmentsnumber_' . $cleanhuburl); @@ -279,9 +280,6 @@ class site_registration_form extends moodleform { $mform->setType('description', PARAM_TEXT); $mform->addHelpButton('description', 'sitedesc', 'hub'); - $mform->addElement('static', 'urlstring', get_string('siteurl', 'hub'), $CFG->wwwroot); - $mform->addHelpButton('urlstring', 'siteurl', 'hub'); - $languages = get_string_manager()->get_list_of_languages(); collatorlib::asort($languages); $mform->addElement('select', 'language', get_string('sitelang', 'hub'), @@ -290,16 +288,6 @@ class site_registration_form extends moodleform { $mform->addHelpButton('language', 'sitelang', 'hub'); $mform->setDefault('language', $language); - $mform->addElement('static', 'versionstring', get_string('siteversion', 'hub'), $CFG->version); - $mform->addElement('hidden', 'moodleversion', $CFG->version); - $mform->setType('moodleversion', PARAM_INT); - $mform->addHelpButton('versionstring', 'siteversion', 'hub'); - - $mform->addElement('static', 'releasestring', get_string('siterelease', 'hub'), $CFG->release); - $mform->addElement('hidden', 'moodlerelease', $CFG->release); - $mform->setType('moodlerelease', PARAM_TEXT); - $mform->addHelpButton('releasestring', 'siterelease', 'hub'); - $mform->addElement('textarea', 'address', get_string('postaladdress', 'hub'), array('rows' => 4, 'cols' => 41)); $mform->setType('address', PARAM_TEXT); @@ -360,6 +348,20 @@ class site_registration_form extends moodleform { //TODO site logo $mform->addElement('hidden', 'imageurl', ''); //TODO: temporary $mform->setType('imageurl', PARAM_URL); + + $mform->addElement('static', 'urlstring', get_string('siteurl', 'hub'), $CFG->wwwroot); + $mform->addHelpButton('urlstring', 'siteurl', 'hub'); + + $mform->addElement('static', 'versionstring', get_string('siteversion', 'hub'), $CFG->version); + $mform->addElement('hidden', 'moodleversion', $CFG->version); + $mform->setType('moodleversion', PARAM_INT); + $mform->addHelpButton('versionstring', 'siteversion', 'hub'); + + $mform->addElement('static', 'releasestring', get_string('siterelease', 'hub'), $CFG->release); + $mform->addElement('hidden', 'moodlerelease', $CFG->release); + $mform->setType('moodlerelease', PARAM_TEXT); + $mform->addHelpButton('releasestring', 'siterelease', 'hub'); + /// Display statistic that are going to be retrieve by the hub $coursecount = $DB->count_records('course') - 1; $usercount = $DB->count_records('user', array('deleted' => 0)); diff --git a/admin/registration/hubselector.php b/admin/registration/hubselector.php deleted file mode 100644 index 6bb215f080f..00000000000 --- a/admin/registration/hubselector.php +++ /dev/null @@ -1,68 +0,0 @@ -. - -/* - * @package moodle - * @subpackage registration - * @author Jerome Mouneyrac - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 1999 onwards Martin Dougiamas http://dougiamas.com - * - * Thsi page displays a hub selector or a hub URL + password. Then it will redirect to - * the site registration form (with the selected hub as parameter) -*/ - -require('../../config.php'); - -require_once($CFG->libdir.'/adminlib.php'); -require_once($CFG->dirroot.'/' . $CFG->admin . '/registration/forms.php'); - -admin_externalpage_setup('registrationselector'); - -$hubselectorform = new hub_selector_form(); -$fromform = $hubselectorform->get_data(); - -//// Redirect to the registration form if an URL has been choosen //// - -$selectedhuburl = optional_param('publichub', false, PARAM_URL); -$unlistedhuburl = optional_param('unlistedurl', false, PARAM_TEXT); -$password = optional_param('password', '', PARAM_RAW); - -if (!empty($unlistedhuburl)) { - if (clean_param($unlistedhuburl, PARAM_URL) !== '') { - $huburl = $unlistedhuburl; - } -} else if (!empty($selectedhuburl)) { - $huburl = $selectedhuburl; -} - - -//redirect -if (!empty($huburl) and confirm_sesskey()) { - $hubname = optional_param(clean_param($huburl, PARAM_ALPHANUMEXT), '', PARAM_TEXT); - $params = array('sesskey' => sesskey(), 'huburl' => $huburl, - 'password' => $password, 'hubname' => $hubname); - redirect(new moodle_url($CFG->wwwroot."/" . $CFG->admin . "/registration/register.php", - $params)); -} - - -//// OUTPUT //// - -echo $OUTPUT->header(); -echo $OUTPUT->heading(get_string('registeron', 'hub'), 3, 'main'); -$hubselectorform->display(); -echo $OUTPUT->footer(); \ No newline at end of file diff --git a/admin/registration/index.php b/admin/registration/index.php index 02e5cdebac3..4c841ae9150 100644 --- a/admin/registration/index.php +++ b/admin/registration/index.php @@ -22,8 +22,9 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL * @copyright (C) 1999 onwards Martin Dougiamas http://dougiamas.com * - * On this page the administrator select if he wants to register on Moodle.org or - * a specific hub + * On this page the administrator selects which hub he wants to register, + * except for MOOCH. Admins can register with MOOCH with the top admin menu "Registration" link. + * On this page the administrator can also unregister from any hubs, including MOOCH. */ require('../../config.php'); @@ -34,7 +35,7 @@ require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/forms.php'); require_once($CFG->dirroot . '/course/publish/lib.php'); require_once($CFG->dirroot . "/webservice/xmlrpc/lib.php"); -admin_externalpage_setup('registrationindex'); +admin_externalpage_setup('registrationhubs'); $renderer = $PAGE->get_renderer('core', 'register'); @@ -126,13 +127,15 @@ if (empty($cancel) and $unregistration and $confirm and confirm_sesskey()) { } } -echo $OUTPUT->header(); - -//do not check sesskey if confirm = false because this script is linked into email message -if (!empty($errormessage)) { - echo $OUTPUT->notification(get_string('unregistrationerror', 'hub', $errormessage)); -} if (empty($cancel) and $unregistration and !$confirm) { + + echo $OUTPUT->header(); + + //do not check sesskey if confirm = false because this script is linked into email message + if (!empty($errormessage)) { + echo $OUTPUT->notification(get_string('unregistrationerror', 'hub', $errormessage)); + } + $hub = $registrationmanager->get_registeredhub($huburl); echo $OUTPUT->heading(get_string('unregisterfrom', 'hub', $hub->hubname), 3, 'main'); if ($cleanregdata) { @@ -142,6 +145,7 @@ if (empty($cancel) and $unregistration and !$confirm) { $siteunregistrationform = new site_unregistration_form('', array('huburl' => $huburl, 'hubname' => $hub->hubname)); } + $siteunregistrationform->display(); } else { $registeredonmoodleorg = false; @@ -150,8 +154,49 @@ if (empty($cancel) and $unregistration and !$confirm) { $registeredonmoodleorg = true; } - echo $OUTPUT->heading(get_string('registeron', 'hub'), 3, 'main'); - echo $renderer->registrationselector($registeredonmoodleorg); + // load the hub selector form + $hubselectorform = new hub_selector_form(); + $fromform = $hubselectorform->get_data(); + $selectedhuburl = optional_param('publichub', false, PARAM_URL); + $unlistedhuburl = optional_param('unlistedurl', false, PARAM_TEXT); + $password = optional_param('password', '', PARAM_RAW); + + if (!empty($unlistedhuburl)) { + if (clean_param($unlistedhuburl, PARAM_URL) !== '') { + $huburl = $unlistedhuburl; + } + } else if (!empty($selectedhuburl)) { + $huburl = $selectedhuburl; + } + + // a hub has been selected, redirect to the hub registration page + if (empty($cancel) and !empty($huburl) and confirm_sesskey()) { + $hubname = optional_param(clean_param($huburl, PARAM_ALPHANUMEXT), '', PARAM_TEXT); + $params = array('sesskey' => sesskey(), 'huburl' => $huburl, + 'password' => $password, 'hubname' => $hubname); + redirect(new moodle_url($CFG->wwwroot . "/" . $CFG->admin . "/registration/register.php", + $params)); + } + + echo $OUTPUT->header(); + + //check if the site is registered on Moodle.org and display a message about registering on MOOCH + $registered = $DB->count_records('registration_hubs', array('huburl' => HUB_MOODLEORGHUBURL, 'confirmed' => 1)); + if (empty($registered)) { + $warningmsg = get_string('registermoochtips', 'hub'); + $warningmsg .= $renderer->single_button(new moodle_url('register.php', array('huburl' => HUB_MOODLEORGHUBURL + , 'hubname' => 'Moodle.org')), get_string('register', 'admin')); + echo $renderer->box($warningmsg, 'buttons mdl-align generalbox adminwarning'); + } + + //do not check sesskey if confirm = false because this script is linked into email message + if (!empty($errormessage)) { + echo $OUTPUT->notification(get_string('unregistrationerror', 'hub', $errormessage)); + } + + echo $OUTPUT->heading(get_string('registerwith', 'hub')); + + $hubselectorform->display(); if (extension_loaded('xmlrpc')) { $hubs = $registrationmanager->get_registered_on_hubs(); diff --git a/admin/registration/register.php b/admin/registration/register.php index eac6400cb53..7a6bc92fefe 100644 --- a/admin/registration/register.php +++ b/admin/registration/register.php @@ -27,7 +27,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL * @copyright (C) 1999 onwards Martin Dougiamas http://dougiamas.com * - * This page displays the site registration form. + * This page displays the site registration form for Moodle.org/MOOCH or for a different hub. * It handles redirection to the hub to continue the registration workflow process. * It also handles update operation by web service. */ @@ -39,15 +39,17 @@ require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/forms.php'); require_once($CFG->dirroot . '/webservice/lib.php'); require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php'); -admin_externalpage_setup('registrationindex'); - $huburl = required_param('huburl', PARAM_URL); $huburl = rtrim($huburl, "/"); + +if ($huburl == HUB_MOODLEORGHUBURL) { // register to Moodle.org + admin_externalpage_setup('registrationmoodleorg'); +} else { //register to a hub + admin_externalpage_setup('registrationhub'); +} + $password = optional_param('password', '', PARAM_TEXT); $hubname = optional_param('hubname', '', PARAM_TEXT); -if (!confirm_sesskey()) { - throw new moodle_exception('missingparameter'); -} $registrationmanager = new registration_manager(); @@ -145,5 +147,12 @@ if (!empty($error)) { echo $error; } +//some Moodle.org resitration explanation +if ($huburl == HUB_MOODLEORGHUBURL) { + echo $OUTPUT->heading(get_string('registerwithmoodleorg', 'admin')); + $renderer = $PAGE->get_renderer('core', 'register'); + echo $renderer->moodleorg_registration_message(); +} + $siteregistrationform->display(); echo $OUTPUT->footer(); diff --git a/admin/registration/renderer.php b/admin/registration/renderer.php index fdec5fddd83..d5ca1650c7f 100644 --- a/admin/registration/renderer.php +++ b/admin/registration/renderer.php @@ -30,6 +30,23 @@ */ class core_register_renderer extends plugin_renderer_base { + /** + * Display Moodle.org registration message about benefit to register on Moodle.org + * + * @return string + */ + public function moodleorg_registration_message() { + $moodleorgurl = html_writer::link('http://moodle.org', 'Moodle.org'); + $moodleorgstatsurl = html_writer::link('http://moodle.org/stats', get_string('statsmoodleorg', 'admin')); + $moochurl = html_writer::link(HUB_MOODLEORGHUBURL, 'MOOCH'); + $moodleorgregmsg = get_string('registermoodleorg', 'admin', $moodleorgurl); + $items = array(get_string('registermoodleorgli1', 'admin'), + get_string('registermoodleorgli2', 'admin', $moodleorgstatsurl), + get_string('registermoodleorgli3', 'admin', $moochurl)); + $moodleorgregmsg .= html_writer::alist($items); + return $moodleorgregmsg; + } + /** * Display a box message confirming a site registration (add or update) * @param string $confirmationmessage @@ -42,57 +59,6 @@ class core_register_renderer extends plugin_renderer_base { return $this->output->box($message); } - /** - * Display the page to register on Moodle.org or on a specific hub - */ - public function registrationselector($updatemoodleorg = false) { - global $CFG; - $table = new html_table(); - $table->head = array(get_string('moodleorg', 'hub'), get_string('specifichub', 'hub')); - $table->size = array('50%', '50%'); - //$table->attributes['class'] = 'registerindextable'; - //Moodle.org information cell - $moodleorgcell = get_string('moodleorgregistrationdetail', 'hub'); - $moodleorgcell .= html_writer::empty_tag('br') . html_writer::empty_tag('br'); - $moodleorgcell = html_writer::tag('div', $moodleorgcell, array('class' => 'justifytext')); - - //Specific hub information cell - $specifichubcell = get_string('specifichubregistrationdetail', 'hub'); - $specifichubcell .= html_writer::empty_tag('br') . html_writer::empty_tag('br'); - $specifichubcell = html_writer::tag('div', $specifichubcell, array('class' => 'justifytext')); - - //add information cells - $cells = array($moodleorgcell, $specifichubcell); - $row = new html_table_row($cells); - $table->data[] = $row; - - //Moodle.org button cell - $registeronmoodleorgurl = new moodle_url("/" . $CFG->admin . "/registration/register.php", - array('sesskey' => sesskey(), 'huburl' => HUB_MOODLEORGHUBURL - , 'hubname' => 'Moodle.org')); - $registeronmoodleorgbutton = new single_button($registeronmoodleorgurl, - $updatemoodleorg ? get_string('updatesite', 'hub', 'Moodle.org') : get_string('registeronmoodleorg', 'hub')); - $registeronmoodleorgbutton->class = 'centeredbutton'; - $registeronmoodleorgbuttonhtml = $this->output->render($registeronmoodleorgbutton); - $moodleorgcell = $registeronmoodleorgbuttonhtml; - - //Specific hub button cell - $registeronspecifichuburl = new moodle_url("/" . $CFG->admin . "/registration/hubselector.php", - array('sesskey' => sesskey())); - $registeronspecifichubbutton = new single_button($registeronspecifichuburl, - get_string('registeronspecifichub', 'hub')); - $registeronspecifichubbutton->class = 'centeredbutton'; - $registeronspecifichubbuttonhtml = $this->output->render($registeronspecifichubbutton); - $specifichubcell = $registeronspecifichubbuttonhtml; - - //add button cells - $cells = array($moodleorgcell, $specifichubcell); - $row = new html_table_row($cells); - $table->data[] = $row; - - return html_writer::table($table); - } - /** * Display the listing of registered on hub */ diff --git a/admin/registration/renewregistration.php b/admin/registration/renewregistration.php index ec9fce278c3..dd1546387cf 100644 --- a/admin/registration/renewregistration.php +++ b/admin/registration/renewregistration.php @@ -39,7 +39,7 @@ $url = optional_param('url', '', PARAM_URL); $hubname = optional_param('hubname', '', PARAM_TEXT); $token = optional_param('token', '', PARAM_TEXT); -admin_externalpage_setup('registrationindex'); +admin_externalpage_setup('registrationhubs'); //check that we are waiting a confirmation from this hub, and check that the token is correct $registrationmanager = new registration_manager(); diff --git a/admin/renderer.php b/admin/renderer.php index b1286f9f944..c064ca66bda 100644 --- a/admin/renderer.php +++ b/admin/renderer.php @@ -249,7 +249,8 @@ class core_admin_renderer extends plugin_renderer_base { * @return string HTML to output. */ public function admin_notifications_page($maturity, $insecuredataroot, $errorsdisplayed, - $cronoverdue, $dbproblems, $maintenancemode, $availableupdates, $availableupdatesfetch, $buggyiconvnomb) { + $cronoverdue, $dbproblems, $maintenancemode, $availableupdates, $availableupdatesfetch, + $buggyiconvnomb, $registered) { global $CFG; $output = ''; @@ -262,6 +263,7 @@ class core_admin_renderer extends plugin_renderer_base { $output .= $this->cron_overdue_warning($cronoverdue); $output .= $this->db_problems($dbproblems); $output .= $this->maintenance_mode_warning($maintenancemode); + $output .= $this->registration_warning($registered); ////////////////////////////////////////////////////////////////////////////////////////////////// //// IT IS ILLEGAL AND A VIOLATION OF THE GPL TO HIDE, REMOVE OR MODIFY THIS COPYRIGHT NOTICE /// @@ -527,6 +529,27 @@ class core_admin_renderer extends plugin_renderer_base { return $updateinfo; } + /** + * Display a warning about not being registered on Moodle.org if necesary. + * + * @param boolean $registered true if the site is registered on Moodle.org + * @return string HTML to output. + */ + protected function registration_warning($registered) { + + if (!$registered) { + + $registerbutton = $this->single_button(new moodle_url('registration/register.php', + array('huburl' => HUB_MOODLEORGHUBURL, 'hubname' => 'Moodle.org')), + get_string('register', 'admin')); + + return $this->warning( get_string('registrationwarning', 'admin') + . ' ' . $this->help_icon('registration', 'admin') . $registerbutton ); + } + + return ''; + } + /** * Helper method to render the information about the available Moodle update * diff --git a/admin/settings/server.php b/admin/settings/server.php index 0188b6db4f8..461f06c06ad 100644 --- a/admin/settings/server.php +++ b/admin/settings/server.php @@ -219,7 +219,8 @@ $temp->add(new admin_setting_configselect('memcachedpconn', new lang_string('mem $ADMIN->add('server', $temp); -$ADMIN->add('server', new admin_externalpage('adminregistration', new lang_string('registration','admin'), "$CFG->wwwroot/$CFG->admin/registration/index.php")); +$ADMIN->add('server', new admin_externalpage('adminregistration', new lang_string('hubs', 'admin'), + "$CFG->wwwroot/$CFG->admin/registration/index.php")); // "update notifications" settingpage if (empty($CFG->disableupdatenotifications)) { diff --git a/admin/settings/top.php b/admin/settings/top.php index 4c1295e805a..147a4e56edd 100644 --- a/admin/settings/top.php +++ b/admin/settings/top.php @@ -10,12 +10,12 @@ $hassiteconfig = has_capability('moodle/site:config', $systemcontext); $ADMIN->add('root', new admin_externalpage('adminnotifications', new lang_string('notifications'), "$CFG->wwwroot/$CFG->admin/index.php")); -$ADMIN->add('root', new admin_externalpage('registrationindex', new lang_string('registration','admin'), - "$CFG->wwwroot/$CFG->admin/registration/index.php")); -$ADMIN->add('root', new admin_externalpage('registration', new lang_string('registeron','hub'), +$ADMIN->add('root', new admin_externalpage('registrationmoodleorg', new lang_string('registration', 'admin'), + "$CFG->wwwroot/$CFG->admin/registration/register.php?huburl=" . HUB_MOODLEORGHUBURL . "&hubname=Moodle.org")); +$ADMIN->add('root', new admin_externalpage('registrationhub', new lang_string('registerwith', 'hub'), "$CFG->wwwroot/$CFG->admin/registration/register.php", 'moodle/site:config', true)); -$ADMIN->add('root', new admin_externalpage('registrationselector', new lang_string('registeron','hub'), - "$CFG->wwwroot/$CFG->admin/registration/hubselector.php", 'moodle/site:config', true)); +$ADMIN->add('root', new admin_externalpage('registrationhubs', new lang_string('hubs', 'admin'), + "$CFG->wwwroot/$CFG->admin/registration/index.php", 'moodle/site:config', true)); $ADMIN->add('root', new admin_externalpage('siteregistrationconfirmed', new lang_string('registrationconfirmed', 'hub'), $CFG->wwwroot."/".$CFG->admin."/registration/confirmregistration.php", 'moodle/site:config', true)); diff --git a/lang/en/admin.php b/lang/en/admin.php index 847dd53d9e8..4b08234cbe0 100644 --- a/lang/en/admin.php +++ b/lang/en/admin.php @@ -568,6 +568,7 @@ $string['htmleditorsettings'] = 'HTML editor settings'; $string['htmlsettings'] = 'HTML settings'; $string['http'] = 'HTTP'; $string['httpsecurity'] = 'HTTP security'; +$string['hubs'] = 'Hubs'; $string['change'] = 'change'; $string['checkboxno'] = 'No'; $string['checkboxyes'] = 'Yes'; @@ -846,7 +847,15 @@ $string['rcache'] = 'Record cache'; $string['rcachettl'] = 'Record cache TTL'; $string['recaptchaprivatekey'] = 'ReCAPTCHA private key'; $string['recaptchapublickey'] = 'ReCAPTCHA public key'; +$string['register'] = 'Register your site'; +$string['registermoodleorg'] = 'When you register your site with {$a}'; +$string['registermoodleorgli1'] = 'You are added to a low-volume mailing list for important notifications such as security alerts and new releases of Moodle.'; +$string['registermoodleorgli2'] = 'Statistics about your site will be added to the {$a} of the worldwide Moodle community.'; +$string['registermoodleorgli3'] = 'Your site is also registered with the Moodle.org Open Community Hub ({$a}).'; +$string['registerwithmoodleorg'] = 'Register with Moodle.org'; $string['registration'] = 'Registration'; +$string['registration_help'] = 'It is recommended to register on Moodle.org to receive security email alerts, to contribute to the Moodle growth and statistics, or to be able to share courses on MOOCH.'; +$string['registrationwarning'] = 'Your site is not yet registered.'; $string['releasenoteslink'] = 'For information about this version of Moodle, please see the online Release Notes'; $string['rememberusername'] = 'Remember username'; $string['rememberusername_desc'] = 'Enable if you want to store permanent cookies with usernames during user login. Permanent cookies may be considered a privacy issue if used without consent.'; @@ -925,6 +934,7 @@ $string['splrequired'] = 'The SPL PHP extension is now required by Moodle.'; $string['stats'] = 'Statistics'; $string['statsfirstrun'] = 'Maximum processing interval'; $string['statsmaxruntime'] = 'Maximum runtime'; +$string['statsmoodleorg'] = 'statistics'; $string['statsruntimedays'] = 'Days to process'; $string['statsruntimestart'] = 'Run at'; $string['statsuserthreshold'] = 'User threshold'; diff --git a/lang/en/hub.php b/lang/en/hub.php index 42abfad2616..4b8cd537950 100644 --- a/lang/en/hub.php +++ b/lang/en/hub.php @@ -118,12 +118,6 @@ $string['licence_link'] = 'licenses'; $string['logourl'] = 'Logo URL'; $string['modulenumberaverage'] = 'Average number of course modules ({$a})'; $string['moodleorg'] = 'Moodle.org'; -$string['moodleorgregistrationdetail'] = 'The main community hub is called MOOCH, at hub.moodle.org. By registering your site with MOOCH you will contribute to the statistics of the worldwide Moodle community. You can also join a low-volume mailing list providing early notifications of security fixes and new releases of Moodle.'; -$string['moodleorgregistrationdetail2'] = 'This option allows you to register your Moodle site with MOOCH, at hub.moodle.org. Registration is free. -The main benefit of registering is that you will be added to a low-volume mailing list for important notifications such as security alerts and new releases of Moodle. -By default, your information will be kept private, and will never be sold or passed on to anyone else. The only reason for collecting this information is for support purposes, and to help build up a statistical picture of the Moodle community as a whole. -If you choose, you can allow your site name, country and URL to be added to the public list of Moodle Sites. -All new registrations are verified manually before they are added to the list, but once you are added you can update your registration (and your entry on the public list) at any time.'; $string['mustselectsubject'] = 'You must select a subject'; $string['name'] = 'Name'; $string['name_help'] = 'This name will be showing in the course listing.'; @@ -165,11 +159,10 @@ $string['registeredcourses'] = 'Registered courses'; $string['registeredsites'] = 'Registered sites'; $string['registrationinfo'] = 'Registration information'; $string['registeredmoodleorg'] = 'Moodle.org ({$a})'; -$string['registeredon'] = 'Registered with'; +$string['registeredon'] = 'Hubs with which you are registered'; +$string['registermoochtips'] = 'To be registered with Moodle.org Open Community Hub (MOOCH), your site must be registered with Moodle.org.'; $string['registersite'] = 'Register with {$a}'; -$string['registeron'] = 'Register your site'; -$string['registeronmoodleorg'] = 'Register with Moodle.org (MOOCH)'; -$string['registeronspecifichub'] = 'Register with a specific hub'; +$string['registerwith'] = 'Register with a hub'; $string['registrationconfirmed'] = 'Site registration confirmed'; $string['registrationconfirmedon'] = 'You are now registered on the hub {$a}. You are now able to publish courses to this hub, using the "Publish" link in course administration menus.'; $string['registrationupdated'] = 'Registration has been updated.'; @@ -237,7 +230,6 @@ $string['siteversion'] = 'Moodle version'; $string['siteversion_help'] = 'The Moodle version of this site.'; $string['subject'] = 'Subject'; $string['subject_help'] = 'Select the main subject area which the course covers.'; -$string['specifichub'] = 'Specific hub'; $string['specifichubregistrationdetail'] = 'You can also register your site with other community hubs.'; $string['statistics'] = 'Statistics privacy'; $string['status'] = 'Hub listing'; diff --git a/version.php b/version.php index fd97b593aea..813b25ba408 100644 --- a/version.php +++ b/version.php @@ -30,7 +30,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2012060100.00; // YYYYMMDD = weekly release date of this DEV branch +$version = 2012060400.00; // YYYYMMDD = weekly release date of this DEV branch // RR = release increments - 00 in DEV branches // .XX = incremental changes -- 2.17.1