Moodle 2.1.1 release

admin_setting_configmultiselect_modules to include a default

admin/index.php

@@ -148,7 +148,7 @@ if (!core_tables_exist()) {
             }
         }
 
-        $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes');
+        $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/dev/Releases');
         $releasenoteslink = str_replace('target="_blank"', 'onclick="this.target=\'_blank\'"', $releasenoteslink); // extremely ugly validation hack
         echo $OUTPUT->box($releasenoteslink, 'generalbox releasenoteslink');
 
@@ -231,7 +231,7 @@ if ($version > $CFG->version) {  // upgrade
         $PAGE->set_cacheable(false);
         echo $OUTPUT->header();
         echo $OUTPUT->heading("Moodle $release");
-        $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes');
+        $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/dev/Releases');
         $releasenoteslink = str_replace('target="_blank"', 'onclick="this.target=\'_blank\'"', $releasenoteslink); // extremely ugly validation hack
         echo $OUTPUT->box($releasenoteslink);
 
@@ -456,7 +456,7 @@ if (!empty($CFG->maintenance_enabled)) {
 //////////////////////////////////////////////////////////////////////////////////////////////////
 ////  IT IS ILLEGAL AND A VIOLATION OF THE GPL TO HIDE, REMOVE OR MODIFY THIS COPYRIGHT NOTICE ///
 $copyrighttext = '<a href="http://moodle.org/">Moodle</a> '.
-                 '<a href="http://docs.moodle.org/en/Release" title="'.$CFG->version.'">'.$CFG->release.'</a><br />'.
+                 '<a href="http://docs.moodle.org/dev/Releases" title="'.$CFG->version.'">'.$CFG->release.'</a><br />'.
                  'Copyright &copy; 1999 onwards, Martin Dougiamas<br />'.
                  'and <a href="http://docs.moodle.org/en/Credits">many other contributors</a>.<br />'.
                  '<a href="http://docs.moodle.org/en/License">GNU Public License</a>';

admin/localplugins.php

@@ -21,7 +21,7 @@
  * Displays the list of found local plugins, their version (if found) and
  * a link to delete the local plugin.
  *
- * @see       http://docs.moodle.org/en/Development:Local_customisation
+ * @see       http://docs.moodle.org/dev/Local_customisation
  * @package   admin
  * @copyright 2010 David Mudrak <david.mudrak@gmail.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later

admin/report/courseoverview/index.php

@@ -79,13 +79,12 @@
                            $param->extras
                   ORDER BY $param->orderby";
         }
-        //error_log($sql);
 
         $courses = $DB->get_records_sql($sql, $param->params, 0, $numcourses);
 
         if (empty($courses)) {
             echo $OUTPUT->notification(get_string('statsnodata'));
-            echo '</td></tr></table>';echo '<p>after notify</p>';
+            echo '</td></tr></table>';
 
         } else {
             if (empty($CFG->gdversion)) {

admin/settings/courses.php

@@ -21,10 +21,11 @@ if ($hassiteconfig
         $formcourseformats[$courseformat] = get_string('pluginname', "format_$courseformat");
     }
     $temp->add(new admin_setting_configselect('moodlecourse/format', get_string('format'), get_string('coursehelpformat'), 'weeks',$formcourseformats));
-    for ($i=1; $i<=52; $i++) {
-        $sectionmenu[$i] = "$i";
-    }
-    $temp->add(new admin_setting_configselect('moodlecourse/numsections', get_string('numberweeks'), get_string('coursehelpnumberweeks'), 10,$sectionmenu));
+
+    $temp->add(new admin_setting_configtext('moodlecourse/maxsections', get_string('maxnumberweeks'), get_string('maxnumberweeks_desc'), 52));
+
+    $temp->add(new admin_settings_num_course_sections('moodlecourse/numsections', get_string('numberweeks'), get_string('coursehelpnumberweeks'), 10));
+
     $choices = array();
     $choices['0'] = get_string('hiddensectionscollapsed');
     $choices['1'] = get_string('hiddensectionsinvisible');
@@ -33,15 +34,14 @@ if ($hassiteconfig
     $temp->add(new admin_setting_configselect('moodlecourse/newsitems', get_string('newsitemsnumber'), get_string('coursehelpnewsitemsnumber'), 5,$options));
     $temp->add(new admin_setting_configselect('moodlecourse/showgrades', get_string('showgrades'), get_string('coursehelpshowgrades'), 1,array(0 => get_string('no'), 1 => get_string('yes'))));
     $temp->add(new admin_setting_configselect('moodlecourse/showreports', get_string('showreports'), '', 0,array(0 => get_string('no'), 1 => get_string('yes'))));
+
     if (isset($CFG->maxbytes)) {
         $choices = get_max_upload_sizes($CFG->maxbytes);
     } else {
         $choices = get_max_upload_sizes();
     }
-
     $temp->add(new admin_setting_configselect('moodlecourse/maxbytes', get_string('maximumupload'), get_string('coursehelpmaximumupload'), key($choices), $choices));
 
-
     if (!empty($CFG->legacyfilesinnewcourses)) {
         $choices = array('0'=>get_string('no'), '2'=>get_string('yes'));
         $temp->add(new admin_setting_configselect('moodlecourse/legacyfiles', get_string('courselegacyfiles'), get_string('courselegacyfiles_help'), key($choices), $choices));

admin/settings/plugins.php

@@ -74,6 +74,7 @@ if ($hassiteconfig) {
     $temp->add(new admin_setting_manageauths());
     $temp->add(new admin_setting_heading('manageauthscommonheading', get_string('commonsettings', 'admin'), ''));
     $temp->add(new admin_setting_special_registerauth());
+    $temp->add(new admin_setting_configcheckbox('loginpageautofocus', get_string('loginpageautofocus', 'admin'), get_string('loginpageautofocus_help', 'admin'), 0));
     $temp->add(new admin_setting_configselect('guestloginbutton', get_string('guestloginbutton', 'auth'),
                                               get_string('showguestlogin', 'auth'), '1', array('0'=>get_string('hide'), '1'=>get_string('show'))));
     $temp->add(new admin_setting_configtext('alternateloginurl', get_string('alternateloginurl', 'auth'),

admin/uploaduser.php

@@ -468,6 +468,7 @@ if ($formdata = $mform2->is_cancelled()) {
                     if (!isset($supportedauths[$user->auth])) {
                         $upt->track('auth', $struserauthunsupported, 'warning');
                     }
+                    $doupdate = true;
                 }
                 $allcolumns = array_merge($STD_FIELDS, $PRF_FIELDS);
                 foreach ($allcolumns as $column) {
@@ -915,6 +916,14 @@ while ($linenum <= $previewrows and $fields = $cir->next()) {
             $rowcols['status'][] = $stremailduplicate;
         }
     }
+
+    if (isset($rowcols['city'])) {
+        $rowcols['city'] = trim($rowcols['city']);
+        if (empty($rowcols['city'])) {
+            $rowcols['status'][] = get_string('fieldrequired', 'error', 'city');
+        }
+    }
+
     $rowcols['status'] = implode('<br />', $rowcols['status']);
     $data[] = $rowcols;
 }

admin/uploaduser_form.php

@@ -264,6 +264,7 @@ class admin_uploaduser_form2 extends moodleform {
         } else {
             $mform->setDefault('city', $CFG->defaultcity);
         }
+        $mform->addRule('city', get_string('required'), 'required');
 
         $mform->addElement('select', 'country', get_string('selectacountry'), get_string_manager()->get_list_of_countries());
         if (empty($CFG->country)) {
@@ -408,10 +409,6 @@ class admin_uploaduser_form2 extends moodleform {
             if (!in_array('email', $columns) and empty($data['email'])) {
                 $errors['email'] = get_string('requiredtemplate', 'admin');
             }
-
-            if (!in_array('city', $columns) and empty($data['city'])) {
-                $errors['city'] = get_string('required');
-            }
         }
 
         return $errors;

admin/xmldb/actions/main_view/main_view.class.php

@@ -290,7 +290,7 @@ class main_view extends XMLDBAction {
                                                 $o .= ' that seems to be active (true). ENUMs support has been dropped in Moodle 2.0, '  .
                                                       ' the XMLDB Editor will delete any ENUM reference next time you save this file' .
                                                       ' and you MUST provide  one upgrade block in your code to drop them from DB. See' .
-                                                      ' <a href="http://docs.moodle.org/en/Development:DB_layer_2.0_migration_docs#The_changes">' .
+                                                      ' <a href="http://docs.moodle.org/dev/DB_layer_2.0_migration_docs#The_changes">' .
                                                       ' Moodle Docs</a> for more info and examples.';
                                             } else {
                                                 $o .= ' that seem to be inactive (false). ENUMs support has been dropped in Moodle 2.0,' .

auth/db/auth.php

@@ -230,11 +230,11 @@ class auth_plugin_db extends auth_plugin_base {
             if (count($userlist)) {
                 list($notin_sql, $params) = $DB->get_in_or_equal($userlist, SQL_PARAMS_NAMED, 'u', false);
                 $params['authtype'] = $this->authtype;
-                $sql = "SELECT u.id, u.username, u.email, u.auth
+                $sql = "SELECT u.*
                           FROM {user} u
                          WHERE u.auth=:authtype AND u.deleted=0 AND u.username $notin_sql";
             } else {
-                $sql = "SELECT u.id, u.username, u.email, u.auth
+                $sql = "SELECT u.*
                           FROM {user} u
                          WHERE u.auth=:authtype AND u.deleted=0";
                 $params = array();

auth/email/lang/en/auth_email.php

@@ -25,7 +25,7 @@
 
 $string['auth_emaildescription'] = 'Email confirmation is the default authentication method.  When the user signs up, choosing their own new username and password, a confirmation email is sent to the user\'s email address.  This email contains a secure link to a page where the user can confirm their account. Future logins just check the username and password against the stored values in the Moodle database.';
 $string['auth_emailnoemail'] = 'Tried to send you an email but failed!';
-$string['auth_emailrecaptcha'] = 'Adds a visual/audio confirmation form element to the signup page for email self-registering users. This protects your site against spammers and contributes to a worthwhile cause. See http://recaptcha.net/learnmore.html for more details. <br /><em>PHP cURL extension is required.</em>';
+$string['auth_emailrecaptcha'] = 'Adds a visual/audio confirmation form element to the signup page for email self-registering users. This protects your site against spammers and contributes to a worthwhile cause. See http://www.google.com/recaptcha/learnmore for more details. <br /><em>PHP cURL extension is required.</em>';
 $string['auth_emailrecaptcha_key'] = 'Enable reCAPTCHA element';
 $string['auth_emailsettings'] = 'Settings';
 $string['pluginname'] = 'Email-based self-registration';

auth/ldap/auth.php

@@ -689,7 +689,7 @@ class auth_plugin_ldap extends auth_plugin_base {
         // Find users in DB that aren't in ldap -- to be removed!
         // this is still not as scalable (but how often do we mass delete?)
         if ($this->config->removeuser !== AUTH_REMOVEUSER_KEEP) {
-            $sql = 'SELECT u.id, u.username, u.email, u.auth
+            $sql = 'SELECT u.*
                       FROM {user} u
                       LEFT JOIN {tmp_extuser} e ON (u.username = e.username AND u.mnethostid = e.mnethostid)
                      WHERE u.auth = ?
@@ -1385,7 +1385,7 @@ class auth_plugin_ldap extends auth_plugin_base {
                 }
             }
         }
-        $moodleattributes['username'] = $this->config->user_attribute;
+        $moodleattributes['username'] = moodle_strtolower(trim($this->config->user_attribute));
         return $moodleattributes;
     }
 

auth/manual/db/upgrade.php

@@ -45,5 +45,8 @@ function xmldb_auth_manual_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2011022700, 'auth', 'manual');
     }
 
+    // Moodle v2.1.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }

auth/mnet/db/upgrade.php

@@ -43,5 +43,8 @@ function xmldb_auth_mnet_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2010071300, 'auth', 'mnet');
     }
 
+    // Moodle v2.1.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }

backup/backup.class.php

@@ -118,6 +118,6 @@ abstract class backup implements checksumable {
 abstract class backup_exception extends moodle_exception {
 
     public function __construct($errorcode, $a=NULL, $debuginfo=null) {
-        parent::__construct($errorcode, 'error', '', $a, null, $debuginfo);
+        parent::__construct($errorcode, 'error', '', $a, $debuginfo);
     }
 }

backup/moodle2/backup_course_task.class.php

@@ -75,8 +75,15 @@ class backup_course_task extends backup_task {
         // Generate the enrolment file
         $this->add_step(new backup_enrolments_structure_step('course_enrolments', 'enrolments.xml'));
 
-        // Annotate the groups used in already annotated groupings
-        $this->add_step(new backup_annotate_groups_from_groupings('annotate_groups'));
+        // Annotate all the groups and groupings belonging to the course
+        $this->add_step(new backup_annotate_course_groups_and_groupings('annotate_course_groups'));
+
+        // Annotate the groups used in already annotated groupings (note this may be
+        // unnecessary now that we are annotating all the course groups and groupings in the
+        // step above. But we keep it working in case we decide, someday, to introduce one
+        // setting to transform the step above into an optional one. This is here to support
+        // course->defaultgroupingid
+        $this->add_step(new backup_annotate_groups_from_groupings('annotate_groups_from_groupings'));
 
         // Annotate the question_categories belonging to the course context
         $this->add_step(new backup_calculate_question_categories('course_question_categories'));

backup/moodle2/backup_stepslib.php

@@ -1562,6 +1562,32 @@ class backup_activity_grade_items_to_ids extends backup_execution_step {
     }
 }
 
+/**
+ * This step will annotate all the groups and groupings belonging to the course
+ */
+class backup_annotate_course_groups_and_groupings extends backup_execution_step {
+
+    protected function define_execution() {
+        global $DB;
+
+        // Get all the course groups
+        if ($groups = $DB->get_records('groups', array(
+                'courseid' => $this->task->get_courseid()))) {
+            foreach ($groups as $group) {
+                backup_structure_dbops::insert_backup_ids_record($this->get_backupid(), 'group', $group->id);
+            }
+        }
+
+        // Get all the course groupings
+        if ($groupings = $DB->get_records('groupings', array(
+                'courseid' => $this->task->get_courseid()))) {
+            foreach ($groupings as $grouping) {
+                backup_structure_dbops::insert_backup_ids_record($this->get_backupid(), 'grouping', $grouping->id);
+            }
+        }
+    }
+}
+
 /**
  * This step will annotate all the groups belonging to already annotated groupings
  */

backup/moodle2/restore_stepslib.php

@@ -323,7 +323,8 @@ class restore_gradebook_structure_step extends restore_structure_step {
 
         // We need to update the calculations for calculated grade items that may reference old
         // grade item ids using ##gi\d+##.
-        list($sql, $params) = $DB->get_in_or_equal(array_values($mappings), SQL_PARAMS_NAMED);
+        // $mappings can be empty, use 0 if so (won't match ever)
+        list($sql, $params) = $DB->get_in_or_equal(array_values($mappings), SQL_PARAMS_NAMED, 'param', true, 0);
         $sql = "SELECT gi.id, gi.calculation
                   FROM {grade_items} gi
                  WHERE gi.id {$sql} AND
@@ -2370,11 +2371,13 @@ class restore_create_categories_and_questions extends restore_structure_step {
 
         $category = new restore_path_element('question_category', '/question_categories/question_category');
         $question = new restore_path_element('question', '/question_categories/question_category/questions/question');
+        $hint = new restore_path_element('question_hint',
+                '/question_categories/question_category/questions/question/question_hints/question_hint');
 
         // Apply for 'qtype' plugins optional paths at question level
         $this->add_plugin_structure('qtype', $question);
 
-        return array($category, $question);
+        return array($category, $question, $hint);
     }
 
     protected function process_question_category($data) {
@@ -2483,11 +2486,11 @@ class restore_create_categories_and_questions extends restore_structure_step {
             // Adjust some columns
             $data->questionid = $newquestionid;
             // Insert record
-            $newitemid = $DB->insert_record('question_answers', $data);
+            $newitemid = $DB->insert_record('question_hints', $data);
 
-        // The question existed, we need to map the existing question_answers
+        // The question existed, we need to map the existing question_hints
         } else {
-            // Look in question_answers by answertext matching
+            // Look in question_hints by hint text matching
             $sql = 'SELECT id
                       FROM {question_hints}
                      WHERE questionid = ?
@@ -2495,7 +2498,7 @@ class restore_create_categories_and_questions extends restore_structure_step {
             $params = array($newquestionid, $data->hint);
             $newitemid = $DB->get_field_sql($sql, $params);
             // If we haven't found the newitemid, something has gone really wrong, question in DB
-            // is missing answers, exception
+            // is missing hints, exception
             if (!$newitemid) {
                 $info = new stdClass();
                 $info->filequestionid = $oldquestionid;
@@ -2504,7 +2507,7 @@ class restore_create_categories_and_questions extends restore_structure_step {
                 throw new restore_step_exception('error_question_hint_missing_in_db', $info);
             }
         }
-        // Create mapping (we'll use this intensively when restoring question_states. And also answerfeedback files)
+        // Create mapping (I'm not sure if this is really needed?)
         $this->set_mapping('question_hint', $oldid, $newitemid);
     }
 

backup/util/dbops/restore_dbops.class.php

@@ -1340,7 +1340,8 @@ abstract class restore_dbops {
         $course->sortorder = 0;
         $course->timecreated  = time();
         $course->timemodified = $course->timecreated;
-        $course->visible = $category->visible;
+        // forcing skeleton courses to be hidden instead of going by $category->visible , until MDL-27790 is resolved.
+        $course->visible = 0;
 
         $courseid = $DB->insert_record('course', $course);
 

backup/util/helper/backup_general_helper.class.php

@@ -153,7 +153,9 @@ abstract class backup_general_helper extends backup_helper {
         $rolemappings->modified = false;
         $rolemappings->mappings = array();
         $info->role_mappings = $rolemappings;
-
+        // Some initially empty containers
+        $info->sections = array();
+        $info->activities = array();
 
         // Now the contents
         $contentsarr = $infoarr['contents'];
@@ -164,7 +166,6 @@ abstract class backup_general_helper extends backup_helper {
         }
         if (isset($contentsarr['sections']) && isset($contentsarr['sections']['section'])) {
             $sectionarr = $contentsarr['sections']['section'];
-            $sections = array();
             foreach ($sectionarr as $section) {
                 $section = (object)$section;
                 $section->settings = array();
@@ -174,7 +175,6 @@ abstract class backup_general_helper extends backup_helper {
         }
         if (isset($contentsarr['activities']) && isset($contentsarr['activities']['activity'])) {
             $activityarr = $contentsarr['activities']['activity'];
-            $activities = array();
             foreach ($activityarr as $activity) {
                 $activity = (object)$activity;
                 $activity->settings = array();

backup/util/ui/restore_ui_components.php

@@ -72,7 +72,7 @@ abstract class restore_search_base implements renderable {
      */
     public function __construct(array $config=array()) {
 
-        $this->search = optional_param($this->get_varsearch(), self::DEFAULT_SEARCH, PARAM_ALPHANUMEXT);
+        $this->search = optional_param($this->get_varsearch(), self::DEFAULT_SEARCH, PARAM_NOTAGS);
 
         foreach ($config as $name=>$value) {
             $method = 'set_'.$name;

blocks/community/db/upgrade.php

@@ -73,6 +73,8 @@ function xmldb_block_community_upgrade($oldversion) {
         upgrade_block_savepoint(true, 2010042701, 'community');
     }
 
+    // Moodle v2.1.0 release upgrade line
+    // Put any upgrade step following this
 
     return true;
 }

blocks/completionstatus/block_completionstatus.php

@@ -152,7 +152,10 @@ class block_completionstatus extends block_base {
             $shtml .= '<tr><td>';
             $shtml .= get_string('activitiescompleted', 'completion');
             $shtml .= '</td><td style="text-align: right">';
-            $shtml .= $activities_complete.' of '.count($activities);
+            $a = new stdClass();
+            $a->first = $activities_complete;
+            $a->second = count($activities);
+            $shtml .= get_string('firstofsecond', 'block_completionstatus', $a);
             $shtml .= '</td></tr>';
         }
 
@@ -162,7 +165,10 @@ class block_completionstatus extends block_base {
             $phtml  = '<tr><td>';
             $phtml .= get_string('prerequisitescompleted', 'completion');
             $phtml .= '</td><td style="text-align: right">';
-            $phtml .= $prerequisites_complete.' of '.count($prerequisites);
+            $a = new stdClass();
+            $a->first = $prerequisites_complete;
+            $a->second = count($prerequisites);
+            $shtml .= get_string('firstofsecond', 'block_completionstatus', $a);
             $phtml .= '</td></tr>';
 
             $shtml = $phtml . $shtml;

blocks/completionstatus/details.php

@@ -237,7 +237,7 @@ foreach ($rows as $row) {
 
     // Is complete
     echo '<td class="c4">';
-    echo ($row['status'] === 'Yes') ? 'Yes' : 'No';
+    echo ($row['status'] === get_string('yes')) ? get_string('yes') : get_string('no');
     echo '</td>';
 
     // Completion data

blocks/completionstatus/lang/en/block_completionstatus.php

@@ -3,5 +3,6 @@
 $string['completionprogressdetails'] = 'Completion progress details';
 $string['completionstatus'] = 'Course completion status';
 $string['criteriagroup'] = 'Criteria group';
+$string['firstofsecond'] = '{$a->first} of {$a->second}';
 $string['pluginname'] = 'Course completion status';
 $string['requirement'] = 'Requirement';

blocks/html/db/upgrade.php

@@ -63,5 +63,8 @@ function xmldb_block_html_upgrade($oldversion) {
         upgrade_block_savepoint(true, 2010071900, 'html');
     }
 
+    // Moodle v2.1.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }

blocks/navigation/db/upgrade.php

@@ -72,5 +72,8 @@ function xmldb_block_navigation_upgrade($oldversion, $block) {
         upgrade_block_savepoint(true, 2010091400, 'navigation');
     }
 
+    // Moodle v2.1.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }

blocks/rss_client/block_rss_client.php

@@ -55,14 +55,6 @@
             return $this->content;
         }
 
-        if (!$CFG->enablerssfeeds) {
-            $this->content->text = '';
-            if ($this->page->user_is_editing()) {
-                $this->content->text = get_string('disabledrssfeeds', 'block_rss_client');
-            }
-            return $this->content;
-        }
-
         // initalise block content object
         $this->content = new stdClass;
         $this->content->text   = '';

blocks/rss_client/managefeeds.php

@@ -59,7 +59,8 @@ if ($returnurl) {
     $urlparams['returnurl'] = $returnurl;
     $extraparams = '&returnurl=' . $returnurl;
 }
-$PAGE->set_url('/blocks/rss_client/managefeeds.php', $urlparams);
+$baseurl = new moodle_url('/blocks/rss_client/managefeeds.php', $urlparams);
+$PAGE->set_url($baseurl);
 
 // Process any actions
 if ($deleterssid && confirm_sesskey()) {
@@ -78,7 +79,7 @@ $feeds = $DB->get_records_select('block_rss_client', $select, null, $DB->sql_ord
 
 $strmanage = get_string('managefeeds', 'block_rss_client');
 
-$PAGE->set_pagelayout('base');
+$PAGE->set_pagelayout('standard');
 $PAGE->set_title($strmanage);
 $PAGE->set_heading($strmanage);
 
@@ -93,6 +94,7 @@ $table = new flexible_table('rss-display-feeds');
 
 $table->define_columns(array('feed', 'actions'));
 $table->define_headers(array(get_string('feed', 'block_rss_client'), get_string('actions', 'moodle')));
+$table->define_baseurl($baseurl);
 
 $table->set_attribute('cellspacing', '0');
 $table->set_attribute('id', 'rssfeeds');

blocks/settings/db/upgrade.php

@@ -72,5 +72,8 @@ function xmldb_block_settings_upgrade($oldversion, $block) {
         upgrade_block_savepoint(true, 2010091400, 'settings');
     }
 
+    // Moodle v2.1.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }

cohort/assign.php

@@ -62,6 +62,8 @@ $PAGE->set_heading($COURSE->fullname);
 echo $OUTPUT->header();
 echo $OUTPUT->heading(get_string('assignto', 'cohort', format_string($cohort->name)));
 
+echo $OUTPUT->notification(get_string('removeuserwarning', 'core_cohort'));
+
 // Get the user_selector we will need.
 $potentialuserselector = new cohort_candidate_selector('addselect', array('cohortid'=>$cohort->id));
 $existinguserselector = new cohort_existing_selector('removeselect', array('cohortid'=>$cohort->id));

comment/lib.php

@@ -126,15 +126,6 @@ class comment {
      * @var int
      */
     protected $totalcommentcount = null;
-    /**
-     * When set to true any user to the system is able to view comments.
-     *
-     * This can be set to true by a plugin by implementing a allow_anonymous_access callback.
-     * By default it is false except on the front page.
-     *
-     * @var bool
-     */
-    protected $allowanonymousaccess = false;
 
     /**#@+
      * static variable will be used by non-js comments UI
@@ -240,18 +231,6 @@ class comment {
         $this->comment_param->commentarea = $this->commentarea;
         $this->comment_param->itemid      = $this->itemid;
 
-        $this->allowanonymousaccess = false;
-        // By default everyone can view comments on the front page
-        if ($this->context->contextlevel == CONTEXT_COURSE && $this->context->instanceid == SITEID) {
-            $this->allowanonymousaccess = true;
-        } else if ($this->context->contextlevel == CONTEXT_MODULE && $this->courseid == SITEID) {
-            $this->allowanonymousaccess = true;
-        }
-        if (!empty($this->plugintype) && !empty($this->pluginname)) {
-            // Plugins can override this if they wish.
-            $this->allowanonymousaccess = plugin_callback($this->plugintype, $this->pluginname, 'comment', 'allow_anonymous_access', array($this), $this->allowanonymousaccess);
-        }
-
         // setup notoggle
         if (!empty($options->notoggle)) {
             $this->set_notoggle($options->notoggle);
@@ -361,13 +340,8 @@ class comment {
         $this->viewcap = has_capability('moodle/comment:view', $this->context);
         if (!empty($this->plugintype)) {
             $permissions = plugin_callback($this->plugintype, $this->pluginname, 'comment', 'permissions', array($this->comment_param), array('post'=>false, 'view'=>false));
-            if ($this->allowanonymousaccess) {
-                $this->postcap = $permissions['post'];
-                $this->viewcap = $permissions['view'];
-            } else {
-                $this->postcap = $this->postcap && $permissions['post'];
-                $this->viewcap = $this->viewcap && $permissions['view'];
-            }
+            $this->postcap = $this->postcap && $permissions['post'];
+            $this->viewcap = $this->viewcap && $permissions['view'];
         }
     }
 

course/edit_form.php

@@ -120,8 +120,8 @@ class course_edit_form extends moodleform {
         $mform->addHelpButton('format', 'format');
         $mform->setDefault('format', $courseconfig->format);
 
-        for ($i=1; $i<=52; $i++) {
-          $sectionmenu[$i] = "$i";
+        for ($i = 0; $i <= $courseconfig->maxsections; $i++) {
+            $sectionmenu[$i] = "$i";
         }
         $mform->addElement('select', 'numsections', get_string('numberweeks'), $sectionmenu);
         $mform->setDefault('numsections', $courseconfig->numsections);

course/lib.php

@@ -347,7 +347,7 @@ function print_log($course, $user=0, $date=0, $order="l.time ASC", $page=0, $per
     $table->head = array(
         get_string('time'),
         get_string('ip_address'),
-        get_string('fullnamecourse'),
+        get_string('fullnameuser'),
         get_string('action'),
         get_string('info')
     );
@@ -462,7 +462,7 @@ function print_mnet_log($hostid, $course, $user=0, $date=0, $order="l.time ASC",
     }
     echo "<th class=\"c1 header\">".get_string('time')."</th>\n";
     echo "<th class=\"c2 header\">".get_string('ip_address')."</th>\n";
-    echo "<th class=\"c3 header\">".get_string('fullnamecourse')."</th>\n";
+    echo "<th class=\"c3 header\">".get_string('fullnameuser')."</th>\n";
     echo "<th class=\"c4 header\">".get_string('action')."</th>\n";
     echo "<th class=\"c5 header\">".get_string('info')."</th>\n";
     echo "</tr>\n";
@@ -529,7 +529,7 @@ function print_log_csv($course, $user, $date, $order='l.time DESC', $modname,
     global $DB;
 
     $text = get_string('course')."\t".get_string('time')."\t".get_string('ip_address')."\t".
-            get_string('fullnamecourse')."\t".get_string('action')."\t".get_string('info');
+            get_string('fullnameuser')."\t".get_string('action')."\t".get_string('info');
 
     if (!$logs = build_logs_array($course, $user, $date, $order, '', '',
                        $modname, $modid, $modaction, $groupid)) {
@@ -565,7 +565,7 @@ function print_log_csv($course, $user, $date, $order='l.time DESC', $modname,
     header("Pragma: public");
 
     echo get_string('savedat').userdate(time(), $strftimedatetime)."\n";
-    echo $text;
+    echo $text."\n";
 
     if (empty($logs['logs'])) {
         return true;
@@ -642,7 +642,7 @@ function print_log_xls($course, $user, $date, $order='l.time DESC', $modname,
 
     $worksheet = array();
     $headers = array(get_string('course'), get_string('time'), get_string('ip_address'),
-                        get_string('fullnamecourse'),    get_string('action'), get_string('info'));
+                        get_string('fullnameuser'),    get_string('action'), get_string('info'));
 
     // Creating worksheets
     for ($wsnumber = 1; $wsnumber <= $nroPages; $wsnumber++) {
@@ -753,7 +753,7 @@ function print_log_ods($course, $user, $date, $order='l.time DESC', $modname,
 
     $worksheet = array();
     $headers = array(get_string('course'), get_string('time'), get_string('ip_address'),
-                        get_string('fullnamecourse'),    get_string('action'), get_string('info'));
+                        get_string('fullnameuser'),    get_string('action'), get_string('info'));
 
     // Creating worksheets
     for ($wsnumber = 1; $wsnumber <= $nroPages; $wsnumber++) {
@@ -2472,7 +2472,7 @@ function print_course($course, $highlightterms = '') {
         $course->summaryformat = FORMAT_MOODLE;
     }
     echo highlight($highlightterms, format_text($course->summary, $course->summaryformat, $options,  $course->id));
-    if ((!isloggedin() || is_siteadmin()) && $icons = enrol_get_course_info_icons($course)) {
+    if ($icons = enrol_get_course_info_icons($course)) {
         echo html_writer::start_tag('div', array('class'=>'enrolmenticons'));
         foreach ($icons as $icon) {
             echo $OUTPUT->render($icon);
@@ -3370,10 +3370,13 @@ function move_courses($courseids, $categoryid) {
     }
 
     $courseids = array_reverse($courseids);
+    $newparent = get_context_instance(CONTEXT_COURSECAT, $category->id);
     $i = 1;
 
     foreach ($courseids as $courseid) {
         if ($course = $DB->get_record('course', array('id'=>$courseid), 'id, category')) {
+            $course = new stdClass();
+            $course->id = $courseid;
             $course->category  = $category->id;
             $course->sortorder = $category->sortorder + MAX_COURSES_IN_CATEGORY - $i++;
             if ($category->visible == 0) {
@@ -3385,7 +3388,6 @@ function move_courses($courseids, $categoryid) {
             $DB->update_record('course', $course);
 
             $context   = get_context_instance(CONTEXT_COURSE, $course->id);
-            $newparent = get_context_instance(CONTEXT_COURSECAT, $course->category);
             context_moved($context, $newparent);
         }
     }
@@ -4229,4 +4231,4 @@ function course_page_type_list($pagetype, $parentcontext, $currentcontext) {
             'course-view-*'=>get_string('page-course-view-x', 'pagetype')
         );
     }
-}
+}

course/report/log/graph.php

@@ -94,6 +94,7 @@ switch ($type) {
        $reducedays = 0;
    }
 
+   $days = array();
    $i = 0;
    while ($timestart < $timenow) {
        $timefinish = $timestart + 86400;
@@ -167,6 +168,7 @@ switch ($type) {
    }
    $dayfinish = $daystart + 86400;
 
+   $hours = array();
    for ($i=0; $i<=23; $i++) {
        $logs[$i] = 0;
        $hour = $daystart + $i * 3600;

enrol/authorize/db/upgrade.php

@@ -93,5 +93,8 @@ function xmldb_enrol_authorize_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2010081203, 'enrol', 'authorize');
     }
 
+    // Moodle v2.1.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }

enrol/authorize/lang/en/enrol_authorize.php

@@ -256,7 +256,7 @@ $string['youcantdo'] = 'You can\'t do this action: {$a->action}';
 $string['zipcode'] = 'Zip code';
 $string['cost'] = 'Cost';
 $string['currency'] = 'Currency';
-$string['enrolperiod'] = 'Enrolment period';
+$string['enrolperiod'] = 'Enrolment duration';
 $string['enrolstartdate'] = 'Start date';
 $string['enrolenddate'] = 'End date';
 $string['enrolenddaterror'] = 'Enrolment end date cannot be earlier than start date';

enrol/cohort/addinstance.php

@@ -35,6 +35,7 @@ $context = get_context_instance(CONTEXT_COURSE, $course->id, MUST_EXIST);
 
 require_login($course);
 require_capability('moodle/course:enrolconfig', $context);
+require_capability('enrol/cohort:config', $context);
 
 $PAGE->set_url('/enrol/cohort/addinstance.php', array('id'=>$course->id));
 $PAGE->set_pagelayout('admin');

enrol/cohort/ajax.php

@@ -74,6 +74,7 @@ switch ($action) {
         break;
     case 'enrolcohort':
         require_capability('moodle/course:enrolconfig', $context);
+        require_capability('enrol/cohort:config', $context);
         $roleid = required_param('roleid', PARAM_INT);
         $cohortid = required_param('cohortid', PARAM_INT);
         
@@ -87,10 +88,16 @@ switch ($action) {
         enrol_cohort_sync($manager->get_course()->id);
         break;
     case 'enrolcohortusers':
-        require_capability('moodle/course:enrolconfig', $context);
+        require_capability('enrol/manual:enrol', $context);
         $roleid = required_param('roleid', PARAM_INT);
         $cohortid = required_param('cohortid', PARAM_INT);
         $result = enrol_cohort_enrol_all_users($manager, $cohortid, $roleid);
+
+        $roles = $manager->get_assignable_roles();
+        $cohorts = enrol_cohort_get_cohorts($manager);
+        if (!array_key_exists($cohortid, $cohorts) || !array_key_exists($roleid, $roles)) {
+            throw new enrol_ajax_exception('errorenrolcohort');
+        }
         if ($result === false) {
             throw new enrol_ajax_exception('errorenrolcohortusers');
         }

enrol/cohort/lib.php

@@ -163,7 +163,7 @@ class enrol_cohort_plugin extends enrol_plugin {
         $button->strings_for_js('users', 'moodle');
 
         // No point showing this at all if the user cant manually enrol users
-        $hasmanualinstance = has_capability('enrol/manual:manage', $manager->get_context()) && $manager->has_instance('manual');
+        $hasmanualinstance = has_capability('enrol/manual:enrol', $manager->get_context()) && $manager->has_instance('manual');
 
         $modules = array('moodle-enrol_cohort-quickenrolment', 'moodle-enrol_cohort-quickenrolment-skin');
         $function = 'M.enrol_cohort.quickenrolment.init';

enrol/database/db/install.php

@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -62,9 +61,9 @@ function xmldb_enrol_database_install() {
         set_config('localuserfield', $CFG->enrol_localuserfield, 'enrol_database');
         unset_config('enrol_localuserfield');
     }
-    if (isset($CFG->enrol_localrolefield)) {
-        set_config('localrolefield', $CFG->enrol_localrolefield, 'enrol_database');
-        unset_config('enrol_localrolefield');
+    if (isset($CFG->enrol_db_localrolefield)) {
+        set_config('localrolefield', $CFG->enrol_db_localrolefield, 'enrol_database');
+        unset_config('enrol_db_localrolefield');
     }
     if (isset($CFG->enrol_remotecoursefield)) {
         set_config('remotecoursefield', $CFG->enrol_remotecoursefield, 'enrol_database');
@@ -74,9 +73,9 @@ function xmldb_enrol_database_install() {
         set_config('remoteuserfield', $CFG->enrol_remoteuserfield, 'enrol_database');
         unset_config('enrol_remoteuserfield');
     }
-    if (isset($CFG->enrol_remoterolefield)) {
-        set_config('remoterolefield', $CFG->enrol_remoterolefield, 'enrol_database');
-        unset_config('enrol_remoterolefield');
+    if (isset($CFG->enrol_db_remoterolefield)) {
+        set_config('remoterolefield', $CFG->enrol_db_remoterolefield, 'enrol_database');
+        unset_config('enrol_db_remoterolefield');
     }
     if (isset($CFG->enrol_db_defaultcourseroleid)) {
         set_config('defaultrole', $CFG->enrol_db_defaultcourseroleid, 'enrol_database');
@@ -96,6 +95,7 @@ function xmldb_enrol_database_install() {
         unset_config('enrol_db_ignorehiddencourse');
     }
 
+    unset_config('enrol_db_disableunenrol');
 
 
 

enrol/database/db/upgrade.php

@@ -0,0 +1,43 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Database enrolment plugin upgrade.
+ *
+ * @package    enrol
+ * @subpackage database
+ * @copyright  2011 Petr Skoda {@link http://skodak.org}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+function xmldb_enrol_database_upgrade($oldversion) {
+    global $DB;
+
+    $dbman = $DB->get_manager();
+
+    // fix leftovers after incorrect 2.x upgrade in install.php
+    if ($oldversion < 2010073101) {
+        unset_config('enrol_db_localrolefield');
+        unset_config('enrol_db_remoterolefield');
+        unset_config('enrol_db_disableunenrol');
+
+        upgrade_plugin_savepoint(true, 2010073101, 'enrol', 'database');
+    }
+
+
+    return true;
+}

enrol/database/lib.php

@@ -111,6 +111,7 @@ class enrol_database_plugin extends enrol_plugin {
         if ($rs = $extdb->Execute($sql)) {
             if (!$rs->EOF) {
                 while ($fields = $rs->FetchRow()) {
+                    $fields = array_change_key_case($fields, CASE_LOWER);
                     $fields = $this->db_decode($fields);
 
                     if (empty($fields[$coursefield])) {

enrol/database/version.php

@@ -26,5 +26,5 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2010073100;
+$plugin->version = 2010073101;
 //TODO: should we add cron sync?

enrol/externallib.php

@@ -121,7 +121,7 @@ class moodle_enrol_external extends external_api {
             $profilimgurlsmall = moodle_url::make_pluginfile_url($enrolleduser->usercontextid, 'user', 'icon', NULL, '/', 'f2');
             $resultuser = array(
                 'courseid' => $enrolleduser->courseid,
-                'userid' => $enrolleduser->userid, 
+                'userid' => $enrolleduser->userid,
                 'fullname' => fullname($enrolleduser),
                 'profileimgurl' => $profilimgurl->out(false),
                 'profileimgurlsmall' => $profilimgurlsmall->out(false)
@@ -271,6 +271,12 @@ class moodle_enrol_external extends external_api {
             self::validate_context($context);
             require_capability('moodle/role:assign', $context);
 
+            // throw an exception if user is not able to assign the role in this context
+            $roles = get_assignable_roles($context, ROLENAME_SHORT);
+            if (!key_exists($assignment['roleid'], $roles)) {
+                throw new invalid_parameter_exception('Can not assign roleid='.$assignment['roleid'].' in contextid='.$assignment['contextid']);
+            }
+
             role_assign($assignment['roleid'], $assignment['userid'], $assignment['contextid']);
         }
 
@@ -327,6 +333,12 @@ class moodle_enrol_external extends external_api {
             self::validate_context($context);
             require_capability('moodle/role:assign', $context);
 
+            // throw an exception if user is not able to unassign the role in this context
+            $roles = get_assignable_roles($context, ROLENAME_SHORT);
+            if (!key_exists($unassignment['roleid'], $roles)) {
+                throw new invalid_parameter_exception('Can not unassign roleid='.$unassignment['roleid'].' in contextid='.$unassignment['contextid']);
+            }
+
             role_unassign($unassignment['roleid'], $unassignment['userid'], $unassignment['contextid']);
         }
 

enrol/imsenterprise/db/upgrade.php

@@ -80,6 +80,8 @@ function xmldb_enrol_imsenterprise_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2011013000, 'enrol', 'imsenterprise');
     }
 
+    // Moodle v2.1.0 release upgrade line
+    // Put any upgrade step following this
 
     return true;
 }

enrol/manual/edit_form.php

@@ -46,6 +46,7 @@ class enrol_manual_edit_form extends moodleform {
 
         $mform->addElement('duration', 'enrolperiod', get_string('defaultperiod', 'enrol_manual'), array('optional' => true, 'defaultunit' => 86400));
         $mform->setDefault('enrolperiod', $plugin->get_config('enrolperiod'));
+        $mform->addHelpButton('enrolperiod', 'defaultperiod', 'enrol_manual');
 
         if ($instance->id) {
             $roles = get_default_enrol_roles($context, $instance->roleid);

enrol/manual/lang/en/enrol_manual.php

@@ -27,10 +27,11 @@
 $string['alterstatus'] = 'Alter status';
 $string['altertimeend'] = 'Alter end time';
 $string['altertimestart'] = 'Alter start time';
-$string['assignrole'] = 'Assignrole';
+$string['assignrole'] = 'Assign role';
 $string['confirmbulkdeleteenrolment'] = 'Are you sure you want to delete these users enrolments?';
-$string['defaultperiod'] = 'Default enrolment period';
-$string['defaultperiod_desc'] = 'Default length of the default enrolment period setting (in seconds).'; //TODO: fixme
+$string['defaultperiod'] = 'Default enrolment duration';
+$string['defaultperiod_desc'] = 'Default length of time that the enrolment is valid (in seconds). If set to zero, the enrolment duration will be unlimited by default.';
+$string['defaultperiod_help'] = 'Default length of time that the enrolment is valid, starting with the moment the user is enrolled. If disabled, the enrolment duration will be unlimited by default.';
 $string['deleteselectedusers'] = 'Delete selected user enrolments';
 $string['editenrolment'] = 'Edit enrolment';
 $string['editselectedusers'] = 'Edit selected user enrolments';

enrol/manual/yui/quickenrolment/quickenrolment.js

@@ -281,6 +281,7 @@ YUI.add('moodle-enrol_manual-quickenrolment', function(Y) {
                 this.set(UEP.PAGE, this.get(UEP.PAGE)+1);
             } else {
                 this.set(UEP.USERCOUNT, 0);
+                this.set(UEP.PAGE, 0);
             }
             params = this.get(UEP.PARAMS);
             params['sesskey'] = M.cfg.sesskey;

enrol/meta/locallib.php

@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -45,7 +44,7 @@ class enrol_meta_handler {
             return true;
         }
 
-        //only course level roles are interesting
+        // only course level roles are interesting
         $parentcontext = get_context_instance_by_id($ra->contextid);
         if ($parentcontext->contextlevel != CONTEXT_COURSE) {
             return true;
@@ -81,7 +80,7 @@ class enrol_meta_handler {
     public function role_unassigned($ra) {
         global $DB;
 
-        //note: do not test if plugin enabled, we want to keep removing previous roles
+        // note: do not test if plugin enabled, we want to keep removing previous roles
 
         // prevent circular dependencies - we can not sync meta roles recursively
         if ($ra->component === 'enrol_meta') {
@@ -99,7 +98,7 @@ class enrol_meta_handler {
             return true;
         }
 
-        //note: do not check 'nosyncroleids', somebody might have just enabled it, we want to get rid of nosync roles gradually
+        // note: do not check 'nosyncroleids', somebody might have just enabled it, we want to get rid of nosync roles gradually
 
         foreach ($enrols as $enrol) {
             // Is the user enrolled? We want to sync only really enrolled users
@@ -114,8 +113,8 @@ class enrol_meta_handler {
                 continue;
             }
 
-            // unassing role, there is no other role assignment in parent course
-            role_unassign($ra->roleid, $ra->userid, $ra->contextid, 'enrol_meta', $enrol->id);
+            // unassign role, there is no other role assignment in parent course
+            role_unassign($ra->roleid, $ra->userid, $context->id, 'enrol_meta', $enrol->id);
         }
 
         return true;
@@ -128,6 +127,11 @@ class enrol_meta_handler {
             return true;
         }
 
+        if ($ue->enrol === 'meta') {
+            // prevent circular dependencies - we can not sync meta enrolments recursively
+            return true;
+        }
+
         // does anything want to sync with this parent?
         if (!$enrols = $DB->get_records('enrol', array('customint1'=>$ue->courseid, 'enrol'=>'meta'), 'id ASC')) {
             return true;
@@ -153,7 +157,7 @@ class enrol_meta_handler {
                   JOIN {user_enrolments} ue ON (ue.enrolid = e.id AND ue.userid = :userid)
                   JOIN {enrol} pe ON (pe.courseid = e.customint1 AND pe.enrol <> 'meta' AND pe.courseid = :courseid)
              LEFT JOIN {user_enrolments} pue ON (pue.enrolid = pe.id AND pue.userid = ue.userid)
-                 WHERE pue.id IS NULL";
+                 WHERE pue.id IS NULL AND e.enrol = 'meta'";
         $params = array('courseid'=>$ue->courseid, 'userid'=>$ue->userid);
 
         $rs = $DB->get_recordset_sql($sql, $params);
@@ -170,7 +174,7 @@ class enrol_meta_handler {
     public function course_deleted($course) {
         global $DB;
 
-        //note: do not test if plugin enabled, we want to keep removing previously linked courses
+        // note: do not test if plugin enabled, we want to keep removing previously linked courses
 
         // does anything want to sync with this parent?
         if (!$enrols = $DB->get_records('enrol', array('customint1'=>$course->id, 'enrol'=>'meta'), 'id ASC')) {
@@ -179,7 +183,7 @@ class enrol_meta_handler {
 
         $plugin = enrol_get_plugin('meta');
         foreach ($enrols as $enrol) {
-            //unenrol all users
+            // unenrol all users
             $ues = $DB->get_recordset('user_enrolments', array('enrolid'=>$enrol->id));
             foreach ($ues as $ue) {
                 $plugin->unenrol_user($enrol, $ue->userid);
@@ -191,6 +195,7 @@ class enrol_meta_handler {
     }
 }
 
+
 /**
  * Sync all meta course links.
  * @param int $courseid one course, empty mean all

enrol/mnet/db/upgrade.php

@@ -36,5 +36,8 @@ function xmldb_enrol_mnet_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2010071701, 'enrol', 'mnet');
     }
 
+    // Moodle v2.1.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }

enrol/paypal/db/upgrade.php

@@ -59,6 +59,8 @@ function xmldb_enrol_paypal_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2010071500, 'enrol', 'paypal');
     }
 
+    // Moodle v2.1.0 release upgrade line
+    // Put any upgrade step following this
 
     return true;
 }

enrol/paypal/edit_form.php

@@ -69,14 +69,15 @@ class enrol_paypal_edit_form extends moodleform {
 
         $mform->addElement('duration', 'enrolperiod', get_string('enrolperiod', 'enrol_paypal'), array('optional' => true, 'defaultunit' => 86400));
         $mform->setDefault('enrolperiod', $plugin->get_config('enrolperiod'));
-
+        $mform->addHelpButton('enrolperiod', 'enrolperiod', 'enrol_paypal');
 
         $mform->addElement('date_selector', 'enrolstartdate', get_string('enrolstartdate', 'enrol_paypal'), array('optional' => true));
         $mform->setDefault('enrolstartdate', 0);
-
+        $mform->addHelpButton('enrolstartdate', 'enrolstartdate', 'enrol_paypal');
 
         $mform->addElement('date_selector', 'enrolenddate', get_string('enrolenddate', 'enrol_paypal'), array('optional' => true));
         $mform->setDefault('enrolenddate', 0);
+        $mform->addHelpButton('enrolenddate', 'enrolenddate', 'enrol_paypal');
 
         $mform->addElement('hidden', 'id');
         $mform->addElement('hidden', 'courseid');

enrol/paypal/lang/en/enrol_paypal.php

@@ -34,10 +34,13 @@ $string['currency'] = 'Currency';
 $string['defaultrole'] = 'Default role assignment';
 $string['defaultrole_desc'] = 'Select role which should be assigned to users during PayPal enrolments';
 $string['enrolenddate'] = 'End date';
+$string['enrolenddate_help'] = 'If enabled, users can be enrolled until this date only.';
 $string['enrolenddaterror'] = 'Enrolment end date cannot be earlier than start date';
-$string['enrolperiod'] = 'Enrolment period';
-$string['enrolperiod_desc'] = 'Default length of the enrolment period (in seconds).'; //TODO: fixme
+$string['enrolperiod'] = 'Enrolment duration';
+$string['enrolperiod_desc'] = 'Default length of time that the enrolment is valid (in seconds). If set to zero, the enrolment duration will be unlimited by default.';
+$string['enrolperiod_help'] = 'Length of time that the enrolment is valid, starting with the moment the user is enrolled. If disabled, the enrolment duration will be unlimited.';
 $string['enrolstartdate'] = 'Start date';
+$string['enrolstartdate_help'] = 'If enabled, users can be enrolled from this date onward only.';
 $string['mailadmins'] = 'Notify admin';
 $string['mailstudents'] = 'Notify students';
 $string['mailteachers'] = 'Notify teachers';

enrol/self/edit_form.php

@@ -68,12 +68,15 @@ class enrol_self_edit_form extends moodleform {
 
         $mform->addElement('duration', 'enrolperiod', get_string('enrolperiod', 'enrol_self'), array('optional' => true, 'defaultunit' => 86400));
         $mform->setDefault('enrolperiod', $plugin->get_config('enrolperiod'));
+        $mform->addHelpButton('enrolperiod', 'enrolperiod', 'enrol_self');
 
         $mform->addElement('date_selector', 'enrolstartdate', get_string('enrolstartdate', 'enrol_self'), array('optional' => true));
         $mform->setDefault('enrolstartdate', 0);
+        $mform->addHelpButton('enrolstartdate', 'enrolstartdate', 'enrol_self');
 
         $mform->addElement('date_selector', 'enrolenddate', get_string('enrolenddate', 'enrol_self'), array('optional' => true));
         $mform->setDefault('enrolenddate', 0);
+        $mform->addHelpButton('enrolenddate', 'enrolenddate', 'enrol_self');
 
         $options = array(0 => get_string('never'),
                  1800 * 3600 * 24 => get_string('numdays', '', 1800),

enrol/self/lang/en/enrol_self.php

@@ -29,11 +29,14 @@ $string['defaultrole'] = 'Default role assignment';
 $string['defaultrole_desc'] = 'Select role which should be assigned to users during self enrolment';
 $string['editenrolment'] = 'Edit enrolment';
 $string['enrolenddate'] = 'End date';
+$string['enrolenddate_help'] = 'If enabled, users can enrol themselves until this date only.';
 $string['enrolenddaterror'] = 'Enrolment end date cannot be earlier than start date';
 $string['enrolme'] = 'Enrol me';
-$string['enrolperiod'] = 'Enrolment period';
-$string['enrolperiod_desc'] = 'Default length of the enrolment period (in seconds).'; //TODO: fixme
+$string['enrolperiod'] = 'Enrolment duration';
+$string['enrolperiod_desc'] = 'Default length of time that the enrolment is valid (in seconds). If set to zero, the enrolment duration will be unlimited by default.';
+$string['enrolperiod_help'] = 'Length of time that the enrolment is valid, starting with the moment the user enrols themselves. If disabled, the enrolment duration will be unlimited.';
 $string['enrolstartdate'] = 'Start date';
+$string['enrolstartdate_help'] = 'If enabled, users can enrol themselves from this date onward only.';
 $string['groupkey'] = 'Use group enrolment keys';
 $string['groupkey_desc'] = 'Use group enrolment keys by default.';
 $string['groupkey_help'] = 'In addition to restricting access to the course to only those who know the key, use of a group enrolment key means users are automatically added to the group when they enrol in the course.

enrol/self/locallib.php

@@ -31,6 +31,16 @@ require_once("$CFG->libdir/formslib.php");
 class enrol_self_enrol_form extends moodleform {
     protected $instance;
 
+    /**
+     * Overriding this function to get unique form id for multiple self enrolments
+     *
+     * @return string form identifier
+     */
+    protected function get_form_identifier() {
+        $formid = $this->_customdata->id.'_'.get_class($this);
+        return $formid;
+    }
+
     public function definition() {
         $mform = $this->_form;
         $instance = $this->_customdata;
@@ -40,7 +50,9 @@ class enrol_self_enrol_form extends moodleform {
         if ($instance->password) {
             $heading = $plugin->get_instance_name($instance);
             $mform->addElement('header', 'selfheader', $heading);
-            $mform->addElement('passwordunmask', 'enrolpassword', get_string('password', 'enrol_self'));
+            //change the id of self enrolment key input as there can be multiple self enrolment methods
+            $mform->addElement('passwordunmask', 'enrolpassword', get_string('password', 'enrol_self'),
+                    array('id' => $instance->id."_enrolpassword"));
         } else {
             // nothing?
         }

filter/mediaplugin/db/upgrade.php

@@ -43,5 +43,8 @@ function xmldb_filter_mediaplugin_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2011030900, 'filter', 'mediaplugin');
     }
 
+    // Moodle v2.1.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }

filter/tex/db/upgrade.php

@@ -38,5 +38,8 @@ function xmldb_filter_tex_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2011031301, 'filter', 'tex');
     }
 
+    // Moodle v2.1.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }

filter/tex/filter.php

@@ -168,7 +168,7 @@ class filter_tex extends moodle_text_filter {
             $texexp = html_entity_decode($texexp, ENT_QUOTES, 'UTF-8');
 
             if ($texexp === '') {
-                contninue;
+                continue;
             }
 
             $md5 = md5($texexp);

index.php

@@ -88,8 +88,11 @@
     $PAGE->set_heading($SITE->fullname);
     echo $OUTPUT->header();
 
-/// Print Section
-    if ($SITE->numsections > 0) {
+/// Print Section or custom info
+    if (!empty($CFG->customfrontpageinclude)) {
+        include($CFG->customfrontpageinclude);
+
+    } else if ($SITE->numsections > 0) {
 
         if (!$section = $DB->get_record('course_sections', array('course'=>$SITE->id, 'section'=>1))) {
             $DB->delete_records('course_sections', array('course'=>$SITE->id, 'section'=>1)); // Just in case

install/lang/af/admin.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/af/langconfig.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/am/install.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/am/langconfig.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/am/moodle.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/ar/admin.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/ar/error.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/ar/install.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/ar/langconfig.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/ar/moodle.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/ast/admin.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/ast/error.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/ast/install.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/ast/langconfig.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/ast/moodle.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/az/admin.php

@@ -0,0 +1,42 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle 2.1 installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+$string['clianswerno'] = 'n';
+$string['cliansweryes'] = 'y';
+$string['cliincorrectvalueerror'] = 'Səhv, "{$a->option}" üçün səhv "{$a->value}" qiyməti';
+$string['cliincorrectvalueretry'] = 'Səhv, "{$a->option}" üçün səhv "{$a->value}" qiyməti';
+$string['clitypevalue'] = 'Qiyməti daxil edin';
+$string['clitypevaluedefault'] = 'Qiyməti daxil edin, ({$a}) qiymətindən avtomatik olaraq istifadə etmək üçün Enter düyməsini basın';
+$string['cliunknowoption'] = 'Təyin olunmayan parametrlər: 
+  {$a}
+Zəhmət olmasa help parametrindən istifadə edin';
+$string['cliyesnoprompt'] = 'y (bəli) və n (xeyr) düyməsini basın';
+$string['environmentrequireinstall'] = 'quraşdırılıb işə salınmalıdır';
+$string['environmentrequireversion'] = '{$a->needed}  versiyası tövsiyyə olunur. Siz {$a->current} versiyasından istifadə edirsiniz.';

install/lang/az/langconfig.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/be/langconfig.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/be/moodle.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/bg/admin.php

@@ -0,0 +1,35 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle 2.1 installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+$string['clianswerno'] = 'Не';
+$string['cliansweryes'] = 'Да';
+$string['cliincorrectvalueretry'] = 'Неправилна стойност. Моля опитайте отново';
+$string['environmentrequireinstall'] = 'Трябва да бъде инсталиран и разрешен';
+$string['environmentrequireversion'] = 'Необходима е версия {$a->needed} а Вие имате  {$a->current}';

install/lang/bg/error.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/bg/install.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer
@@ -31,6 +31,12 @@
 $string['availablelangs'] = 'Списък на наличните езици';
 $string['chooselanguagehead'] = 'Изберете език';
 $string['chooselanguagesub'] = 'Моля, изберете език за инсталацията. Този език ще бъде, също така, език по подразбиране на сайта, но може да бъде променен и по-късно след инсталирането.';
+$string['dataroot'] = 'Директория за данни';
+$string['dirroot'] = 'Директория на Moodle';
 $string['installation'] = 'Инсталиране';
 $string['paths'] = 'Пътища';
 $string['pathshead'] = 'Потвърждаване на пътищата';
+$string['pathssubdataroot'] = 'Тази директория е място, където Moodle, записва качваните файлове. Тази директория трябва да е достъпна за четене И ЗА ЗАПИС от потребителя на интернет сървъра (обикновено \'nobody\' или \'apache\'), но не трябва да е достъпна пряко през Интернет. Инталаторът ще се опита да създаде директорията, ако тя не съществува.';
+$string['pathssubdirroot'] = 'Пълен път до директорията на Moodle.';
+$string['pathssubwwwroot'] = 'Пълен интернет адрес, на който ще се отваря Moodle. Не е възможно Moodle да се отваря чрез различни адреси. Ако Вашият сайт има няколко адреса трябва на всеки от другите адреси да направите HTML пренасочване към този. Ако Вашият сайт се отваря както глобално от Интернет, така и от локална мрежа, настройте DNS така че потребителите от локалната мрежа също да могат да ползват глобалния адрес. Ако адресът не е коректен, моля, променете адреса в браузъра си и започнете инсталирането с правилния адрес.';
+$string['wwwroot'] = 'Уеб адрес';

install/lang/bg/langconfig.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/bg/moodle.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/bn/admin.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/bn/install.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/bn/langconfig.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/bn/moodle.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/bs/install.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/bs/langconfig.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/ca/admin.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/ca/error.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/ca/install.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/ca/langconfig.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/ca/moodle.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/ckb/langconfig.php

@@ -0,0 +1,31 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle 2.1 installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+$string['thislanguage'] = 'سۆرانی';

install/lang/cs/admin.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/cs/error.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer
@@ -29,16 +29,16 @@
  */
 
 $string['cannotcreatelangdir'] = 'Nelze vytvořit adresář pro jazykové soubory';
-$string['cannotcreatetempdir'] = 'Nelze vytvořit dočasný adresář.';
+$string['cannotcreatetempdir'] = 'Nelze vytvořit dočasný adresář';
 $string['cannotdownloadcomponents'] = 'Nelze stáhnout komponenty';
 $string['cannotdownloadzipfile'] = 'Nelze stáhnout soubor ZIP';
 $string['cannotfindcomponent'] = 'Komponenta nenalezena';
-$string['cannotsavemd5file'] = 'Nelze uložit soubor MD5.';
-$string['cannotsavezipfile'] = 'Nelze uložit soubor ZIP.';
-$string['cannotunzipfile'] = 'Nelze dekomprimovat soubor.';
-$string['componentisuptodate'] = 'Komponenta je aktuální.';
-$string['downloadedfilecheckfailed'] = 'Kontrola staženého souboru dopadla negativně';
-$string['invalidmd5'] = 'Neplatný MD5 hash';
+$string['cannotsavemd5file'] = 'Nelze uložit soubor MD5';
+$string['cannotsavezipfile'] = 'Nelze uložit soubor ZIP';
+$string['cannotunzipfile'] = 'Nelze dekomprimovat soubor';
+$string['componentisuptodate'] = 'Komponenta je aktuální';
+$string['downloadedfilecheckfailed'] = 'Selhala kontrola staženého souboru';
+$string['invalidmd5'] = 'Ověření selhalo - zkuste to znovu';
 $string['missingrequiredfield'] = 'Chybí některé z povinných polí';
 $string['remotedownloaderror'] = 'Stahování komponenty na váš server selhalo. Prověřte nastavení proxy. Vřele doporučujeme PHP rozšíření cURL.<br /><br />Nyní musíte stáhnout soubor <a href="{$a->url}">{$a->url}</a> ručně, překopírovat jej do "{$a->dest}" na vašem serveru a tam jej rozbalit.';
 $string['wrongdestpath'] = 'Chybné cílové umístění';

install/lang/cs/install.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer

install/lang/cs/langconfig.php

@@ -21,7 +21,7 @@
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
  * generated automatically by export-installer.php (which is part of AMOS
- * {@link http://docs.moodle.org/en/Development:Languages/AMOS}) using the
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
  * list of strings defined in /install/stringnames.txt.
  *
  * @package   installer