Merge branch 'MDL-31656-master-3' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 4 Mar 2012 22:09:29 +0000 (11:09 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 4 Mar 2012 22:09:29 +0000 (11:09 +1300)
678 files changed:
admin/mnet/peer_forms.php
admin/settings.php
admin/settings/grades.php
admin/tool/customlang/db/access.php
admin/tool/customlang/lang/en/tool_customlang.php
admin/tool/unittest/db/access.php
backup/cc/cc_includes.php
backup/cc/cc_lib/cc_asssesment.php
backup/cc/cc_lib/cc_basiclti.php
backup/cc/cc_lib/cc_convert_moodle2.php
backup/cc/cc_lib/cc_converter_label.php [new file with mode: 0644]
backup/cc/cc_lib/cc_forum.php
backup/cc/cc_lib/cc_page.php
backup/cc/cc_lib/cc_resources.php
backup/cc/cc_lib/cc_weblink.php
backup/cc/cc_lib/xmlbase.php
backup/moodle2/backup_activity_task.class.php
backup/moodle2/backup_block_task.class.php
backup/moodle2/backup_course_task.class.php
backup/moodle2/backup_coursereport_plugin.class.php
backup/moodle2/backup_custom_fields.php
backup/moodle2/backup_default_block_task.class.php
backup/moodle2/backup_final_task.class.php
backup/moodle2/backup_format_plugin.class.php
backup/moodle2/backup_gradingform_plugin.class.php
backup/moodle2/backup_plagiarism_plugin.class.php
backup/moodle2/backup_plan_builder.class.php
backup/moodle2/backup_plugin.class.php
backup/moodle2/backup_qtype_plugin.class.php
backup/moodle2/backup_report_plugin.class.php
backup/moodle2/backup_root_task.class.php
backup/moodle2/backup_section_task.class.php
backup/moodle2/backup_settingslib.php
backup/moodle2/backup_stepslib.php
backup/moodle2/backup_subplugin.class.php
backup/moodle2/backup_theme_plugin.class.php
backup/moodle2/backup_xml_transformer.class.php
backup/moodle2/restore_activity_task.class.php
backup/moodle2/restore_block_task.class.php
backup/moodle2/restore_course_task.class.php
backup/moodle2/restore_coursereport_plugin.class.php
backup/moodle2/restore_default_block_task.class.php
backup/moodle2/restore_final_task.class.php
backup/moodle2/restore_format_plugin.class.php
backup/moodle2/restore_gradingform_plugin.class.php
backup/moodle2/restore_plagiarism_plugin.class.php
backup/moodle2/restore_plan_builder.class.php
backup/moodle2/restore_plugin.class.php
backup/moodle2/restore_qtype_plugin.class.php
backup/moodle2/restore_report_plugin.class.php
backup/moodle2/restore_root_task.class.php
backup/moodle2/restore_section_task.class.php
backup/moodle2/restore_settingslib.php
backup/moodle2/restore_stepslib.php
backup/moodle2/restore_subplugin.class.php
backup/moodle2/restore_theme_plugin.class.php
backup/util/settings/backup_setting.class.php
backup/util/settings/base_setting.class.php
backup/util/settings/root/root_backup_setting.class.php
blocks/community/communitycourse.php
blocks/community/locallib.php
blocks/community/renderer.php
blocks/community/yui/imagegallery/imagegallery.js
blocks/completionstatus/block_completionstatus.php
blocks/completionstatus/lang/en/block_completionstatus.php
blocks/course_list/block_course_list.php
blocks/course_list/lang/en/block_course_list.php
blocks/dock.js
blocks/html/lib.php
blocks/navigation/block_navigation.php
blocks/navigation/edit_form.php
blocks/navigation/renderer.php
blocks/navigation/version.php
blocks/online_users/db/access.php
blocks/participants/block_participants.php
blocks/private_files/block_private_files.php
blocks/private_files/lang/en/block_private_files.php
blocks/rss_client/block_rss_client.php
blocks/rss_client/db/access.php
blocks/rss_client/editfeed.php
blocks/rss_client/lang/en/block_rss_client.php
blocks/rss_client/managefeeds.php
blocks/rss_client/viewfeed.php
blocks/section_links/config_instance.html
blocks/selfcompletion/block_selfcompletion.php
blocks/selfcompletion/lang/en/block_selfcompletion.php
blog/rsslib.php
calendar/delete.php
calendar/event.php
calendar/lib.php
course/completion.php
course/info.php
course/publish/backup.php
course/publish/forms.php
course/publish/index.php
course/publish/lib.php
course/publish/metadata.php
course/publish/renderer.php
enrol/authorize/db/access.php
enrol/category/db/access.php
enrol/category/db/events.php
enrol/cohort/ajax.php
enrol/cohort/db/access.php
enrol/cohort/db/events.php
enrol/guest/db/access.php
enrol/ldap/db/access.php
enrol/ldap/lang/en/enrol_ldap.php
enrol/locallib.php
enrol/manual/db/access.php
enrol/manual/db/services.php
enrol/manual/lib.php
enrol/manual/yui/quickenrolment/quickenrolment.js
enrol/meta/db/access.php
enrol/meta/db/events.php
enrol/paypal/db/access.php
enrol/self/db/access.php
filter/algebra/AlgParser.pm
grade/edit/letter/edit_form.php
grade/edit/letter/index.php
grade/edit/letter/tabs.php
grade/edit/outcome/course.php
grade/edit/outcome/edit.php
grade/edit/outcome/edit_form.php
grade/edit/outcome/export.php
grade/edit/outcome/import.php
grade/edit/outcome/import_outcomes_form.php
grade/edit/outcome/index.php
grade/edit/outcome/tabs.php
grade/edit/scale/edit.php
grade/edit/scale/edit_form.php
grade/edit/scale/index.php
grade/edit/settings/form.php
grade/edit/settings/index.php
grade/edit/tree/action.php
grade/edit/tree/calculation.php
grade/edit/tree/calculation_form.php
grade/edit/tree/category.php
grade/edit/tree/category_form.php
grade/edit/tree/grade.php
grade/edit/tree/grade_form.php
grade/edit/tree/index.php
grade/edit/tree/item.php
grade/edit/tree/item_form.php
grade/edit/tree/lib.php
grade/edit/tree/outcomeitem.php
grade/edit/tree/outcomeitem_form.php
grade/export/ods/db/access.php
grade/export/txt/db/access.php
grade/export/xls/db/access.php
grade/export/xml/db/access.php
grade/grading/form/rubric/styles.css
grade/grading/manage.php
grade/grading/pick.php
grade/import/csv/db/access.php
grade/import/xml/db/access.php
grade/index.php
grade/lib.php
grade/querylib.php
grade/report/grader/ajax_callbacks.php
grade/report/grader/db/access.php
grade/report/grader/index.php
grade/report/grader/lang/en/gradereport_grader.php
grade/report/grader/lib.php
grade/report/grader/preferences.php
grade/report/grader/preferences_form.php
grade/report/grader/quickedit_item.php
grade/report/grader/settings.php
grade/report/grader/tabs.php
grade/report/grader/version.php
grade/report/index.php
grade/report/lib.php
grade/report/outcomes/db/access.php
grade/report/outcomes/index.php
grade/report/outcomes/lang/en/gradereport_outcomes.php
grade/report/outcomes/version.php
grade/report/overview/db/access.php
grade/report/overview/index.php
grade/report/overview/lang/en/gradereport_overview.php
grade/report/overview/lib.php
grade/report/overview/renderer.php
grade/report/overview/settings.php
grade/report/overview/version.php
grade/report/user/db/access.php
grade/report/user/index.php
grade/report/user/lang/en/gradereport_user.php
grade/report/user/lib.php
grade/report/user/renderer.php
grade/report/user/settings.php
grade/report/user/version.php
group/assign.php
group/autogroup.php
group/autogroup_form.php
group/clientlib.js
group/delete.php
group/externallib.php
group/group.php
group/group_form.php
group/grouping.php
group/grouping_form.php
group/groupings.php
group/import.php
group/import_form.php
group/index.php
group/lib.php
group/members.php
group/overview.php
group/tabs.php
install/lang/ca/error.php
install/lang/ca_valencia/langconfig.php [new file with mode: 0644]
install/lang/de/admin.php
install/lang/en_ar/langconfig.php [new file with mode: 0644]
install/lang/hr/install.php
install/lang/it/admin.php
install/lang/ka/moodle.php [new file with mode: 0644]
install/lang/kl/langconfig.php [new file with mode: 0644]
install/lang/lt/admin.php [new file with mode: 0644]
install/lang/lt/moodle.php
install/lang/lt_uni/langconfig.php [new file with mode: 0644]
lang/en/auth.php
lang/en/backup.php
lang/en/grades.php
lang/en/langconfig.php
lang/en/mnet.php
lang/en/question.php
lib/accesslib.php
lib/ajax/ajaxlib.php
lib/ajax/getnavbranch.php
lib/ajax/setuserpref.php
lib/db/access.php
lib/db/events.php
lib/db/install.xml
lib/db/services.php
lib/db/upgrade.php
lib/dml/database_column_info.php
lib/dml/moodle_database.php
lib/dml/moodle_recordset.php
lib/dml/moodle_temptables.php
lib/dml/moodle_transaction.php
lib/dml/mssql_native_moodle_database.php
lib/dml/mssql_native_moodle_recordset.php
lib/dml/mssql_native_moodle_temptables.php
lib/dml/mysqli_native_moodle_database.php
lib/dml/mysqli_native_moodle_recordset.php
lib/dml/mysqli_native_moodle_temptables.php
lib/dml/oci_native_moodle_database.php
lib/dml/oci_native_moodle_package.sql
lib/dml/oci_native_moodle_recordset.php
lib/dml/oci_native_moodle_temptables.php
lib/dml/pdo_moodle_database.php
lib/dml/pdo_moodle_recordset.php
lib/dml/pgsql_native_moodle_database.php
lib/dml/pgsql_native_moodle_recordset.php
lib/dml/pgsql_native_moodle_temptables.php
lib/dml/sqlite3_pdo_moodle_database.php
lib/dml/sqlsrv_native_moodle_database.php
lib/dml/sqlsrv_native_moodle_recordset.php
lib/dml/sqlsrv_native_moodle_temptables.php
lib/dmllib.php
lib/eventslib.php
lib/filebrowser/file_browser.php
lib/filebrowser/file_info.php
lib/filebrowser/file_info_context_course.php
lib/filebrowser/file_info_context_coursecat.php
lib/filebrowser/file_info_context_module.php
lib/filebrowser/file_info_context_system.php
lib/filebrowser/file_info_context_user.php
lib/filebrowser/file_info_stored.php
lib/filebrowser/virtual_root_file.php
lib/filelib.php
lib/filestorage/file_archive.php
lib/filestorage/file_exceptions.php
lib/filestorage/file_packer.php
lib/filestorage/file_storage.php
lib/filestorage/stored_file.php
lib/filestorage/zip_archive.php
lib/filestorage/zip_packer.php
lib/form/advcheckbox.php
lib/form/button.php
lib/form/cancel.php
lib/form/checkbox.php
lib/form/dateselector.php
lib/form/datetimeselector.php
lib/form/duration.php
lib/form/editor.php
lib/form/file.php
lib/form/filemanager.js
lib/form/filemanager.php
lib/form/filepicker.php
lib/form/format.php
lib/form/grading.php
lib/form/group.php
lib/form/header.php
lib/form/hidden.php
lib/form/htmleditor.php
lib/form/modgrade.php
lib/form/modvisible.php
lib/form/password.php
lib/form/passwordunmask.php
lib/form/questioncategory.php
lib/form/radio.php
lib/form/recaptcha.php
lib/form/searchableselector.php
lib/form/select.php
lib/form/selectgroups.php
lib/form/selectwithlink.php
lib/form/selectyesno.php
lib/form/simpletest/testduration.php
lib/form/static.php
lib/form/submit.php
lib/form/submitlink.php
lib/form/tags.php
lib/form/text.php
lib/form/textarea.php
lib/form/url.php
lib/form/warning.php
lib/formslib.php
lib/grade/constants.php
lib/grade/grade_category.php
lib/grade/grade_grade.php
lib/grade/grade_item.php
lib/grade/grade_object.php
lib/grade/grade_outcome.php
lib/grade/grade_scale.php
lib/grade/simpletest/testgradecategory.php
lib/grade/simpletest/testgradegrades.php
lib/grade/simpletest/testgradeitem.php
lib/grade/simpletest/testgradeoutcome.php
lib/grade/simpletest/testgradescale.php
lib/gradelib.php
lib/grouplib.php
lib/html2text.php
lib/javascript-static.js
lib/messagelib.php
lib/moodlelib.php
lib/navigationlib.php
lib/outputactions.php
lib/outputcomponents.php
lib/outputfactories.php
lib/outputlib.php
lib/outputrenderers.php
lib/outputrequirementslib.php
lib/pagelib.php
lib/pluginlib.php
lib/questionlib.php
lib/rsslib.php
lib/setuplib.php
lib/simpletest/testmoodlelib.php
lib/simpletest/testweblib.php
lib/weblib.php
lib/yui/formchangechecker/formchangechecker.js [new file with mode: 0644]
lib/yui/formslib/formslib.js [deleted file]
login/index_form.html
message/defaultoutputs.php
message/discussion.php
message/edit.php
message/externallib.php
message/index.php
message/lib.php
message/output/email/db/install.php
message/output/email/db/upgrade.php
message/output/email/lang/en/message_email.php
message/output/email/lib.php
message/output/email/message_output_email.php
message/output/email/settings.php
message/output/email/version.php
message/output/jabber/db/install.php
message/output/jabber/db/upgrade.php
message/output/jabber/lang/en/message_jabber.php
message/output/jabber/lib.php
message/output/jabber/message_output_jabber.php
message/output/jabber/settings.php
message/output/jabber/version.php
message/output/lib.php
message/output/popup/db/install.php
message/output/popup/db/upgrade.php
message/output/popup/lang/en/message_popup.php
message/output/popup/lib.php
message/output/popup/message_output_popup.php
message/output/popup/version.php
message/renderer.php
message/send_form.php
mnet/peer.php
mod/assignment/backup/moodle2/backup_assignment_activity_task.class.php
mod/assignment/db/access.php
mod/assignment/db/events.php
mod/assignment/grade.php
mod/assignment/lib.php
mod/assignment/type/upload/assignment.class.php
mod/assignment/type/uploadsingle/assignment.class.php
mod/chat/backup/moodle2/backup_chat_activity_task.class.php
mod/chat/db/access.php
mod/chat/db/events.php
mod/choice/backup/moodle2/backup_choice_activity_task.class.php
mod/choice/db/access.php
mod/data/backup/moodle2/backup_data_activity_task.class.php
mod/data/db/access.php
mod/data/lib.php
mod/data/rsslib.php
mod/feedback/backup/moodle2/backup_feedback_activity_task.class.php
mod/feedback/db/access.php
mod/feedback/lib.php
mod/folder/backup/moodle2/backup_folder_activity_task.class.php
mod/folder/db/access.php
mod/folder/lib.php
mod/forum/backup/moodle2/backup_forum_activity_task.class.php
mod/forum/db/access.php
mod/forum/db/events.php
mod/forum/lib.php
mod/forum/rsslib.php
mod/glossary/backup/moodle2/backup_glossary_activity_task.class.php
mod/glossary/db/access.php
mod/glossary/db/install.xml
mod/glossary/db/upgrade.php
mod/glossary/formats/entrylist/entrylist_format.php
mod/glossary/lang/en/glossary.php
mod/glossary/lib.php
mod/glossary/mod_form.php
mod/glossary/rsslib.php
mod/glossary/showentry.php
mod/glossary/version.php
mod/glossary/view.php
mod/imscp/backup/moodle2/backup_imscp_activity_task.class.php
mod/imscp/db/access.php
mod/imscp/lib.php
mod/label/backup/moodle2/backup_label_activity_task.class.php
mod/lesson/backup/moodle2/backup_lesson_activity_task.class.php
mod/lesson/backup/moodle2/restore_lesson_stepslib.php
mod/lesson/db/access.php
mod/lesson/grade.php
mod/lesson/lang/en/lesson.php
mod/lesson/lib.php
mod/lesson/pagetypes/multichoice.php
mod/lesson/renderer.php
mod/lesson/styles.css
mod/lti/backup/moodle2/backup_lti_activity_task.class.php
mod/lti/db/access.php
mod/lti/lib.php
mod/page/backup/moodle1/lib.php
mod/page/backup/moodle2/backup_page_activity_task.class.php
mod/page/db/access.php
mod/page/lib.php
mod/quiz/backup/moodle2/backup_quiz_activity_task.class.php
mod/quiz/db/access.php
mod/quiz/db/events.php
mod/quiz/grade.php
mod/quiz/lib.php
mod/quiz/report/grading/db/access.php
mod/quiz/report/statistics/db/access.php
mod/quiz/report/statistics/lib.php
mod/resource/backup/moodle2/backup_resource_activity_task.class.php
mod/resource/db/access.php
mod/resource/lib.php
mod/scorm/backup/moodle2/backup_scorm_activity_task.class.php
mod/scorm/datamodels/debug.js.php
mod/scorm/datamodels/scorm_datamodels.js [deleted file]
mod/scorm/db/access.php
mod/scorm/grade.php
mod/scorm/lang/en/scorm.php
mod/scorm/lib.php
mod/scorm/locallib.php
mod/scorm/mod_form.php
mod/scorm/module.js
mod/scorm/report/basic/report.php
mod/scorm/report/interactions/report.php
mod/scorm/styles.css
mod/survey/backup/moodle2/backup_survey_activity_task.class.php
mod/survey/db/access.php
mod/url/backup/moodle2/backup_url_activity_task.class.php
mod/url/db/access.php
mod/wiki/backup/moodle2/backup_wiki_activity_task.class.php
mod/wiki/db/access.php
mod/wiki/lib.php
mod/wiki/locallib.php
mod/workshop/backup/moodle2/backup_workshop_activity_task.class.php
mod/workshop/backup/moodle2/backup_workshop_settingslib.php
mod/workshop/backup/moodle2/backup_workshop_stepslib.php
mod/workshop/db/access.php
mod/workshop/form/accumulative/assessment_form.php
mod/workshop/form/accumulative/backup/moodle1/lib.php
mod/workshop/form/accumulative/backup/moodle2/backup_workshopform_accumulative_subplugin.class.php
mod/workshop/form/accumulative/backup/moodle2/restore_workshopform_accumulative_subplugin.class.php
mod/workshop/form/accumulative/db/install.php
mod/workshop/form/accumulative/db/upgrade.php
mod/workshop/form/accumulative/edit_form.php
mod/workshop/form/accumulative/lang/en/workshopform_accumulative.php
mod/workshop/form/accumulative/lib.php
mod/workshop/form/accumulative/simpletest/testlib.php
mod/workshop/form/accumulative/version.php
mod/workshop/form/comments/assessment_form.php
mod/workshop/form/comments/backup/moodle1/lib.php
mod/workshop/form/comments/backup/moodle2/backup_workshopform_comments_subplugin.class.php
mod/workshop/form/comments/backup/moodle2/restore_workshopform_comments_subplugin.class.php
mod/workshop/form/comments/db/install.php
mod/workshop/form/comments/db/upgrade.php
mod/workshop/form/comments/edit_form.php
mod/workshop/form/comments/lang/en/workshopform_comments.php
mod/workshop/form/comments/lib.php
mod/workshop/form/comments/version.php
mod/workshop/form/numerrors/assessment_form.php
mod/workshop/form/numerrors/backup/moodle1/lib.php
mod/workshop/form/numerrors/backup/moodle2/backup_workshopform_numerrors_subplugin.class.php
mod/workshop/form/numerrors/backup/moodle2/restore_workshopform_numerrors_subplugin.class.php
mod/workshop/form/numerrors/db/install.php
mod/workshop/form/numerrors/db/upgrade.php
mod/workshop/form/numerrors/edit_form.php
mod/workshop/form/numerrors/lang/en/workshopform_numerrors.php
mod/workshop/form/numerrors/lib.php
mod/workshop/form/numerrors/settings.php
mod/workshop/form/numerrors/simpletest/testlib.php
mod/workshop/form/numerrors/version.php
mod/workshop/form/rubric/assessment_form.php
mod/workshop/form/rubric/backup/moodle1/lib.php
mod/workshop/form/rubric/backup/moodle2/backup_workshopform_rubric_subplugin.class.php
mod/workshop/form/rubric/backup/moodle2/restore_workshopform_rubric_subplugin.class.php
mod/workshop/form/rubric/db/install.php
mod/workshop/form/rubric/db/upgrade.php
mod/workshop/form/rubric/edit_form.php
mod/workshop/form/rubric/lang/en/workshopform_rubric.php
mod/workshop/form/rubric/lib.php
mod/workshop/form/rubric/simpletest/testlib.php
mod/workshop/form/rubric/version.php
mod/workshop/lib.php
portfolio/googledocs/db/events.php
portfolio/picasa/db/events.php
question/previewlib.php
question/type/calculated/lib.php
question/type/calculated/questiontype.php
question/type/calculatedmulti/lib.php
question/type/calculatedmulti/questiontype.php
question/type/calculatedsimple/lib.php
question/type/edit_question_form.php
question/type/essay/lib.php
question/type/match/lib.php
question/type/match/questiontype.php
question/type/multianswer/questiontype.php
question/type/multichoice/lib.php
question/type/multichoice/questiontype.php
question/type/numerical/lib.php
question/type/numerical/questiontype.php
question/type/questiontypebase.php
question/type/shortanswer/lib.php
question/type/shortanswer/questiontype.php
question/type/truefalse/lib.php
report/completion/db/access.php
report/courseoverview/db/access.php
report/log/db/access.php
report/loglive/db/access.php
report/outline/db/access.php
report/participation/db/access.php
report/progress/db/access.php
report/questioninstances/db/access.php
report/security/db/access.php
report/stats/db/access.php
repository/alfresco/db/access.php
repository/boxnet/db/access.php
repository/coursefiles/db/access.php
repository/dropbox/db/access.php
repository/filepicker.js
repository/filesystem/db/access.php
repository/flickr/db/access.php
repository/flickr_public/db/access.php
repository/googledocs/db/access.php
repository/local/db/access.php
repository/merlot/db/access.php
repository/picasa/db/access.php
repository/recent/db/access.php
repository/s3/db/access.php
repository/upload/db/access.php
repository/url/db/access.php
repository/user/db/access.php
repository/webdav/db/access.php
repository/wikimedia/db/access.php
repository/youtube/db/access.php
rss/file.php
rss/renderer.php
theme/afterburner/style/afterburner_layout.css
theme/afterburner/style/afterburner_styles.css
theme/anomaly/style/base.css
theme/anomaly/style/general.css
theme/arialist/style/settings.css
theme/base/style/core.css
theme/base/style/message.css
theme/formal_white/style/core.css
theme/splash/config.php
theme/splash/lang/en/theme_splash.php
theme/splash/layout/embedded.php [new file with mode: 0644]
theme/splash/layout/general.php
theme/splash/layout/report.php
theme/splash/lib.php
theme/splash/pix/arrow-menu.gif [new file with mode: 0644]
theme/splash/pix/blue-theme.jpg [deleted file]
theme/splash/pix/blue-theme2.jpg [deleted file]
theme/splash/pix/blue.jpg [deleted file]
theme/splash/pix/contentbg.jpg [deleted file]
theme/splash/pix/contentbgright.jpg [deleted file]
theme/splash/pix/csmenubg.jpg [deleted file]
theme/splash/pix/dropdownbg.jpg [deleted file]
theme/splash/pix/green-theme.jpg [deleted file]
theme/splash/pix/green-theme2.jpg [deleted file]
theme/splash/pix/green.jpg [deleted file]
theme/splash/pix/header.jpg [deleted file]
theme/splash/pix/loginpanel.jpg [deleted file]
theme/splash/pix/logobgleft.jpg [deleted file]
theme/splash/pix/logobgleftblue.jpg [deleted file]
theme/splash/pix/logobgleftgreen.jpg [deleted file]
theme/splash/pix/logobgleftorange.jpg [deleted file]
theme/splash/pix/logobgright.jpg [deleted file]
theme/splash/pix/logobgrightblue.jpg [deleted file]
theme/splash/pix/logobgrightgreen.jpg [deleted file]
theme/splash/pix/logobgrightorange.jpg [deleted file]
theme/splash/pix/orange-theme.jpg [deleted file]
theme/splash/pix/orange-theme2.jpg [deleted file]
theme/splash/pix/orange.jpg [deleted file]
theme/splash/pix/post-sbbg.jpg [deleted file]
theme/splash/pix/post-sbheaderbg.jpg [deleted file]
theme/splash/pix/pre-sbbg.jpg [deleted file]
theme/splash/pix/pre-sbheaderbg.jpg [deleted file]
theme/splash/pix/red-theme.jpg [deleted file]
theme/splash/pix/red-theme2.jpg [deleted file]
theme/splash/pix/red.jpg [deleted file]
theme/splash/pix/sbheaderbg.jpg [deleted file]
theme/splash/pix/switchbg.jpg [deleted file]
theme/splash/pix/userinfobg.jpg [deleted file]
theme/splash/settings.php
theme/splash/style/blue.css
theme/splash/style/core.css [new file with mode: 0644]
theme/splash/style/editor.css
theme/splash/style/green.css
theme/splash/style/ie.css [deleted file]
theme/splash/style/menus.css [new file with mode: 0644]
theme/splash/style/orange.css
theme/splash/style/pagelayout.css [new file with mode: 0644]
theme/splash/style/red.css [new file with mode: 0644]
theme/splash/style/settings.css [new file with mode: 0644]
theme/splash/style/sl.css [deleted file]
theme/splash/version.php
theme/splash/yui/colourswitcher/colourswitcher.js [deleted file]
theme/standard/style/core.css
user/editadvanced.php
user/externallib.php
user/lib.php
version.php
webservice/amf/db/access.php
webservice/amf/introspector.php
webservice/amf/lang/en/webservice_amf.php
webservice/amf/locallib.php
webservice/amf/server.php
webservice/amf/simpleserver.php
webservice/amf/testclient/index.php
webservice/amf/version.php
webservice/externallib.php
webservice/lib.php
webservice/pluginfile.php
webservice/renderer.php
webservice/rest/db/access.php
webservice/rest/lang/en/webservice_rest.php
webservice/rest/lib.php
webservice/rest/locallib.php
webservice/rest/server.php
webservice/rest/simpleserver.php
webservice/rest/version.php
webservice/simpletest/testwebservice.php
webservice/soap/db/access.php
webservice/soap/lang/en/webservice_soap.php
webservice/soap/lib.php
webservice/soap/locallib.php
webservice/soap/server.php
webservice/soap/simpleserver.php
webservice/soap/version.php
webservice/upload.php
webservice/wsdoc.php
webservice/xmlrpc/db/access.php
webservice/xmlrpc/lang/en/webservice_xmlrpc.php
webservice/xmlrpc/lib.php
webservice/xmlrpc/locallib.php
webservice/xmlrpc/server.php
webservice/xmlrpc/simpleserver.php
webservice/xmlrpc/version.php

index 4e2e173..4c5243b 100644 (file)
@@ -98,6 +98,7 @@ class mnet_review_host_form extends moodleform {
 
         $mform->addElement('textarea', 'public_key', get_string('publickey', 'mnet'), array('rows' => 17, 'cols' => 100, 'class' => 'smalltext'));
         $mform->setType('public_key', PARAM_PEM);
+        $mform->addRule('public_key', get_string('required'), 'required');
 
         // finished with form controls, now the static informational stuff
         if ($mnet_peer && !empty($mnet_peer->bootstrapped)) {
@@ -160,7 +161,9 @@ class mnet_review_host_form extends moodleform {
         }
         $mnet_peer = new mnet_peer(); // idiotic api
         $mnet_peer->wwwroot = $data['wwwroot']; // just hard-set this rather than bootstrap the object
-        if (!$credentials = $mnet_peer->check_credentials($data['public_key'])) {
+        if (empty($data['public_key'])) {
+            $errors['public_key'] = get_string('publickeyrequired', 'mnet');
+        } else if (!$credentials = $mnet_peer->check_credentials($data['public_key'])) {
             $errmsg = '';
             foreach ($mnet_peer->error as $err) {
                 $errmsg .= $err['code'] . ': ' . $err['text'].'<br />';
index 3f8d2c9..3e66f24 100644 (file)
@@ -131,8 +131,8 @@ if (empty($SITE->fullname)) {
     echo '</form>';
 }
 
-$PAGE->requires->yui_module('moodle-core-formslib',
-        'M.core.init_formslib',
+$PAGE->requires->yui_module('moodle-core-formchangechecker',
+        'M.core_formchangechecker.init',
         array(array(
             'formid' => 'adminsettings'
         ))
index 95aee44..9915909 100644 (file)
@@ -58,6 +58,8 @@ if (has_capability('moodle/grade:manage', $systemcontext)
                                                         GRADE_NAVMETHOD_TABS => new lang_string('tabs', 'grades'),
                                                         GRADE_NAVMETHOD_COMBO => new lang_string('combo', 'grades'))));
 
+        $temp->add(new admin_setting_configcheckbox('recovergradesdefault', new lang_string('recovergradesdefault', 'grades'), new lang_string('recovergradesdefault_help', 'grades'), 0));
+
         $temp->add(new admin_setting_special_gradeexport());
 
         $temp->add(new admin_setting_special_gradelimiting());
index fa7c1aa..12f0792 100644 (file)
@@ -18,8 +18,7 @@
 /**
  * Defines the capabilities used by the Language customization admin tool
  *
- * @package    tool
- * @subpackage customlang
+ * @package    tool_customlang
  * @copyright  2010 David Mudrak <david@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
index f8af952..c9ba4bc 100644 (file)
@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for Language customization admin tool
+ * Strings for Language customisation admin tool
  *
  * @package    tool
  * @subpackage customlang
 
 defined('MOODLE_INTERNAL') || die();
 
-$string['checkin'] = 'Check in strings into disk';
-$string['checkout'] = 'Check out strings into the translator';
-$string['checkoutdone'] = 'Strings checked out successfully into the translator';
-$string['checkoutinprogress'] = 'Checking out strings into the translator';
-$string['confirmcheckin'] = 'You are about to check in modified strings into your local language pack. This will export the customized strings from the translator into the data directory and Moodle will start using the modified strings. Press \'Continue\' button to proceed check in.';
+$string['checkin'] = 'Save strings to language pack';
+$string['checkout'] = 'Open language pack for editing';
+$string['checkoutdone'] = 'Language pack loaded';
+$string['checkoutinprogress'] = 'Loading language pack';
+$string['confirmcheckin'] = 'You are about to save modifications to your local language pack. This will export the customised strings from the translator into you Moodle data directory and Moodle will start using the modified strings. Press \'Continue\' to proceed with saving.';
 $string['customlang:edit'] = 'Edit local translation';
 $string['customlang:view'] = 'View local translation';
 $string['filter'] = 'Filter strings';
 $string['filtercomponent'] = 'Show strings of these components';
-$string['filtercustomized'] = 'Customized only';
+$string['filtercustomized'] = 'Customised only';
 $string['filtermodified'] = 'Modified only';
 $string['filteronlyhelps'] = 'Help only';
 $string['filtershowstrings'] = 'Show strings';
 $string['filterstringid'] = 'String identifier';
 $string['filtersubstring'] = 'Only strings containing';
 $string['headingcomponent'] = 'Component';
-$string['headinglocal'] = 'Local customization';
+$string['headinglocal'] = 'Local customisation';
 $string['headingstandard'] = 'Standard text';
 $string['headingstringid'] = 'String';
-$string['markinguptodate'] = 'Marking the customization as up-to-date';
-$string['markinguptodate_help'] = 'The customized translation may get outdated if either the English original or the master translation has modified since the string was customized on your site. Review the customized translation. If you find it up-to-date, click the checkbox. Edit it otherwise.';
+$string['markinguptodate'] = 'Marking the customisation as up-to-date';
+$string['markinguptodate_help'] = 'The customised translation may get outdated if either the English original or the master translation has modified since the string was customised on your site. Review the customised translation. If you find it up-to-date, click the checkbox. Edit it otherwise.';
 $string['markuptodate'] = 'mark as up-to-date';
-$string['modifiedno'] = 'There are no modified strings to check in.';
-$string['modifiednum'] = 'There are {$a} modified strings. You must check in them into disk to store them permanently.';
+$string['modifiedno'] = 'There are no modified strings to save.';
+$string['modifiednum'] = 'There are {$a} modified strings. Do you wish to save these changes to your local language pack?';
 $string['nostringsfound'] = 'No strings found, please modify the filter settings';
 $string['placeholder'] = 'Placeholders';
 $string['placeholder_help'] = 'Placeholders are special statements like `{$a}` or `{$a->something}` within the string. They are replaced with a value when the string is actually printed.
 
 It is important to copy them exactly as they are in the original string. Do not translate them nor change their left-to-right orientation.';
 $string['placeholderwarning'] = 'string contains a placeholder';
-$string['pluginname'] = 'Language customization';
-$string['savecheckin'] = 'Save and check in strings into files';
-$string['savecontinue'] = 'Save and continue editing';
+$string['pluginname'] = 'Language customisation';
+$string['savecheckin'] = 'Save changes to the language pack';
+$string['savecontinue'] = 'Apply changes and continue editing';
index 6a0c8d2..73d07dc 100644 (file)
 /**
  * Unitest caps.
  *
- * @package    tool
- * @subpackage unittest
+ * @package    tool_unittest
  * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 $capabilities = array(
 
     // Note: do not add managers here, unittests are dangerous and not intended for production sites!!!
index bd3369c..9b1a9bd 100644 (file)
@@ -39,4 +39,5 @@ require_once($CFG->dirroot .'/backup/cc/cc_lib/cc_converter_url.php');
 require_once($CFG->dirroot .'/backup/cc/cc_lib/cc_converter_resource.php');
 require_once($CFG->dirroot .'/backup/cc/cc_lib/cc_converter_quiz.php');
 require_once($CFG->dirroot .'/backup/cc/cc_lib/cc_converter_page.php');
+require_once($CFG->dirroot .'/backup/cc/cc_lib/cc_converter_label.php');
 require_once($CFG->dirroot .'/backup/cc/cc_lib/cc_convert_moodle2.php');
index d3d7c7b..3e3af90 100644 (file)
@@ -1821,7 +1821,7 @@ class assesment1_resurce_file extends general_cc_file {
     }
 
     public function set_title($value) {
-        $this->assessment_title = $value;
+        $this->assessment_title = self::safexml($value);
     }
 
     protected function on_save() {
index 1e2881d..d31e0b8 100644 (file)
@@ -55,10 +55,10 @@ class basicltil1_resurce_file extends general_cc_file {
     protected $cartridge_icon = null;
 
     public function set_title($title) {
-        $this->title = $title;
+        $this->title = self::safexml($title);
     }
     public function set_description($description) {
-        $this->description = $description;
+        $this->description = self::safexml($description);
     }
     public function set_launch_url ($url) {
         $this->launch_url = $url;
@@ -77,11 +77,11 @@ class basicltil1_resurce_file extends general_cc_file {
         $this->vendor = true;
     }
     public function set_vendor_name ($name) {
-        $this->vendor_name = $name;
+        $this->vendor_name = self::safexml($name);
         $this->vendor = true;
     }
     public function set_vendor_description ($desc) {
-        $this->vendor_description = $desc;
+        $this->vendor_description = self::safexml($desc);
         $this->vendor = true;
     }
     public function set_vendor_url ($url) {
index ffdc342..5f6d9e4 100644 (file)
@@ -80,9 +80,17 @@ abstract class cc_convert_moodle2 {
             if ($docp->load($moodle_backup)) {
                 //sections
                 $sections = array();
+                $coursef = new XMLGenericDocument();
+                $course_file = $dir . DIRECTORY_SEPARATOR .'course' . DIRECTORY_SEPARATOR . 'course.xml';
+                $coursef->load($course_file);
+                $numsections = (int)$coursef->nodeValue('/course/numsections');
                 $section_list = $docp->nodeList('/moodle_backup/information/contents/sections/section');
                 if (!empty($section_list)) {
+                    $count = 0;
                     foreach ($section_list as $node) {
+                        if ($count > $numsections) {
+                            break;
+                        }
                         $sectionid    = $docp->nodeValue('sectionid', $node);
                         $sectiontitle = $docp->nodeValue('title'    , $node);
                         $sectionpath  = $docp->nodeValue('directory', $node);
@@ -92,7 +100,7 @@ abstract class cc_convert_moodle2 {
                         DIRECTORY_SEPARATOR .
                         $sectionpath .
                         DIRECTORY_SEPARATOR .
-                                            'section.xml';
+                        'section.xml';
                         if ($secp->load($section_file)) {
                             $rawvalue = $secp->nodeValue('/section/sequence');
                             if ($rawvalue != '$@NULL@$') {
@@ -100,6 +108,7 @@ abstract class cc_convert_moodle2 {
                             }
                         }
                         $sections[$sectionid] = array($sectiontitle, $sequence);
+                        $count++;
                     }
                 }
                 //organization title
diff --git a/backup/cc/cc_lib/cc_converter_label.php b/backup/cc/cc_lib/cc_converter_label.php
new file mode 100644 (file)
index 0000000..21a47ae
--- /dev/null
@@ -0,0 +1,39 @@
+<?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/>.
+/**
+ * @package    backup-convert
+ * @subpackage cc-library
+ * @copyright  2012 Darko Miletic <dmiletic@moodlerooms.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require_once 'cc_converters.php';
+require_once 'cc_general.php';
+
+class cc_converter_label extends cc_converter {
+
+    public function __construct(cc_i_item &$item, cc_i_manifest &$manifest, $rootpath, $path){
+        $this->defaultfile = 'label.xml';
+        parent::__construct($item, $manifest, $rootpath, $path);
+    }
+
+    public function convert($outdir) {
+        $resitem = new cc_item();
+        $resitem->title = $this->doc->nodeValue('/activity/label/name');
+        $this->item->add_child_item($resitem);
+        return true;
+    }
+}
\ No newline at end of file
index 27ec08e..81ec9c0 100644 (file)
@@ -37,11 +37,11 @@ class forum1_resurce_file extends general_cc_file {
     protected $attachments = array();
 
     public function set_title($title) {
-        $this->title = $title;
+        $this->title = self::safexml($title);
     }
 
     public function set_text($text, $type='text/plain') {
-        $this->text = $text;
+        $this->text = self::safexml($text);
         $this->text_type = $type;
     }
 
index 1da15a8..af9fd98 100644 (file)
@@ -35,11 +35,11 @@ class page11_resurce_file extends general_cc_file {
     }
 
     public function set_title($value) {
-        $this->title = $value;
+        $this->title = self::safexml($value);
     }
 
     public function set_intro($value) {
-        $this->intro = htmlspecialchars(strip_tags($value), ENT_COMPAT, 'UTF-8', false);
+        $this->intro = self::safexml(strip_tags($value));
     }
 
     protected function on_create() {
index 43b9ac6..eb34779 100644 (file)
@@ -183,20 +183,14 @@ class cc_resource implements cc_i_resource {
             throw new Exception('The file doesnt exist!');
         }
 
-        //TODO: ver el tema de fpatch con el tema de unix y windows
-        //$fpathtocheck = $this->adjust_path($manifestroot,$fname);
-        //!empty($fpathtocheck) &&
-        if (GetDepFiles($manifestroot, $fname, $this->folder, $this->files)) {
-            array_unshift($this->files,$folder.$fname);
-            $this->init_empty_new();
-            $this->href             = $folder.$fname;
-            $this->identifierref    = $folder.$fname;
-            $this->filename         = $fname;
-            $this->isempty          = false;
-            $this->folder           = $folder;
-        } else {
-            $this->init_clean();
-        }
+        GetDepFiles($manifestroot, $fname, $this->folder, $this->files);
+        array_unshift($this->files,$folder.$fname);
+        $this->init_empty_new();
+        $this->href             = $folder.$fname;
+        $this->identifierref    = $folder.$fname;
+        $this->filename         = $fname;
+        $this->isempty          = false;
+        $this->folder           = $folder;
     }
 
     public function adjust_path($mroot, $fname) {
index db68fa2..c117566 100644 (file)
@@ -44,7 +44,7 @@ class url1_resurce_file extends general_cc_file {
      * @param string $title
      */
     public function set_title($title) {
-        $this->title = htmlentities($title);
+        $this->title = self::safexml($title);
     }
 
     /**
index 69be684..c85cbe9 100644 (file)
@@ -41,6 +41,18 @@ class XMLGenericDocument {
     private   $is_html          = false;
 
 
+    /**
+    * @param string $value
+    * @return string
+    */
+    public static function safexml($value) {
+        $result = htmlspecialchars(html_entity_decode($value, ENT_QUOTES, 'UTF-8'),
+                                   ENT_NOQUOTES,
+                                   'UTF-8',
+                                   false);
+        return $result;
+    }
+
     function __construct($ch = 'UTF-8',$validatenow=true){
         $this->charset = $ch;
         $this->documentInit();
index f3a22b7..360dd63 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
- * @subpackage backup-moodle2
- * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines backup_activity_task class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
- * abstract activity task that provides all the properties and common tasks to be performed
- * when one activity is being backup
+ * Provides all the settings and steps to perform one complete backup of the activity
  *
- * TODO: Finish phpdocs
+ * Activities are supposed to provide the subclass of this class in their file
+ * mod/MODULENAME/backup/moodle2/backup_MODULENAME_activity_task.class.php
+ * The expected name of the subclass is backup_MODULENAME_activity_task
  */
 abstract class backup_activity_task extends backup_task {
 
@@ -38,6 +44,10 @@ abstract class backup_activity_task extends backup_task {
 
     /**
      * Constructor - instantiates one object of this class
+     *
+     * @param string $name the task identifier
+     * @param int $moduleid course module id (id in course_modules table)
+     * @param backup_plan|null $plan the backup plan instance this task is part of
      */
     public function __construct($name, $moduleid, $plan = null) {
 
@@ -59,28 +69,43 @@ abstract class backup_activity_task extends backup_task {
         parent::__construct($name, $plan);
     }
 
+    /**
+     * @return int the course module id (id in the course_modules table)
+     */
     public function get_moduleid() {
         return $this->moduleid;
     }
 
+    /**
+     * @return int the course section id (id in the course_sections table)
+     */
     public function get_sectionid() {
         return $this->sectionid;
     }
 
+    /**
+     * @return string the name of the module, eg 'workshop' (from the modules table)
+     */
     public function get_modulename() {
         return $this->modulename;
     }
 
+    /**
+     * @return int the id of the activity instance (id in the activity's instances table)
+     */
     public function get_activityid() {
         return $this->activityid;
     }
 
+    /**
+     * @return int the id of the associated CONTEXT_MODULE instance
+     */
     public function get_contextid() {
         return $this->contextid;
     }
 
     /**
-     * Activity tasks have their own directory to write files
+     * @return string full path to the directory where this task writes its files
      */
     public function get_taskbasepath() {
         return $this->get_basepath() . '/activities/' . $this->modulename . '_' . $this->moduleid;
@@ -184,9 +209,11 @@ abstract class backup_activity_task extends backup_task {
 
 
     /**
-     * Specialisation that, first of all, looks for the setting within
-     * the task with the the prefix added and later, delegates to parent
-     * without adding anything
+     * Tries to look for the instance specific setting value, task specific setting value or the
+     * common plan setting value - in that order
+     *
+     * @param string $name the name of the setting
+     * @return mixed|null the value of the setting or null if not found
      */
     public function get_setting($name) {
         $namewithprefix = $this->modulename . '_' . $this->moduleid . '_' . $name;
@@ -211,7 +238,7 @@ abstract class backup_activity_task extends backup_task {
 // Protected API starts here
 
     /**
-     * Define the common setting that any backup activity will have
+     * Defines the common setting that any backup activity will have
      */
     protected function define_settings() {
 
@@ -264,21 +291,44 @@ abstract class backup_activity_task extends backup_task {
     }
 
     /**
-     * Define (add) particular settings that each activity can have
+     * Defines activity specific settings to be added to the common ones
+     *
+     * This method is called from {@link self::define_settings()}. The activity module
+     * author may use it to define additional settings that influence the execution of
+     * the backup.
+     *
+     * Most activities just leave the method empty.
+     *
+     * @see self::define_settings() for the example how to define own settings
      */
     abstract protected function define_my_settings();
 
     /**
-     * Define (add) particular steps that each activity can have
+     * Defines activity specific steps for this task
+     *
+     * This method is called from {@link self::build()}. Activities are supposed
+     * to call {self::add_step()} in it to include their specific steps in the
+     * backup plan.
      */
     abstract protected function define_my_steps();
 
     /**
-     * Code the transformations to perform in the activity in
-     * order to get transportable (encoded) links
+     * Encodes URLs to the activity instance's scripts into a site-independent form
+     *
+     * The current instance of the activity may be referenced from other places in
+     * the course by URLs like http://my.moodle.site/mod/workshop/view.php?id=42
+     * Obvisouly, such URLs are not valid any more once the course is restored elsewhere.
+     * For this reason the backup file does not store the original URLs but encodes them
+     * into a transportable form. During the restore, the reverse process is applied and
+     * the encoded URLs are replaced with the new ones valid for the target site.
+     *
+     * Every plugin must override this method in its subclass.
+     *
+     * @see backup_xml_transformer class that actually runs the transformation
+     * @param string $content some HTML text that eventually contains URLs to the activity instance scripts
+     * @return string the content with the URLs encoded
      */
     static public function encode_content_links($content) {
         throw new coding_exception('encode_content_links() method needs to be overridden in each subclass of backup_activity_task');
     }
-
 }
index 7d3f26e..91e0253 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
- * @subpackage backup-moodle2
- * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * abstract block task that provides all the properties and common steps to be performed
  * when one block is being backup
index 070506c..8c35274 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
- * @subpackage backup-moodle2
- * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines backup_course_task
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
index 8d89b31..ceab083 100644 (file)
@@ -24,10 +24,11 @@ defined('MOODLE_INTERNAL') || die();
  * backed up, a course report should make use of the second and third
  * parameters in get_plugin_element().
  *
- * @package    moodlecore
- * @subpackage backup-moodle2
- * @copyright  2011 onwards The Open University
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2011 onwards The Open University
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 abstract class backup_coursereport_plugin extends backup_plugin {
     // Use default parent behaviour
index d899a65..e0ceb33 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package    moodlecore
- * @subpackage backup-moodle2
- * @copyright  2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines various element classes used in specific areas
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * Implementation of backup_final_element that provides one interceptor for anonymization of data
  *
index b3f5eae..4b12633 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
- * @subpackage backup-moodle2
- * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines backup_default_block_task class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * Default block task to backup blocks that haven't own DB structures to be added
  * when one block is being backup
index 78bab3c..b9f7251 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
- * @subpackage backup-moodle2
- * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines backup_final_task class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * Final task that provides all the final steps necessary in order to finish one
  * backup (mainly gathering references and creating the main xml) apart from
index d1af1b9..978c69a 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package    moodlecore
- * @subpackage backup-moodle2
- * @copyright  2011 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines backup_format_plugin class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2011 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * Class extending standard backup_plugin in order to implement some
  * helper methods related with the course formats (format plugin)
index a06412a..7fd4029 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package    core
- * @subpackage backup-moodle2
- * @copyright  2011 David Mudrak <david@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines backup_gradingform_plugin class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2011 David Mudrak <david@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();
@@ -28,5 +31,4 @@ defined('MOODLE_INTERNAL') || die();
  * Base class for all advanced grading form plugins
  */
 abstract class backup_gradingform_plugin extends backup_plugin {
-
 }
index 17a1d23..86b3cc2 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package    moodlecore
- * @subpackage backup-moodle2
- * @copyright  2011 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines backup_plagiarism_plugin class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2011 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * Class extending standard backup_plugin in order to implement some
  * helper methods related with the plagiarism plugins (plagiarism plugin)
index 053d77d..d7a1f0a 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
- * @subpackage backup-moodle2
- * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines backup_plan_builder class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();
@@ -123,12 +126,23 @@ abstract class backup_plan_builder {
 
         // Add the activity task, responsible for outputting
         // all the module related information
-        $plan->add_task(backup_factory::get_backup_activity_task($controller->get_format(), $id));
-
-        // For the given activity, add as many block tasks as necessary
-        $blockids = backup_plan_dbops::get_blockids_from_moduleid($id);
-        foreach ($blockids as $blockid) {
-            $plan->add_task(backup_factory::get_backup_block_task($controller->get_format(), $blockid, $id));
+        try {
+            $plan->add_task(backup_factory::get_backup_activity_task($controller->get_format(), $id));
+
+            // For the given activity, add as many block tasks as necessary
+            $blockids = backup_plan_dbops::get_blockids_from_moduleid($id);
+            foreach ($blockids as $blockid) {
+                try {
+                    $plan->add_task(backup_factory::get_backup_block_task($controller->get_format(), $blockid, $id));
+                } catch (backup_task_exception $e) {
+                    $a = stdClass();
+                    $a->mid = $id;
+                    $a->bid = $blockid;
+                    $controller->log(get_string('error_block_for_module_not_found', 'backup', $a), backup::LOG_WARNING);
+                }
+            }
+        } catch (backup_task_exception $e) {
+            $controller->log(get_string('error_course_module_not_found', 'backup', $id), backup::LOG_WARNING);
         }
     }
 
index da0abfa..6a060ab 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package    moodlecore
- * @subpackage backup-moodle2
- * @copyright  2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines backup_plugin class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * Class implementing the plugins support for moodle2 backups
  *
index 5d940c5..c6839a7 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package    moodlecore
- * @subpackage backup-moodle2
- * @copyright  2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines backup_qtype_plugin class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * Class extending standard backup_plugin in order to implement some
  * helper methods related with the questions (qtype plugin)
index fbc2174..8f2b34f 100644 (file)
@@ -24,10 +24,11 @@ defined('MOODLE_INTERNAL') || die();
  * backed up, a report should make use of the second and third
  * parameters in get_plugin_element().
  *
- * @package    moodlecore
- * @subpackage backup-moodle2
- * @copyright  2011 Petr Skoda
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2011 Petr Skoda
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 abstract class backup_report_plugin extends backup_plugin {
     // Use default parent behaviour
index af710e1..fc65242 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
- * @subpackage backup-moodle2
- * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines backup_root_task class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * Start task that provides all the settings common to all backups and some initialization steps
  *
index 8986d8c..ab4b4c8 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
- * @subpackage backup-moodle2
- * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines backup_section_task class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * section task that provides all the properties and common steps to be performed
  * when one section is being backup
index 6614aee..fe39f2c 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
- * @subpackage backup-moodle2
- * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines classes used to handle backup settings
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 // TODO: Reduce these to the minimum because ui/dependencies are 100% separated
@@ -36,6 +39,15 @@ class backup_generic_setting extends root_backup_setting {}
  */
 class backup_filename_setting extends backup_generic_setting {
 
+    /**
+     * Instantiates a setting object
+     *
+     * @param string $name Name of the setting
+     * @param string $vtype Type of the setting, eg {@link base_setting::IS_TEXT}
+     * @param mixed $value Value of the setting
+     * @param bool $visibility Is the setting visible in the UI, eg {@link base_setting::VISIBLE}
+     * @param int $status Status of the setting with regards to the locking, eg {@link base_setting::NOT_LOCKED}
+     */
     public function __construct($name, $vtype, $value = null, $visibility = self::VISIBLE, $status = self::NOT_LOCKED) {
         parent::__construct($name, $vtype, $value, $visibility, $status);
     }
index 8454934..b87e3cc 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
- * @subpackage backup-moodle2
- * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines various backup steps that will be used by common tasks in backup
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-/**
- * Define all the backup steps that will be used by common tasks in backup
- */
+defined('MOODLE_INTERNAL') || die();
 
 /**
  * create the temp dir where backup/restore will happen,
@@ -98,6 +99,7 @@ abstract class backup_activity_structure_step extends backup_structure_step {
      *                                       we are going to add subplugin information to
      * @param bool $multiple to define if multiple subplugins can produce information
      *                       for each instance of $element (true) or no (false)
+     * @return void
      */
     protected function add_subplugin_structure($subplugintype, $element, $multiple) {
 
@@ -135,6 +137,8 @@ abstract class backup_activity_structure_step extends backup_structure_step {
     /**
      * As far as activity backup steps are implementing backup_subplugin stuff, they need to
      * have the parent task available for wrapping purposes (get course/context....)
+     *
+     * @return backup_activity_task
      */
     public function get_task() {
         return $this->task;
@@ -143,6 +147,9 @@ abstract class backup_activity_structure_step extends backup_structure_step {
     /**
      * Wraps any activity backup structure within the common 'activity' element
      * that will include common to all activities information like id, context...
+     *
+     * @param backup_nested_element $activitystructure the element to wrap
+     * @return backup_nested_element the $activitystructure wrapped by the common 'activity' element
      */
     protected function prepare_activity_structure($activitystructure) {
 
index ca3e953..7cb30e3 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package    moodlecore
- * @subpackage backup-moodle2
- * @copyright  2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines backup_subplugin class
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * Class implementing the subplugins support for moodle2 backups
  *
index d4a3a09..7978c52 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package    moodlecore
- * @subpackage backup-moodle2
- * @copyright  2011 onwards The Open University
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines backup_theme_plugin class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2011 onwards The Open University
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * Base class for theme backup plugins.
  *
index f0be3cd..a3770d0 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package    moodlecore
- * @subpackage backup-moodle2
- * @copyright  2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines backup_xml_transformer class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * Class implementing the @xml_contenttrasnformed logic to be applied in moodle2 backups
  *
index 50f305d..4872fc0 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
- * @subpackage backup-moodle2
- * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines restore_activity_task class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * abstract activity task that provides all the properties and common tasks to be performed
  * when one activity is being restored
index d4715d7..64e5b99 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
- * @subpackage backup-moodle2
- * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines restore_block_task class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * abstract block task that provides all the properties and common steps to be performed
  * when one block is being restored
index 1ab98bf..87828b4 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
- * @subpackage backup-moodle2
- * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines restore_course_task class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * course task that provides all the properties and common steps to be performed
  * when one course is being restored
index 9a94e23..af0ebb0 100644 (file)
@@ -19,10 +19,11 @@ defined('MOODLE_INTERNAL') || die();
 /**
  * Restore for course plugin: course report.
  *
- * @package    moodlecore
- * @subpackage backup-moodle2
- * @copyright 2011 The Open University
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2011 The Open University
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 abstract class restore_coursereport_plugin extends restore_plugin {
     // Use default parent behaviour
index c3267a2..78c3577 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
- * @subpackage backup-moodle2
- * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines restore_default_block_task class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * Default block task to restore blocks not having own DB structures to be added
  *
index cebf2ea..09a9db3 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
- * @subpackage backup-moodle2
- * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines restore_final_task class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * Final task that provides all the final steps necessary in order to finish one
  * restore like gradebook, interlinks... apart from some final cleaning
index 454d3a8..ce7f030 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package    moodlecore
- * @subpackage backup-moodle2
- * @copyright  2011 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines restore_format_plugin class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2011 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * Class extending standard restore_plugin in order to implement some
  * helper methods related with the course formats (format plugin)
index ff7f998..6caa7dc 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package    core
- * @subpackage backup-moodle2
- * @copyright  2011 David Mudrak <david@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines restore_gradingform_plugin class
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2011 David Mudrak <david@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();
index 039d117..6b80a41 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package    moodlecore
- * @subpackage backup-moodle2
- * @copyright  2011 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines restore_plagiarism_plugin class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2011 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * Class extending standard restore_plugin in order to implement some
  * helper methods related with the plagiarism plugins
index 22511ce..faf4a12 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
- * @subpackage backup-moodle2
- * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines restore_plan_builder class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();
index 5ed177e..d85790b 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package    moodlecore
- * @subpackage backup-moodle2
- * @copyright  2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines restore_plugin class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * Class implementing the plugins support for moodle2 restore
  *
index 42c6c1d..40b06ac 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package    moodlecore
- * @subpackage backup-moodle2
- * @copyright  2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines restore_qtype_plugin class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * Class extending standard restore_plugin in order to implement some
  * helper methods related with the questions (qtype plugin)
index 7db2151..bc42c89 100644 (file)
@@ -19,10 +19,11 @@ defined('MOODLE_INTERNAL') || die();
 /**
  * Restore for plugin report.
  *
- * @package    moodlecore
- * @subpackage backup-moodle2
- * @copyright  2011 Petr Skoda
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2011 Petr Skoda
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 abstract class restore_report_plugin extends restore_plugin {
     // Use default parent behaviour
index a5163e9..ac3f81d 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
- * @subpackage backup-moodle2
- * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines restore_root_task class
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * Start task that provides all the settings common to all restores and other initial steps
  *
index 5c03bcb..4efd4e8 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
- * @subpackage backup-moodle2
- * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines restore_section_task class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * section task that provides all the properties and common steps to be performed
  * when one section is being restored
index 6d8b162..6be3cc2 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
- * @subpackage backup-moodle2
- * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines classes used to handle restore settings
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 // TODO: Reduce these to the minimum because ui/dependencies are 100% separated
 
 // Root restore settings
index 2aebdcf..e62129b 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
- * @subpackage backup-moodle2
- * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines various restore steps that will be used by common tasks in restore
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-/**
- * Define all the restore steps that will be used by common tasks in restore
- */
+defined('MOODLE_INTERNAL') || die();
 
 /**
  * delete old directories and conditionally create backup_temp_ids table
@@ -1124,6 +1125,12 @@ class restore_course_structure_step extends restore_structure_step {
             unset($data->idnumber);
         }
 
+        // Any empty value for course->hiddensections will lead to 0 (default, show collapsed).
+        // It has been reported that some old 1.9 courses may have it null leading to DB error. MDL-31532
+        if (empty($data->hiddensections)) {
+            $data->hiddensections = 0;
+        }
+
         // Only restrict modules if original course was and target site too for new courses
         $data->restrictmodules = $data->restrictmodules && !empty($CFG->restrictmodulesfor) && $CFG->restrictmodulesfor == 'all';
 
index 8972e35..bf21779 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package    moodlecore
- * @subpackage backup-moodle2
- * @copyright  2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines restore_subplugin class
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * Class implementing the subplugins support for moodle2 restore
  *
index 8493194..1935d44 100644 (file)
@@ -19,10 +19,11 @@ defined('MOODLE_INTERNAL') || die();
 /**
  * Restore for course plugin: theme.
  *
- * @package    moodlecore
- * @subpackage backup-moodle2
- * @copyright 2011 The Open University
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2011 The Open University
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 abstract class restore_theme_plugin extends restore_plugin {
     // Use default parent behaviour
index 2d19245..8b6c3f0 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package    moodlecore
- * @subpackage backup-settings
- * @copyright  2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines backup_setting class
+ *
+ * @package     core_backup
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
- * This abstract class defines one backup_setting
- *
- * TODO: Finish phpdocs
+ * Parent class for all backup settings
  */
 abstract class backup_setting extends base_setting implements checksumable {
 
@@ -35,12 +37,12 @@ abstract class backup_setting extends base_setting implements checksumable {
     const SECTION_LEVEL  = 9;
     const ACTIVITY_LEVEL = 13;
 
+    /** @var int Level of the setting, eg {@link self::ROOT_LEVEL} */
+    protected $level;
+
     /**
-     * One of the above constants
-     * @var {int}
+     * {@inheritdoc}
      */
-    protected $level;  // level of the setting
-
     public function __construct($name, $vtype, $value = null, $visibility = self::VISIBLE, $status = self::NOT_LOCKED) {
         parent::__construct($name, $vtype, $value, $visibility, $status);
         // Generate a default ui
@@ -48,9 +50,7 @@ abstract class backup_setting extends base_setting implements checksumable {
     }
 
     /**
-     * Returns the level of the setting
-     *
-     * @return {int} One of the above constants
+     * @return int Level of the setting, eg {@link self::ROOT_LEVEL}
      */
     public function get_level() {
         return $this->level;
@@ -112,7 +112,7 @@ abstract class backup_setting extends base_setting implements checksumable {
     }
 }
 
-/*
+/**
  * Exception class used by all the @backup_setting stuff
  */
 class backup_setting_exception extends base_setting_exception {
index 82e6eb1..558b0c2 100644 (file)
@@ -86,6 +86,15 @@ abstract class base_setting {
      */
     protected $help = array();
 
+    /**
+     * Instantiates a setting object
+     *
+     * @param string $name Name of the setting
+     * @param string $vtype Type of the setting, eg {@link self::IS_TEXT}
+     * @param mixed $value Value of the setting
+     * @param bool $visibility Is the setting visible in the UI, eg {@link self::VISIBLE}
+     * @param int $status Status of the setting with regards to the locking, eg {@link self::NOT_LOCKED}
+     */
     public function __construct($name, $vtype, $value = null, $visibility = self::VISIBLE, $status = self::NOT_LOCKED) {
         // Check vtype
         if ($vtype !== self::IS_BOOLEAN && $vtype !== self::IS_INTEGER &&
index 62a0f17..7b459e6 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package    moodlecore
- * @subpackage backup-settings
- * @copyright  2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Defines root_backup_setting class
+ *
+ * @package     core_backup
+ * @category    backup
+ * @copyright   2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
 /**
  * Abstract class containing all the common stuff for root backup settings
- *
- * TODO: Finish phpdocs
  */
 abstract class root_backup_setting extends backup_setting {
 
+    /**
+     * {@inheritdoc}
+     */
     public function __construct($name, $vtype, $value = null, $visibility = self::VISIBLE, $status = self::NOT_LOCKED) {
         $this->level = self::ROOT_LEVEL;
         parent::__construct($name, $vtype, $value, $visibility, $status);
index 74e4bcd..dbd9e07 100644 (file)
@@ -110,6 +110,9 @@ if ($usercandownload and $download != -1 and !empty($downloadcourseid) and confi
     $sizeinfo->total = number_format($backupsize / 1000000, 2);
     echo html_writer::tag('div', get_string('downloadingsize', 'block_community', $sizeinfo),
             array('class' => 'textinfo'));
+    if (ob_get_level()) {
+        ob_flush();
+    }
     flush();
     $filenames = $communitymanager->block_community_download_course_backup($course);
     echo html_writer::tag('div', get_string('downloaded', 'block_community'),
@@ -125,7 +128,7 @@ if ($usercandownload and $download != -1 and !empty($downloadcourseid) and confi
 $remove = optional_param('remove', '', PARAM_INTEGER);
 $communityid = optional_param('communityid', '', PARAM_INTEGER);
 if ($remove != -1 and !empty($communityid) and confirm_sesskey()) {
-    $communitymanager->block_community_remove_course($communityid, $USER->id); 
+    $communitymanager->block_community_remove_course($communityid, $USER->id);
     echo $OUTPUT->header();
     echo $renderer->remove_success(new moodle_url(get_referer(false)));
     echo $OUTPUT->footer();
@@ -242,4 +245,4 @@ if (!empty($courses)) {
     }
 }
 
-echo $OUTPUT->footer();
\ No newline at end of file
+echo $OUTPUT->footer();
index f76088f..5c39f75 100644 (file)
@@ -82,7 +82,7 @@ class block_community_manager {
         global $CFG, $USER;
         require_once($CFG->libdir . "/filelib.php");
         require_once($CFG->dirroot. "/course/publish/lib.php");
-             
+
         $params['courseid'] = $course->id;
         $params['filetype'] = HUB_BACKUP_FILE_TYPE;
 
@@ -104,7 +104,7 @@ class block_community_manager {
             $token = $registeredhub->token;
             $curlurl .= '&token='.$token;
         }
-        
+
         $ch = curl_init($curlurl);
         curl_setopt($ch, CURLOPT_FILE, $fp);
         $data = curl_exec($ch);
@@ -143,4 +143,4 @@ class block_community_manager {
                 array('userid' => $userid, 'id' => $communityid));
     }
 
-}
\ No newline at end of file
+}
index 1df8f82..4fb6c50 100644 (file)
@@ -124,7 +124,7 @@ class block_community_renderer extends plugin_renderer_base {
                 //create title html
                 $coursename = html_writer::tag('h3', $course->fullname,
                                 array('class' => 'hubcoursetitle'));
-                $coursenamehtml = html_writer::tag('div', $coursename, 
+                $coursenamehtml = html_writer::tag('div', $coursename,
                         array('class' => 'hubcoursetitlepanel'));
 
                 // create screenshots html
index 4671ad2..f91abb0 100644 (file)
@@ -44,12 +44,12 @@ YUI.add('moodle-block_community-imagegallery', function(Y) {
 
             this.overlay.render();
             this.overlay.hide();
-           
+
             //attach a show event on the image divs (<tag id='image-X'>)
             for (var i=0;i<this.get('imageids').length;i++)
             {
                 var imageid = this.get('imageids')[i];
-                this.imageidnumbers[imageid] = this.get('imagenumbers')[i];              
+                this.imageidnumbers[imageid] = this.get('imagenumbers')[i];
                 Y.one('#image-'+imageid).on('click', this.show, this, imageid, 1);
             }
 
@@ -60,9 +60,9 @@ YUI.add('moodle-block_community-imagegallery', function(Y) {
             if (this.imageloadingevent != null) {
                 this.imageloadingevent.detach();
             }
-            
+
             var url = this.get('huburl') + "/local/hub/webservice/download.php?courseid="
-            + imageid + "&filetype=screenshot&imagewidth=original&screenshotnumber=" + screennumber;  
+            + imageid + "&filetype=screenshot&imagewidth=original&screenshotnumber=" + screennumber;
 
             /// set the mask
             if (this.get('maskNode')) {
@@ -88,17 +88,17 @@ YUI.add('moodle-block_community-imagegallery', function(Y) {
             var overlaytitle = Y.one('#imagetitleoverlay');
             var previousimagelink = "<div id=\"previousarrow\" class=\"imagearrow\">←</div>";
             var nextimagelink = "<div id=\"nextarrow\" class=\"imagearrow\">→</div>";
-           
+
             /// need to load the images in the overlay
             var overlay = Y.one('#imageoverlay');
             overlay.setContent('');
-          
+
 
             overlay.append(Y.Node.create('<div style="text-align:center"><img id=\"imagetodisplay\" src="' + url
                 + '" style="max-height:' + maxheight + 'px;"></div>'));
             this.overlay.destroy();
             this.overlay = new M.core.dialogue({
-                headerContent:previousimagelink + '<div id=\"imagenumber\" class=\"imagetitle\"> Image ' 
+                headerContent:previousimagelink + '<div id=\"imagenumber\" class=\"imagetitle\"> Image '
                 + screennumber + ' / ' + this.imageidnumbers[imageid] + ' </div>' + nextimagelink,
                 bodyContent:Y.one('#imageoverlay').get('innerHTML'),
                 visible: false, //by default it is not displayed
@@ -127,7 +127,7 @@ YUI.add('moodle-block_community-imagegallery', function(Y) {
                 if(overlaywidth > screenshot.width) {
                     overlaywidth = screenshot.width;
                 }
-                
+
                 this.overlay.set('width', overlaywidth);
                 this.overlay.set("centered", true);
                 this.overlay.show();
@@ -196,4 +196,4 @@ YUI.add('moodle-block_community-imagegallery', function(Y) {
 
 }, '@VERSION@', {
     requires:['base','node','overlay', 'moodle-enrol-notification']
-});
\ No newline at end of file
+});
index 7013b12..07a7b47 100644 (file)
@@ -36,7 +36,7 @@ require_once($CFG->libdir.'/completionlib.php');
 class block_completionstatus extends block_base {
 
     public function init() {
-        $this->title   = get_string('completionstatus', 'block_completionstatus');
+        $this->title   = get_string('pluginname', 'block_completionstatus');
     }
 
     public function get_content() {
index 50bea4e..fcc965a 100644 (file)
@@ -1,7 +1,6 @@
 <?php
 
 $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';
index 3c773a6..282f9e2 100644 (file)
@@ -4,7 +4,7 @@ include_once($CFG->dirroot . '/course/lib.php');
 
 class block_course_list extends block_list {
     function init() {
-        $this->title = get_string('courses');
+        $this->title = get_string('pluginname', 'block_course_list');
     }
 
     function has_config() {
index a30a5c0..4e79fc1 100644 (file)
@@ -29,4 +29,4 @@ $string['configadminview'] = 'What should the admin see in the course list block
 $string['confighideallcourseslink'] = 'Hide "All courses" link at the bottom of the block. Link hiding does not affects Admin\'s view';
 $string['hideallcourseslink'] = 'Hide All courses link';
 $string['owncourses'] = 'Admin user sees own courses';
-$string['pluginname'] = 'Course list';
+$string['pluginname'] = 'Courses';
index 5128c65..5560a32 100644 (file)
@@ -478,7 +478,7 @@ M.core_dock.delayEvent = function(event, options, target) {
  */
 M.core_dock.fixTitleOrientation = function(item, title, text) {
     var Y = this.Y;
-    
+
     var title = Y.one(title);
 
     if(M.core_dock.cfg.orientation != 'vertical') {
@@ -539,6 +539,7 @@ M.core_dock.fixTitleOrientation = function(item, title, text) {
     svg.appendChild(txt);
 
     title.append(svg);
+    title.append(Y.Node.create('<span class="accesshide">'+text+'</span>'));
 
     item.on('dockeditem:drawcomplete', function(txt, title){
         txt.setAttribute('fill', Y.one(title).getStyle('color'));
@@ -808,7 +809,7 @@ M.core_dock.genericblock.prototype = {
      */
     initialise_block : function(Y, node) {
         M.core_dock.init(Y);
-        
+
         this.Y = Y;
         if (!node) {
             return false;
@@ -918,7 +919,7 @@ M.core_dock.genericblock.prototype = {
         // Register an event so that when it is removed we can put it back as a block
         dockitem.on('dockeditem:itemremoved', this.return_to_block, this, dockitem);
         dock.add(dockitem);
-        
+
         if (!this.skipsetposition) {
             // save the users preference
             M.util.set_user_preference('docked_block_instance_'+this.id, 1);
index 4d8fc11..17d98ce 100644 (file)
 /**
  * Form for editing HTML block instances.
  *
- * @package   block_html
  * @copyright 2010 Petr Skoda (http://skodak.org)
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   block_html
+ * @category  files
+ * @param stdClass $course course object
+ * @param stdClass $birecord_or_cm block instance record
+ * @param stdClass $context context object
+ * @param string $filearea file area
+ * @param array $args extra arguments
+ * @param bool $forcedownload whether or not force download
+ * @return bool
  */
-
 function block_html_pluginfile($course, $birecord_or_cm, $context, $filearea, $args, $forcedownload) {
     global $SCRIPT;
 
@@ -79,4 +86,4 @@ function block_html_global_db_replace($search, $replace) {
         }
     }
     $instances->close();
-}
\ No newline at end of file
+}
index 8bfa9b7..2d03518 100644 (file)
@@ -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
@@ -19,8 +18,8 @@
  * This file contains classes used to manage the navigation structures in Moodle
  * and was introduced as part of the changes occuring in Moodle 2.0
  *
- * @since 2.0
- * @package blocks
+ * @since     2.0
+ * @package   block_navigation
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
  *
  * Used to produce the global navigation block new to Moodle 2.0
  *
- * @package blocks
+ * @package   block_navigation
+ * @category  navigation
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class block_navigation extends block_base {
 
-    /** @var int */
+    /** @var int This allows for multiple navigation trees */
     public static $navcount;
-    /** @var string */
+    /** @var string The name of the block */
     public $blockname = null;
-    /** @var bool */
+    /** @var bool A switch to indicate whether content has been generated or not. */
     protected $contentgenerated = false;
-    /** @var bool|null */
+    /** @var bool|null variable for checking if the block is docked*/
     protected $docked = null;
 
     /** @var int Trim characters from the right */
@@ -63,7 +63,7 @@ class block_navigation extends block_base {
 
     /**
      * All multiple instances of this block
-     * @return bool Returns true
+     * @return bool Returns false
      */
     function instance_allow_multiple() {
         return false;
@@ -95,10 +95,18 @@ class block_navigation extends block_base {
         return false;
     }
 
+    /**
+     * Find out if an instance can be docked.
+     *
+     * @return bool true or false depending on whether the instance can be docked or not.
+     */
     function instance_can_be_docked() {
         return (parent::instance_can_be_docked() && (empty($this->config->enabledock) || $this->config->enabledock=='yes'));
     }
 
+    /**
+     * Gets Javascript that may be required for navigation
+     */
     function get_required_javascript() {
         global $CFG;
         user_preference_allow_ajax_update('docked_block_instance_'.$this->instance->id, PARAM_INT);
@@ -124,6 +132,8 @@ class block_navigation extends block_base {
 
     /**
      * Gets the content for this block by grabbing it from $this->page
+     *
+     * @return object $this->content
      */
     function get_content() {
         global $CFG, $OUTPUT;
@@ -134,7 +144,7 @@ class block_navigation extends block_base {
         // JS for navigation moved to the standard theme, the code will probably have to depend on the actual page structure
         // $this->page->requires->js('/lib/javascript-navigation.js');
         // Navcount is used to allow us to have multiple trees although I dont' know why
-        // you would want to trees the same
+        // you would want two trees the same
 
         block_navigation::$navcount++;
 
@@ -192,7 +202,7 @@ class block_navigation extends block_base {
 
         $options = array();
         $options['linkcategories'] = (!empty($this->config->linkcategories) && $this->config->linkcategories == 'yes');
-        
+
         // Grab the items to display
         $renderer = $this->page->get_renderer('block_navigation');
         $this->content = new stdClass();
@@ -208,10 +218,10 @@ class block_navigation extends block_base {
      * Returns the attributes to set for this block
      *
      * This function returns an array of HTML attributes for this block including
-     * the defaults
-     * {@link block_tree->html_attributes()} is used to get the default arguments
+     * the defaults.
+     * {@link block_tree::html_attributes()} is used to get the default arguments
      * and then we check whether the user has enabled hover expansion and add the
-     * appropriate hover class if it has
+     * appropriate hover class if it has.
      *
      * @return array An array of HTML attributes
      */
@@ -227,6 +237,7 @@ class block_navigation extends block_base {
      * Trims the text and shorttext properties of this node and optionally
      * all of its children.
      *
+     * @param navigation_node $node
      * @param int $mode One of navigation_node::TRIM_*
      * @param int $long The length to trim text to
      * @param int $short The length to trim shorttext to
index 0d36b6b..3134e59 100644 (file)
@@ -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
@@ -18,8 +17,8 @@
 /**
  * Form for editing global navigation instances.
  *
- * @since 2.0
- * @package blocks
+ * @since     2.0
+ * @package   block_navigation
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -27,7 +26,8 @@
 /**
  * Form for editing global navigation instances.
  *
- * @package blocks
+ * @package   block_navigation
+ * @category  navigation
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
index b62d4db..fe91aed 100644 (file)
@@ -1,7 +1,45 @@
 <?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/>.
 
+/**
+ * Outputs the navigation tree.
+ *
+ * @since     2.0
+ * @package   block_navigation
+ * @copyright 2009 Sam Hemelryk
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+/**
+ * Renderer for block navigation
+ *
+ * @package   block_navigation
+ * @category  navigation
+ * @copyright 2009 Sam Hemelryk
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 class block_navigation_renderer extends plugin_renderer_base {
-    
+    /**
+     * Returns the content of the navigation tree.
+     *
+     * @param global_navigation $navigation
+     * @param int $expansionlimit
+     * @param array $options
+     * @return string $content
+     */
     public function navigation_tree(global_navigation $navigation, $expansionlimit, array $options = array()) {
         $navigation->add_class('navigation_node');
         $content = $this->navigation_node(array($navigation), array('class'=>'block_tree list'), $expansionlimit, $options);
@@ -10,7 +48,16 @@ class block_navigation_renderer extends plugin_renderer_base {
         }
         return $content;
     }
-
+    /**
+     * Produces a navigation node for the navigation tree
+     *
+     * @param array $items
+     * @param array $attrs
+     * @param int $expansionlimit
+     * @param array $options
+     * @param int $depth
+     * @return string
+     */
     protected function navigation_node($items, $attrs=array(), $expansionlimit=null, array $options = array(), $depth=1) {
 
         // exit if empty, we don't want an empty ul element
@@ -116,4 +163,4 @@ class block_navigation_renderer extends plugin_renderer_base {
         }
     }
 
-}
\ No newline at end of file
+}
index 3d5bf5e..fee1d15 100644 (file)
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage navigation
+ * @package    block_navigation
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
index d042fac..ff00c60 100644 (file)
@@ -1,27 +1,28 @@
 <?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/>.
 
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program 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 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program 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:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
+/**
+ * Online users block caps.
+ *
+ * @package    block_online_users
+ * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
 
 $capabilities = array(
 
index 5779210..deeeb7d 100644 (file)
@@ -19,10 +19,13 @@ class block_participants extends block_list {
         $this->content->icons = array();
         $this->content->footer = '';
 
-        /// MDL-13252 Always get the course context or else the context may be incorrect in the user/index.php
-        $currentcontext = $this->page->context;
+        // user/index.php expect course context, so get one if page has module context.
+        $currentcontext = $this->page->context->get_course_context(false);
 
-        if ($this->page->course->id == SITEID) {
+        if (empty($currentcontext)) {
+            $this->content = '';
+            return $this->content;
+        } else if ($this->page->course->id == SITEID) {
             if (!has_capability('moodle/site:viewparticipants', get_context_instance(CONTEXT_SYSTEM))) {
                 $this->content = '';
                 return $this->content;
@@ -33,6 +36,7 @@ class block_participants extends block_list {
                 return $this->content;
             }
         }
+
         $icon = '<img src="'.$OUTPUT->pix_url('i/users') . '" class="icon" alt="" />&nbsp;';
         $this->content->items[] = '<a title="'.get_string('listofallpeople').'" href="'.
                                   $CFG->wwwroot.'/user/index.php?contextid='.$currentcontext->id.'">'.$icon.get_string('participants').'</a>';
@@ -46,5 +50,3 @@ class block_participants extends block_list {
     }
 
 }
-
-
index 32e1282..594f276 100644 (file)
@@ -27,7 +27,7 @@
 class block_private_files extends block_base {
 
     function init() {
-        $this->title = get_string('myfiles');
+        $this->title = get_string('pluginname', 'block_private_files');
     }
 
     function specialization() {
index f13e21f..e3970e6 100644 (file)
@@ -24,5 +24,5 @@
  */
 
 $string['managemyfiles'] = 'Manage my files';
-$string['pluginname'] = 'User private files';
+$string['pluginname'] = 'My private files';
 $string['privatefiles'] = 'Private files';
index 8ca1504..a3aa511 100644 (file)
@@ -26,7 +26,7 @@
  class block_rss_client extends block_base {
 
     function init() {
-        $this->title = get_string('feedstitle', 'block_rss_client');
+        $this->title = get_string('pluginname', 'block_rss_client');
     }
 
     function preferred_width() {
index 45cbf74..6eeb862 100644 (file)
@@ -1,32 +1,28 @@
 <?php
-//
-// Capability definitions for the rss_client block.
-//
-// The capabilities are loaded into the database table when the block is
-// installed or updated. Whenever the capability definitions are updated,
-// the module version number should be bumped up.
-//
-// The system has four possible values for a capability:
-// CAP_ALLOW, CAP_PREVENT, CAP_PROHIBIT, and inherit (not set).
-//
-//
-// CAPABILITY NAMING CONVENTION
-//
-// It is important that capability names are unique. The naming convention
-// for capabilities that are specific to modules and blocks is as follows:
-//   [mod/block]/<plugin_name>:<capabilityname>
-//
-// component_name should be the same as the directory name of the mod or block.
-//
-// Core moodle capabilities are defined thus:
-//    moodle/<capabilityclass>:<capabilityname>
-//
-// Examples: mod/forum:viewpost
-//           block/recent_activity:view
-//           moodle/site:deleteuser
-//
-// The variable name for the capability definitions array is $capabilities
-
+// 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/>.
+
+/**
+ * RSS client block caps.
+ *
+ * @package    block_rss_client
+ * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
 
 $capabilities = array(
 
index 5711917..d25e090 100644 (file)
@@ -220,7 +220,7 @@ if ($mform->is_cancelled()) {
 
     $settingsurl = new moodle_url('/admin/settings.php?section=blocksettingrss_client');
     $PAGE->navbar->add(get_string('blocks'));
-    $PAGE->navbar->add(get_string('feedstitle', 'block_rss_client'), $settingsurl);
+    $PAGE->navbar->add(get_string('pluginname', 'block_rss_client'), $settingsurl);
     $PAGE->navbar->add(get_string('managefeeds', 'block_rss_client'));
     $PAGE->navbar->add($strtitle);
 
index aa809ef..33ca817 100644 (file)
@@ -52,7 +52,6 @@ $string['feeds'] = 'News feeds';
 $string['feedsaddedit'] = 'Add/edit feeds';
 $string['feedsconfigurenewinstance'] = 'Click here to configure this block to display RSS feeds.';
 $string['feedsconfigurenewinstance2'] = 'Click the edit icon above to configure this block to display RSS feeds.';
-$string['feedstitle'] = 'Remote RSS Feeds';
 $string['feedupdated'] = 'News feed updated';
 $string['feedurl'] = 'Feed URL';
 $string['findmorefeeds'] = 'Find more RSS feeds';
@@ -61,7 +60,7 @@ $string['managefeeds'] = 'Manage all my feeds';
 $string['nofeeds'] = 'There are no RSS feeds defined for this site.';
 $string['numentries'] = 'Entries per feed';
 $string['pickfeed'] = 'Pick a news feed';
-$string['pluginname'] = 'RSS client';
+$string['pluginname'] = 'Remote RSS feeds';
 $string['remotenewsfeed'] = 'Remote news feed';
 $string['rss_client:createprivatefeeds'] = 'Create private RSS feeds';
 $string['rss_client:createsharedfeeds'] = 'Create shared RSS feeds';
index 553a619..321aed4 100644 (file)
@@ -86,7 +86,7 @@ $PAGE->set_heading($strmanage);
 $settingsurl = new moodle_url('/admin/settings.php?section=blocksettingrss_client');
 $managefeeds = new moodle_url('/blocks/rss_client/managefeeds.php', $urlparams);
 $PAGE->navbar->add(get_string('blocks'));
-$PAGE->navbar->add(get_string('feedstitle', 'block_rss_client'), $settingsurl);
+$PAGE->navbar->add(get_string('pluginname', 'block_rss_client'), $settingsurl);
 $PAGE->navbar->add(get_string('managefeeds', 'block_rss_client'), $managefeeds);
 echo $OUTPUT->header();
 
index ef8da29..469e621 100644 (file)
@@ -74,7 +74,7 @@ $PAGE->set_heading($strviewfeed);
 $settingsurl = new moodle_url('/admin/settings.php?section=blocksettingrss_client');
 $managefeeds = new moodle_url('/blocks/rss_client/managefeeds.php', $urlparams);
 $PAGE->navbar->add(get_string('blocks'));
-$PAGE->navbar->add(get_string('feedstitle', 'block_rss_client'), $settingsurl);
+$PAGE->navbar->add(get_string('pluginname', 'block_rss_client'), $settingsurl);
 $PAGE->navbar->add(get_string('managefeeds', 'block_rss_client'));
 $PAGE->navbar->add($strviewfeed);
 echo $OUTPUT->header();
index af42b29..efc2fbc 100644 (file)
@@ -19,7 +19,7 @@
  * Section links block
  *
  * @package    moodlecore
- * @Author     Jason Hardin 
+ * @Author     Jason Hardin
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
index 9954a39..9fe4a84 100644 (file)
@@ -36,7 +36,7 @@ require_once($CFG->libdir.'/completionlib.php');
 class block_selfcompletion extends block_base {
 
     public function init() {
-        $this->title   = get_string('selfcompletion', 'block_selfcompletion');
+        $this->title   = get_string('pluginname', 'block_selfcompletion');
     }
 
     public function get_content() {
index 03cf0dc..403d0b2 100644 (file)
@@ -26,5 +26,4 @@
 $string['alreadyselfcompleted'] = 'You have already marked yourself as complete in this course';
 $string['completecourse'] = 'Complete course';
 $string['pluginname'] = 'Self completion';
-$string['selfcompletion'] = 'Self completion';
 $string['selfcompletionnotenabled'] = 'The self completion criteria has not been enabled for this course';
index 03c84ca..a851cbe 100644 (file)
@@ -1,8 +1,41 @@
 <?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/>.
+
+/**
+ * Blog RSS Management
+ *
+ * @package    core_blog
+ * @category   rss
+ * @copyright  2010 Andrew Davis
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 require_once($CFG->dirroot.'/lib/rsslib.php');
 require_once($CFG->dirroot .'/blog/lib.php');
 
+/**
+ * Build the URL for the RSS feed
+ *
+ * @param int    $contextid    The context under which the URL should be created
+ * @param int    $userid       The id of the user requesting the RSS Feed
+ * @param string $filtertype   The source of the RSS feed (site/course/group/user)
+ * @param int    $filterselect The id of the item defined by $filtertype
+ * @param int    $tagid        The id of the row in the tag table that identifies the RSS Feed
+ * @return string
+ */
 function blog_rss_get_url($contextid, $userid, $filtertype, $filterselect=0, $tagid=0) {
     $componentname = 'blog';
 
@@ -29,8 +62,15 @@ function blog_rss_get_url($contextid, $userid, $filtertype, $filterselect=0, $ta
     return rss_get_url($contextid, $userid, $componentname, $additionalargs);
 }
 
-// This function returns the icon (from theme) with the link to rss/file.php
-// needs some hacking to rss/file.php
+/**
+ * Print the link for the RSS feed with the correct RSS icon (Theme based)
+ *
+ * @param stdClass    $context      The context under which the URL should be created
+ * @param string      $filtertype   The source of the RSS feed (site/course/group/user)
+ * @param int         $filterselect The id of the item defined by $filtertype
+ * @param int         $tagid        The id of the row in the tag table that identifies the RSS Feed
+ * @param string      $tooltiptext  The tooltip to be displayed with the link
+ */
 function blog_rss_print_link($context, $filtertype, $filterselect=0, $tagid=0, $tooltiptext='') {
     global $CFG, $USER, $OUTPUT;
 
@@ -45,6 +85,15 @@ function blog_rss_print_link($context, $filtertype, $filterselect=0, $tagid=0, $
     print '<div class="mdl-right"><a href="'. $url .'"><img src="'. $rsspix .'" title="'. strip_tags($tooltiptext) .'" alt="'.get_string('rss').'" /></a></div>';
 }
 
+/**
+ * Build the URL for the RSS feed amd add it as a header
+ *
+ * @param stdClass    $context      The context under which the URL should be created
+ * @param string      $title        Name for the link to be added to the page header
+ * @param string      $filtertype   The source of the RSS feed (site/course/group/user)
+ * @param int         $filterselect The id of the item defined by $filtertype
+ * @param int         $tagid        The id of the row in the tag table that identifies the RSS Feed
+ */
 function blog_rss_add_http_header($context, $title, $filtertype, $filterselect=0, $tagid=0) {
     global $PAGE, $USER, $CFG;
 
@@ -63,8 +112,9 @@ function blog_rss_add_http_header($context, $title, $filtertype, $filterselect=0
 
 /**
  * Utility function to extract parameters needed to generate RSS URLs from the blog filters
- * @param <type> $filters
- * @return array array containing the id of the user/course/group, the relevant context and the filter type (site/user/course/group)
+ *
+ * @param  array $filters filters for the blog
+ * @return array array containing the id of the user/course/group, the relevant context and the filter type: site/user/course/group
  */
 function blog_rss_get_params($filters) {
     $thingid = $rsscontext = $filtertype = null;
@@ -99,8 +149,12 @@ function blog_rss_get_params($filters) {
     return array($thingid, $rsscontext, $filtertype);
 }
 
-
-// Generate any blog RSS feed via one function (called by ../rss/file.php)
+/**
+ * Generate any blog RSS feed via one function
+ *
+ * @param stdClass $context The context of the blog for which the feed it being generated
+ * @param array    $args    An array of arguements needed to build the feed (contextid, token, componentname, type, id, tagid)
+ */
 function blog_rss_get_feed($context, $args) {
     global $CFG, $SITE, $DB;
 
@@ -219,7 +273,14 @@ function blog_rss_get_feed($context, $args) {
     }
 }
 
-
+/**
+ * Retrieve the location and file name of a cached RSS feed
+ *
+ * @param string $type  The source of the RSS feed (site/course/group/user)
+ * @param int    $id    The id of the item defined by $type
+ * @param int    $tagid The id of the row in the tag table that identifies the RSS Feed
+ * @return string
+ */
 function blog_rss_file_name($type, $id, $tagid=0) {
     global $CFG;
 
@@ -230,7 +291,15 @@ function blog_rss_file_name($type, $id, $tagid=0) {
     }
 }
 
-//This function saves to file the rss feed specified in the parameters
+/**
+ * This function saves to file the rss feed specified in the parameters
+ *
+ * @param string $type     The source of the RSS feed (site/course/group/user)
+ * @param int    $id       The id of the item defined by $type
+ * @param int    $tagid    The id of the row in the tag table that identifies the RSS Feed
+ * @param string $contents The contents of the RSS Feed file
+ * @return bool whether the save was successful or not
+ */
 function blog_rss_save_file($type, $id, $tagid=0, $contents='') {
     global $CFG;
 
index 8a3d097..7ab989a 100644 (file)
@@ -68,8 +68,8 @@ $event->count_repeats();
 
 // Is used several times, and sometimes with modification if required
 $viewcalendarurl = new moodle_url(CALENDAR_URL.'view.php', array('view'=>'upcoming'));
-$viewcalendarurl->param('cal_y', date('Y', $event->timestart));
-$viewcalendarurl->param('cal_m', date('m', $event->timestart));
+$viewcalendarurl->param('cal_y', userdate($event->timestart, '%Y'));
+$viewcalendarurl->param('cal_m', userdate($event->timestart, '%m'));
 
 // If confirm is set (PARAM_BOOL) then we have confirmation of initention to delete
 if ($confirm) {
@@ -124,4 +124,4 @@ $event->time = calendar_format_event_time($event, time(), null, false);
 calendar_print_event($event, false);
 
 echo $OUTPUT->box_end();
-echo $OUTPUT->footer();
\ No newline at end of file
+echo $OUTPUT->footer();
index dd98be3..130e682 100644 (file)
@@ -168,9 +168,9 @@ if ($data) {
 
     $params = array(
         'view' => 'day',
-        'cal_d' => date('j', $event->timestart),
-        'cal_m' => date('n', $event->timestart),
-        'cal_y' => date('y', $event->timestart),
+        'cal_d' => userdate($event->timestart, '%d'),
+        'cal_m' => userdate($event->timestart, '%m'),
+        'cal_y' => userdate($event->timestart, '%Y'),
     );
     $eventurl = new moodle_url('/calendar/view.php', $params);
     if (!empty($event->courseid) && $event->courseid != SITEID) {
index e4e76cd..645ae18 100644 (file)
@@ -1510,7 +1510,7 @@ function calendar_get_default_courses() {
     $courses = array();
     if (!empty($CFG->calendar_adminseesall) && has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM))) {
         list ($select, $join) = context_instance_preload_sql('c.id', CONTEXT_COURSE, 'ctx');
-        $sql = "SELECT c.* $select
+        $sql = "SELECT DISTINCT c.* $select
                   FROM {course} c
                   JOIN {event} e ON e.courseid = c.id
                   $join";
@@ -1622,13 +1622,13 @@ function calendar_format_event_time($event, $now, $linkparams = null, $usecommon
             }
         }
     } else {
-        $time = ' ';
+        $time = calendar_time_representation($event->timestart);
 
         // Set printable representation
         if (!$showtime) {
             $day = calendar_day_representation($event->timestart, $now, $usecommonwords);
             $url = calendar_get_link_href(new moodle_url(CALENDAR_URL.'view.php', $linkparams), $startdate['mday'], $startdate['mon'], $startdate['year']);
-            $eventtime = html_writer::link($url, $day).trim($time);
+            $eventtime = html_writer::link($url, $day).', '.trim($time);
         } else {
             $eventtime = $time;
         }
index 354c6a1..e6ffef8 100644 (file)
@@ -144,12 +144,12 @@ if ($form->is_cancelled()){
 
     // Update course total passing grade
     if (!empty($data->criteria_grade)) {
-       if ($grade_item = grade_category::fetch_course_category($course->id)->grade_item) {
-               $grade_item->gradepass = $data->criteria_grade_value;
-               if (method_exists($grade_item, 'update')) {
-               $grade_item->update('course/completion.php');
-               }
-       }
+        if ($grade_item = grade_category::fetch_course_category($course->id)->grade_item) {
+            $grade_item->gradepass = $data->criteria_grade_value;
+            if (method_exists($grade_item, 'update')) {
+                $grade_item->update('course/completion.php');
+            }
+        }
     }
 
     redirect($CFG->wwwroot."/course/view.php?id=$course->id", get_string('changessaved'));
index aca5105..4da6eb3 100644 (file)
@@ -37,7 +37,7 @@
     $PAGE->set_pagelayout('popup');
     $PAGE->set_url('/course/info.php', array('id' => $course->id));
     $PAGE->set_title(get_string("summaryof", "", $course->fullname));
-    $PAGE->set_heading('Course info');
+    $PAGE->set_heading(get_string('courseinfo'));
     $PAGE->set_course($course);
     $PAGE->navbar->add(get_string('summary'));
 
index b8481ad..61ab633 100644 (file)
@@ -100,6 +100,9 @@ echo $OUTPUT->header();
 echo $OUTPUT->heading(get_string('sendingcourse', 'hub'), 3, 'main');
 $renderer = $PAGE->get_renderer('core', 'publish');
 echo $renderer->sendingbackupinfo($backupfile);
+if (ob_get_level()) {
+    ob_flush();
+}
 flush();
 
 //send backup file to the hub
index 84a9852..3b5e8df 100644 (file)
@@ -333,7 +333,7 @@ class course_publication_form extends moodleform {
 
         $editoroptions = array('maxfiles' => 0, 'maxbytes' => 0, 'trusttext' => false, 'forcehttps' => false);
         $mform->addElement('editor', 'creatornotes', get_string('creatornotes', 'hub'), '', $editoroptions);
-        $mform->addRule('creatornotes', $strrequired, 'required', null, 'client');  
+        $mform->addRule('creatornotes', $strrequired, 'required', null, 'client');
         $mform->setType('creatornotes', PARAM_CLEANHTML);
         $mform->addHelpButton('creatornotes', 'creatornotes', 'hub');
 
index 9627750..f868ca3 100644 (file)
@@ -110,11 +110,11 @@ if (has_capability('moodle/course:publish', get_context_instance(CONTEXT_COURSE,
     }
 
     $renderer = $PAGE->get_renderer('core', 'publish');
-  
+
     /// UNPUBLISH
     $cancel = optional_param('cancel', 0, PARAM_BOOL);
     if (!empty($cancel) and confirm_sesskey()) {
-        $confirm = optional_param('confirm', 0, PARAM_BOOL);      
+        $confirm = optional_param('confirm', 0, PARAM_BOOL);
         $hubcourseid = optional_param('hubcourseid', 0, PARAM_INT);
         $publicationid = optional_param('publicationid', 0, PARAM_INT);
         $timepublished = optional_param('timepublished', 0, PARAM_INT);
@@ -161,7 +161,7 @@ if (has_capability('moodle/course:publish', get_context_instance(CONTEXT_COURSE,
                 empty($hubname)?$huburl:$hubname), 'notifysuccess');
     }
 
+
     /// OUTPUT
     echo $OUTPUT->header();
     echo $confirmmessage;
@@ -177,4 +177,4 @@ if (has_capability('moodle/course:publish', get_context_instance(CONTE