Merge branch 'brokencalc' of git://github.com/andyjdavis/moodle
authorDan Poltawski <dan@moodle.com>
Sun, 5 May 2013 10:29:11 +0000 (11:29 +0100)
committerDan Poltawski <dan@moodle.com>
Sun, 5 May 2013 10:29:11 +0000 (11:29 +0100)
832 files changed:
admin/cli/install.php
admin/cli/install_database.php
admin/cli/upgrade.php
admin/index.php
admin/mnet/peer_forms.php
admin/mnet/profilefields_form.php
admin/mnet/services_form.php
admin/renderer.php
admin/settings/security.php
admin/tests/behat/display_short_names.feature
admin/tests/behat/filter_users.feature
admin/tests/behat/upload_users.feature
admin/tool/assignmentupgrade/version.php
admin/tool/behat/cli/util.php
admin/tool/behat/tests/behat/basic_actions.feature
admin/tool/behat/tests/behat/data_generators.feature
admin/tool/behat/tests/behat/edit_permissions.feature
admin/tool/behat/tests/behat/list_steps.feature
admin/tool/behat/tests/behat/manipulate_forms.feature
admin/tool/behat/tests/behat/nasty_strings.feature
admin/tool/behat/tests/behat/test_environment.feature
admin/tool/behat/version.php
admin/tool/capability/version.php
admin/tool/customlang/version.php
admin/tool/dbtransfer/version.php
admin/tool/generator/version.php
admin/tool/health/version.php
admin/tool/innodb/version.php
admin/tool/installaddon/classes/installer.php
admin/tool/installaddon/classes/pluginfo_client.php
admin/tool/installaddon/version.php
admin/tool/langimport/version.php
admin/tool/multilangupgrade/version.php
admin/tool/phpunit/cli/util.php
admin/tool/phpunit/version.php
admin/tool/profiling/version.php
admin/tool/qeupgradehelper/version.php
admin/tool/replace/version.php
admin/tool/spamcleaner/version.php
admin/tool/timezoneimport/version.php
admin/tool/unsuproles/version.php
admin/tool/uploaduser/index.php
admin/tool/uploaduser/version.php
admin/tool/xmldb/version.php
auth/cas/auth.php
auth/cas/cli/sync_users.php
auth/cas/lang/en/auth_cas.php
auth/cas/version.php
auth/db/version.php
auth/email/auth.php
auth/email/lang/en/auth_email.php
auth/email/version.php
auth/fc/auth.php
auth/fc/lang/en/auth_fc.php
auth/fc/version.php
auth/imap/auth.php
auth/imap/lang/en/auth_imap.php
auth/imap/version.php
auth/ldap/auth.php
auth/ldap/cli/sync_users.php
auth/ldap/lang/en/auth_ldap.php
auth/ldap/version.php
auth/manual/auth.php
auth/manual/db/upgrade.php
auth/manual/lang/en/auth_manual.php
auth/manual/version.php
auth/mnet/auth.php
auth/mnet/db/mnet.php
auth/mnet/db/upgrade.php
auth/mnet/jump.php
auth/mnet/land.php
auth/mnet/lang/en/auth_mnet.php
auth/mnet/version.php
auth/nntp/auth.php
auth/nntp/lang/en/auth_nntp.php
auth/nntp/version.php
auth/nologin/auth.php
auth/nologin/lang/en/auth_nologin.php
auth/nologin/version.php
auth/none/auth.php
auth/none/lang/en/auth_none.php
auth/none/version.php
auth/pam/auth.php
auth/pam/lang/en/auth_pam.php
auth/pam/version.php
auth/pop3/auth.php
auth/pop3/lang/en/auth_pop3.php
auth/pop3/version.php
auth/radius/auth.php
auth/radius/lang/en/auth_radius.php
auth/radius/version.php
auth/shibboleth/auth.php
auth/shibboleth/lang/en/auth_shibboleth.php
auth/shibboleth/version.php
auth/tests/behat/login.feature
auth/webservice/auth.php
auth/webservice/lang/en/auth_webservice.php
auth/webservice/version.php
backup/backup.class.php
backup/util/ui/base_moodleform.class.php
backup/util/ui/tests/behat/backup_courses.feature
backup/util/ui/tests/behat/duplicate_activities.feature
backup/util/ui/tests/behat/import_course.feature
backup/util/ui/tests/behat/restore_moodle2_courses.feature
badges/lib/backpacklib.php
badges/mybackpack.php
badges/tests/behat/add_badge.feature
badges/tests/behat/award_badge.feature
blocks/activity_modules/version.php
blocks/admin_bookmarks/version.php
blocks/badges/version.php
blocks/blog_menu/version.php
blocks/blog_recent/version.php
blocks/blog_tags/version.php
blocks/calendar_month/version.php
blocks/calendar_upcoming/version.php
blocks/comments/tests/behat/add_comment.feature
blocks/comments/tests/behat/delete_comment.feature
blocks/comments/version.php
blocks/community/forms.php
blocks/community/version.php
blocks/completionstatus/version.php
blocks/course_list/version.php
blocks/course_overview/version.php
blocks/course_summary/version.php
blocks/feedback/version.php
blocks/glossary_random/version.php
blocks/html/version.php
blocks/login/version.php
blocks/mentees/version.php
blocks/messages/version.php
blocks/mnet_hosts/version.php
blocks/myprofile/version.php
blocks/navigation/version.php
blocks/news_items/version.php
blocks/online_users/version.php
blocks/participants/version.php
blocks/private_files/version.php
blocks/quiz_results/version.php
blocks/recent_activity/version.php
blocks/rss_client/version.php
blocks/search_forums/version.php
blocks/section_links/version.php
blocks/selfcompletion/version.php
blocks/settings/version.php
blocks/site_main_menu/version.php
blocks/social_activities/version.php
blocks/tag_flickr/version.php
blocks/tag_youtube/version.php
blocks/tags/version.php
blocks/tests/behat/add_blocks.feature
blocks/tests/behat/configure_block_throughout_site.feature
blocks/tests/behat/restrict_available_blocks.feature
blog/tests/behat/comment.feature
cache/admin.php
cache/classes/config.php
cache/forms.php
cache/locallib.php
cache/renderer.php
cache/stores/file/version.php
cache/stores/memcache/version.php
cache/stores/memcached/version.php
cache/stores/mongodb/version.php
cache/stores/session/version.php
cache/stores/static/version.php
calendar/renderer.php
cohort/tests/behat/add_cohort.feature
cohort/tests/behat/upload_cohort_users.feature
completion/tests/behat/enable_manual_complete_mark.feature
completion/tests/behat/restrict_section_availability.feature
course/externallib.php
course/format/lib.php
course/format/renderer.php
course/format/scorm/version.php
course/format/social/version.php
course/format/topics/version.php
course/format/weeks/version.php
course/publish/forms.php
course/publish/index.php
course/renderer.php
course/tests/behat/activities_group_icons.feature
course/tests/behat/activities_indentation.feature
course/tests/behat/activities_visibility_icons.feature
course/tests/behat/add_activities.feature
course/tests/behat/edit_settings.feature
course/tests/behat/force_group_mode.feature
course/tests/behat/max_number_sections.feature
course/tests/behat/paged_course_navigation.feature
course/tests/behat/rename_roles.feature
course/tests/behat/restrict_available_activities.feature
course/tests/behat/section_highlighting.feature
course/tests/behat/section_visibility.feature
course/tests/externallib_test.php
course/yui/toolboxes/toolboxes.js
enrol/ajax.php
enrol/authorize/authorizenet.class.php
enrol/authorize/db/upgrade.php
enrol/authorize/enrol_form.php
enrol/authorize/import_form.php
enrol/authorize/index.php
enrol/authorize/lang/en/enrol_authorize.php
enrol/authorize/localfuncs.php
enrol/authorize/locallib.php
enrol/authorize/uploadcsv.php
enrol/authorize/version.php
enrol/bulkchange.php
enrol/bulkchange_forms.php
enrol/category/version.php
enrol/cohort/lang/en/enrol_cohort.php
enrol/cohort/lib.php
enrol/cohort/version.php
enrol/database/version.php
enrol/flatfile/lib.php
enrol/flatfile/version.php
enrol/guest/addinstance.php
enrol/guest/db/upgrade.php
enrol/guest/lang/en/enrol_guest.php
enrol/guest/lib.php
enrol/guest/locallib.php
enrol/guest/settings.php
enrol/guest/tests/behat/guest_access.feature
enrol/guest/version.php
enrol/imsenterprise/db/install.php
enrol/imsenterprise/db/upgrade.php
enrol/imsenterprise/lang/en/enrol_imsenterprise.php
enrol/imsenterprise/lib.php
enrol/imsenterprise/locallib.php
enrol/imsenterprise/settings.php
enrol/imsenterprise/version.php
enrol/index.php
enrol/instances.php
enrol/ldap/cli/sync.php
enrol/ldap/db/install.php
enrol/ldap/lang/en/enrol_ldap.php
enrol/ldap/lib.php
enrol/ldap/settings.php
enrol/ldap/settingslib.php
enrol/ldap/version.php
enrol/locallib.php
enrol/manual/ajax.php
enrol/manual/db/services.php
enrol/manual/version.php
enrol/meta/addinstance.php
enrol/meta/addinstance_form.php
enrol/meta/cli/sync.php
enrol/meta/db/install.php
enrol/meta/db/uninstall.php
enrol/meta/lang/en/enrol_meta.php
enrol/meta/lib.php
enrol/meta/locallib.php
enrol/meta/settings.php
enrol/meta/version.php
enrol/mnet/addinstance.php
enrol/mnet/addinstance_form.php
enrol/mnet/db/mnet.php
enrol/mnet/db/upgrade.php
enrol/mnet/enrol.php
enrol/mnet/lang/en/enrol_mnet.php
enrol/mnet/lib.php
enrol/mnet/settings.php
enrol/mnet/version.php
enrol/otherusers.php
enrol/paypal/db/upgrade.php
enrol/paypal/edit.php
enrol/paypal/edit_form.php
enrol/paypal/ipn.php
enrol/paypal/lang/en/enrol_paypal.php
enrol/paypal/lib.php
enrol/paypal/return.php
enrol/paypal/settings.php
enrol/paypal/unenrolself.php
enrol/paypal/version.php
enrol/renderer.php
enrol/self/lib.php
enrol/self/tests/behat/self_enrolment.feature
enrol/self/version.php
enrol/tests/enrollib_test.php
enrol/unenroluser.php
enrol/upgrade.txt
enrol/users.php
enrol/users_forms.php
filter/activitynames/version.php
filter/algebra/version.php
filter/censor/version.php
filter/data/version.php
filter/emailprotect/version.php
filter/emoticon/version.php
filter/glossary/version.php
filter/mediaplugin/version.php
filter/multilang/version.php
filter/tex/version.php
filter/tidy/version.php
filter/urltolink/version.php
grade/edit/tree/category_form.php
grade/edit/tree/grade_form.php
grade/edit/tree/item_form.php
grade/edit/tree/outcomeitem_form.php
grade/export/grade_export_form.php
grade/export/ods/version.php
grade/export/txt/version.php
grade/export/xls/version.php
grade/export/xml/version.php
grade/grading/form/guide/version.php
grade/grading/form/rubric/version.php
grade/import/csv/version.php
grade/import/grade_import_form.php
grade/import/xml/version.php
grade/report/grader/version.php
grade/report/outcomes/version.php
grade/report/overview/version.php
grade/report/user/version.php
group/tests/behat/auto_creation.feature
group/tests/behat/create_groups.feature
group/tests/behat/id_uniqueness.feature
install/lang/gl/admin.php
install/lang/gl/install.php
install/lang/gl/langconfig.php
install/lang/sr_cr/install.php
install/lang/sr_lt/install.php
install/lang/tg/error.php [new file with mode: 0644]
install/lang/tg/install.php [new file with mode: 0644]
install/lang/tg/langconfig.php
install/lang/tg/moodle.php [new file with mode: 0644]
lang/en/badges.php
lang/en/cache.php
lang/en/grades.php
lib/badgeslib.php
lib/cacert.pem [new file with mode: 0644]
lib/cacert.txt [new file with mode: 0644]
lib/coursecatlib.php
lib/dml/moodle_database.php
lib/dml/mssql_native_moodle_database.php
lib/dml/oci_native_moodle_database.php
lib/dml/sqlite3_pdo_moodle_database.php
lib/dml/sqlsrv_native_moodle_database.php
lib/dml/tests/dml_test.php
lib/editor/textarea/version.php
lib/editor/tinymce/plugins/ctrlhelp/version.php
lib/editor/tinymce/plugins/dragmath/version.php
lib/editor/tinymce/plugins/moodleemoticon/version.php
lib/editor/tinymce/plugins/moodleimage/version.php
lib/editor/tinymce/plugins/moodlemedia/version.php
lib/editor/tinymce/plugins/moodlenolink/version.php
lib/editor/tinymce/plugins/spellchecker/version.php
lib/editor/tinymce/tests/behat/edit_available_icons.feature
lib/editor/tinymce/version.php
lib/editor/tinymce/yui/build/moodle-editor_tinymce-collapse/moodle-editor_tinymce-collapse-debug.js
lib/editor/tinymce/yui/build/moodle-editor_tinymce-collapse/moodle-editor_tinymce-collapse-min.js
lib/editor/tinymce/yui/build/moodle-editor_tinymce-collapse/moodle-editor_tinymce-collapse.js
lib/editor/tinymce/yui/src/collapse/js/collapse.js
lib/enrollib.php
lib/filelib.php
lib/form/select.php
lib/moodlelib.php
lib/outputrenderers.php
lib/outputrequirementslib.php
lib/pluginlib.php
lib/portfolio/caller.php
lib/setup.php
lib/tests/moodlelib_test.php
lib/tests/textlib_test.php
lib/tests/weblib_test.php
lib/textlib.class.php
lib/thirdpartylibs.xml
lib/upgrade.txt
lib/upgradelib.php
lib/weblib.php
lib/yui/build/moodle-core-tooltip/moodle-core-tooltip-debug.js
lib/yui/build/moodle-core-tooltip/moodle-core-tooltip-min.js
lib/yui/build/moodle-core-tooltip/moodle-core-tooltip.js
lib/yui/src/tooltip/js/tooltip.js
mdeploy.php
message/output/email/version.php
message/output/jabber/message_output_jabber.php
message/output/jabber/version.php
message/output/popup/version.php
message/tests/behat/block_users.feature
message/tests/behat/manage_contacts.feature
message/tests/behat/search_history.feature
mnet/service/enrol/version.php
mod/assign/db/upgrade.php
mod/assign/feedback/comments/version.php
mod/assign/feedback/file/version.php
mod/assign/feedback/offline/version.php
mod/assign/locallib.php
mod/assign/mod_form.php
mod/assign/submission/comments/version.php
mod/assign/submission/file/settings.php
mod/assign/submission/file/version.php
mod/assign/submission/onlinetext/version.php
mod/assign/tests/behat/file_submission.feature
mod/assign/tests/behat/group_submission.feature
mod/assign/tests/behat/online_submissions.feature
mod/assign/tests/behat/prevent_submission_changes.feature
mod/assign/upgradelib.php
mod/assign/version.php
mod/assignment/mod_form.php
mod/assignment/settings.php
mod/assignment/type/offline/version.php
mod/assignment/type/online/version.php
mod/assignment/type/upload/version.php
mod/assignment/type/uploadsingle/version.php
mod/assignment/version.php
mod/book/mod_form.php
mod/book/tool/exportimscp/version.php
mod/book/tool/importhtml/version.php
mod/book/tool/print/version.php
mod/book/version.php
mod/chat/gui_basic/index.php
mod/chat/gui_header_js/chatinput.php
mod/chat/gui_header_js/users.php
mod/chat/gui_sockets/chatinput.php
mod/chat/mod_form.php
mod/chat/version.php
mod/choice/mod_form.php
mod/choice/tests/behat/add_choice.feature
mod/choice/tests/behat/publish_results.feature
mod/choice/tests/behat/publish_results_anonymously.feature
mod/choice/version.php
mod/data/field/checkbox/version.php
mod/data/field/date/version.php
mod/data/field/file/mod.html
mod/data/field/file/version.php
mod/data/field/latlong/version.php
mod/data/field/menu/version.php
mod/data/field/multimenu/version.php
mod/data/field/number/version.php
mod/data/field/picture/mod.html
mod/data/field/picture/version.php
mod/data/field/radiobutton/version.php
mod/data/field/text/version.php
mod/data/field/textarea/version.php
mod/data/field/url/version.php
mod/data/mod_form.php
mod/data/preset/imagegallery/version.php
mod/data/version.php
mod/feedback/lang/en/feedback.php
mod/feedback/mod_form.php
mod/feedback/version.php
mod/feedback/view.php
mod/folder/mod_form.php
mod/folder/version.php
mod/forum/lib.php
mod/forum/mod_form.php
mod/forum/post.php
mod/forum/post_form.php
mod/forum/settings.php
mod/forum/tests/behat/add_forum.feature
mod/forum/tests/behat/completion_condition_number_discussions.feature
mod/forum/tests/behat/discussion_display.feature
mod/forum/tests/behat/edit_post_student.feature
mod/forum/tests/behat/edit_post_teacher.feature
mod/forum/tests/behat/single_forum_discussion.feature
mod/forum/tests/behat/track_read_posts.feature
mod/forum/version.php
mod/glossary/mod_form.php
mod/glossary/tests/behat/entries_always_editable.feature
mod/glossary/tests/behat/prevent_duplicate_entries.feature
mod/glossary/tests/behat/print_friendly_version.feature
mod/glossary/tests/behat/search_entries.feature
mod/glossary/version.php
mod/imscp/mod_form.php
mod/imscp/version.php
mod/label/tests/generator/lib.php [new file with mode: 0644]
mod/label/tests/generator_test.php [new file with mode: 0644]
mod/label/version.php
mod/lesson/lang/en/lesson.php
mod/lesson/locallib.php
mod/lesson/mod_form.php
mod/lesson/pagetypes/matching.php
mod/lesson/pagetypes/multichoice.php
mod/lesson/tests/behat/date_availability.feature
mod/lesson/tests/behat/lesson_navigation.feature
mod/lesson/tests/behat/password_protection.feature
mod/lesson/tests/behat/time_limit.feature
mod/lesson/version.php
mod/lti/locallib.php
mod/lti/mod_form.php
mod/lti/settings.php
mod/lti/version.php
mod/page/mod_form.php
mod/page/version.php
mod/quiz/accessrule/delaybetweenattempts/version.php
mod/quiz/accessrule/ipaddress/version.php
mod/quiz/accessrule/numattempts/version.php
mod/quiz/accessrule/openclosedate/version.php
mod/quiz/accessrule/password/version.php
mod/quiz/accessrule/safebrowser/version.php
mod/quiz/accessrule/securewindow/version.php
mod/quiz/accessrule/timelimit/version.php
mod/quiz/lib.php
mod/quiz/mod_form.php
mod/quiz/module.js
mod/quiz/report/grading/version.php
mod/quiz/report/overview/version.php
mod/quiz/report/responses/version.php
mod/quiz/report/statistics/version.php
mod/quiz/version.php
mod/resource/mod_form.php
mod/resource/settings.php
mod/resource/version.php
mod/scorm/mod_form.php
mod/scorm/report/basic/version.php
mod/scorm/report/graphs/version.php
mod/scorm/report/interactions/version.php
mod/scorm/report/reportlib.php
mod/scorm/version.php
mod/survey/tests/behat/survey_types.feature
mod/survey/version.php
mod/url/lang/en/url.php
mod/url/mod_form.php
mod/url/settings.php
mod/url/version.php
mod/wiki/create_form.php
mod/wiki/lang/en/wiki.php
mod/wiki/mod_form.php
mod/wiki/tests/behat/collaborative_individual.feature
mod/wiki/tests/behat/page_history.feature
mod/wiki/tests/behat/preview_page.feature
mod/wiki/tests/behat/wiki_formats.feature
mod/wiki/version.php
mod/workshop/allocation/manual/version.php
mod/workshop/allocation/random/version.php
mod/workshop/allocation/scheduled/version.php
mod/workshop/eval/best/version.php
mod/workshop/form/accumulative/version.php
mod/workshop/form/comments/version.php
mod/workshop/form/numerrors/version.php
mod/workshop/form/rubric/version.php
mod/workshop/mod_form.php
mod/workshop/settings.php
mod/workshop/version.php
portfolio/boxnet/lib.php
portfolio/boxnet/version.php
portfolio/download/version.php
portfolio/flickr/lib.php
portfolio/flickr/version.php
portfolio/googledocs/lib.php
portfolio/googledocs/version.php
portfolio/mahara/version.php
portfolio/picasa/lib.php
portfolio/picasa/version.php
question/behaviour/adaptive/version.php
question/behaviour/adaptivenopenalty/version.php
question/behaviour/deferredcbm/version.php
question/behaviour/deferredfeedback/version.php
question/behaviour/immediatecbm/version.php
question/behaviour/immediatefeedback/version.php
question/behaviour/informationitem/version.php
question/behaviour/interactive/version.php
question/behaviour/interactivecountback/version.php
question/behaviour/manualgraded/version.php
question/behaviour/missing/version.php
question/format/aiken/version.php
question/format/blackboard_six/version.php
question/format/examview/version.php
question/format/gift/version.php
question/format/learnwise/version.php
question/format/missingword/version.php
question/format/multianswer/version.php
question/format/webct/version.php
question/format/xhtml/version.php
question/format/xml/format.php
question/format/xml/version.php
question/tests/behat/edit_questions.feature
question/tests/behat/preview_question.feature
question/tests/behat/sort_questions.feature
question/type/calculated/version.php
question/type/calculatedmulti/version.php
question/type/calculatedsimple/version.php
question/type/description/version.php
question/type/essay/version.php
question/type/match/edit_match_form.php
question/type/match/version.php
question/type/missingtype/version.php
question/type/multianswer/version.php
question/type/multichoice/renderer.php
question/type/multichoice/styles.css
question/type/multichoice/version.php
question/type/numerical/version.php
question/type/random/version.php
question/type/randomsamatch/version.php
question/type/shortanswer/version.php
question/type/truefalse/version.php
report/backups/version.php
report/completion/index.php
report/completion/version.php
report/configlog/version.php
report/courseoverview/version.php
report/log/version.php
report/loglive/version.php
report/outline/version.php
report/participation/version.php
report/performance/version.php
report/progress/index.php
report/progress/version.php
report/questioninstances/version.php
report/security/version.php
report/stats/version.php
repository/alfresco/version.php
repository/boxnet/version.php
repository/coursefiles/version.php
repository/dropbox/version.php
repository/equella/version.php
repository/filesystem/version.php
repository/flickr/version.php
repository/flickr_public/version.php
repository/googledocs/version.php
repository/local/version.php
repository/merlot/version.php
repository/picasa/version.php
repository/recent/tests/behat/add_recent.feature
repository/recent/version.php
repository/s3/version.php
repository/tests/behat/cancel_add_file.feature
repository/tests/behat/create_folders.feature
repository/tests/behat/delete_files.feature
repository/tests/behat/zip_and_unzip.feature
repository/upload/tests/behat/upload_file.feature
repository/upload/version.php
repository/url/version.php
repository/user/version.php
repository/webdav/version.php
repository/wikimedia/version.php
repository/youtube/version.php
theme/afterburner/db/upgrade.php
theme/afterburner/version.php
theme/anomaly/config.php
theme/anomaly/version.php
theme/arialist/config.php
theme/arialist/lang/en/theme_arialist.php
theme/arialist/version.php
theme/base/config.php
theme/base/style/admin.css
theme/base/style/core.css
theme/base/style/question.css
theme/base/version.php
theme/binarius/config.php
theme/binarius/lang/en/theme_binarius.php
theme/binarius/version.php
theme/bootstrap/javascript/moodlebootstrap.js [deleted file]
theme/bootstrap/less/moodle/recess.txt [deleted file]
theme/bootstrap/style/README [deleted file]
theme/bootstrapbase/README.txt [moved from theme/bootstrap/README.txt with 97% similarity]
theme/bootstrapbase/config.php [moved from theme/bootstrap/config.php with 98% similarity]
theme/bootstrapbase/javascript/html5shiv.js [moved from theme/bootstrap/javascript/html5shiv.js with 100% similarity]
theme/bootstrapbase/javascript/moodlebootstrap.js [new file with mode: 0644]
theme/bootstrapbase/lang/en/theme_bootstrapbase.php [moved from theme/bootstrap/lang/en/theme_bootstrap.php with 97% similarity]
theme/bootstrapbase/layout/general.php [moved from theme/bootstrap/layout/general.php with 100% similarity]
theme/bootstrapbase/less/README [moved from theme/bootstrap/less/README with 85% similarity]
theme/bootstrapbase/less/bootstrap/accordion.less [moved from theme/bootstrap/less/bootstrap/accordion.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/alerts.less [moved from theme/bootstrap/less/bootstrap/alerts.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/bootstrap.less [moved from theme/bootstrap/less/bootstrap/bootstrap.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/breadcrumbs.less [moved from theme/bootstrap/less/bootstrap/breadcrumbs.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/button-groups.less [moved from theme/bootstrap/less/bootstrap/button-groups.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/buttons.less [moved from theme/bootstrap/less/bootstrap/buttons.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/carousel.less [moved from theme/bootstrap/less/bootstrap/carousel.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/close.less [moved from theme/bootstrap/less/bootstrap/close.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/code.less [moved from theme/bootstrap/less/bootstrap/code.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/component-animations.less [moved from theme/bootstrap/less/bootstrap/component-animations.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/dropdowns.less [moved from theme/bootstrap/less/bootstrap/dropdowns.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/forms.less [moved from theme/bootstrap/less/bootstrap/forms.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/grid.less [moved from theme/bootstrap/less/bootstrap/grid.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/hero-unit.less [moved from theme/bootstrap/less/bootstrap/hero-unit.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/labels-badges.less [moved from theme/bootstrap/less/bootstrap/labels-badges.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/layouts.less [moved from theme/bootstrap/less/bootstrap/layouts.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/media.less [moved from theme/bootstrap/less/bootstrap/media.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/mixins.less [moved from theme/bootstrap/less/bootstrap/mixins.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/modals.less [moved from theme/bootstrap/less/bootstrap/modals.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/navbar.less [moved from theme/bootstrap/less/bootstrap/navbar.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/navs.less [moved from theme/bootstrap/less/bootstrap/navs.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/pager.less [moved from theme/bootstrap/less/bootstrap/pager.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/pagination.less [moved from theme/bootstrap/less/bootstrap/pagination.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/popovers.less [moved from theme/bootstrap/less/bootstrap/popovers.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/progress-bars.less [moved from theme/bootstrap/less/bootstrap/progress-bars.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/reset.less [moved from theme/bootstrap/less/bootstrap/reset.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/responsive-1200px-min.less [moved from theme/bootstrap/less/bootstrap/responsive-1200px-min.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/responsive-767px-max.less [moved from theme/bootstrap/less/bootstrap/responsive-767px-max.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/responsive-768px-979px.less [moved from theme/bootstrap/less/bootstrap/responsive-768px-979px.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/responsive-navbar.less [moved from theme/bootstrap/less/bootstrap/responsive-navbar.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/responsive-utilities.less [moved from theme/bootstrap/less/bootstrap/responsive-utilities.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/responsive.less [moved from theme/bootstrap/less/bootstrap/responsive.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/scaffolding.less [moved from theme/bootstrap/less/bootstrap/scaffolding.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/sprites.less [moved from theme/bootstrap/less/bootstrap/sprites.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/tables.less [moved from theme/bootstrap/less/bootstrap/tables.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/thumbnails.less [moved from theme/bootstrap/less/bootstrap/thumbnails.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/tooltip.less [moved from theme/bootstrap/less/bootstrap/tooltip.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/type.less [moved from theme/bootstrap/less/bootstrap/type.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/utilities.less [moved from theme/bootstrap/less/bootstrap/utilities.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/variables.less [moved from theme/bootstrap/less/bootstrap/variables.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/wells.less [moved from theme/bootstrap/less/bootstrap/wells.less with 100% similarity]
theme/bootstrapbase/less/editor.less [moved from theme/bootstrap/less/editor.less with 100% similarity]
theme/bootstrapbase/less/moodle.less [moved from theme/bootstrap/less/moodle.less with 90% similarity]
theme/bootstrapbase/less/moodle/admin.less [moved from theme/bootstrap/less/moodle/admin.less with 99% similarity]
theme/bootstrapbase/less/moodle/backup-restore.less [moved from theme/bootstrap/less/moodle/backup-restore.less with 100% similarity]
theme/bootstrapbase/less/moodle/blocks.less [moved from theme/bootstrap/less/moodle/blocks.less with 100% similarity]
theme/bootstrapbase/less/moodle/buttons.less [moved from theme/bootstrap/less/moodle/buttons.less with 100% similarity]
theme/bootstrapbase/less/moodle/calendar.less [moved from theme/bootstrap/less/moodle/calendar.less with 97% similarity]
theme/bootstrapbase/less/moodle/core.less [moved from theme/bootstrap/less/moodle/core.less with 99% similarity]
theme/bootstrapbase/less/moodle/course.less [moved from theme/bootstrap/less/moodle/course.less with 100% similarity]
theme/bootstrapbase/less/moodle/debug.less [moved from theme/bootstrap/less/moodle/debug.less with 100% similarity]
theme/bootstrapbase/less/moodle/expendable.less [moved from theme/bootstrap/less/moodle/expendable.less with 100% similarity]
theme/bootstrapbase/less/moodle/filemanager.less [moved from theme/bootstrap/less/moodle/filemanager.less with 100% similarity]
theme/bootstrapbase/less/moodle/forms.less [moved from theme/bootstrap/less/moodle/forms.less with 99% similarity]
theme/bootstrapbase/less/moodle/grade.less [moved from theme/bootstrap/less/moodle/grade.less with 100% similarity]
theme/bootstrapbase/less/moodle/message.less [moved from theme/bootstrap/less/moodle/message.less with 100% similarity]
theme/bootstrapbase/less/moodle/modules.less [moved from theme/bootstrap/less/moodle/modules.less with 100% similarity]
theme/bootstrapbase/less/moodle/question.less [moved from theme/bootstrap/less/moodle/question.less with 100% similarity]
theme/bootstrapbase/less/moodle/responsive.less [moved from theme/bootstrap/less/moodle/responsive.less with 86% similarity]
theme/bootstrapbase/less/moodle/tables.less [moved from theme/bootstrap/less/moodle/tables.less with 100% similarity]
theme/bootstrapbase/less/moodle/tabs.less [moved from theme/bootstrap/less/moodle/tabs.less with 100% similarity]
theme/bootstrapbase/less/moodle/undo.less [moved from theme/bootstrap/less/moodle/undo.less with 100% similarity]
theme/bootstrapbase/less/moodle/user.less [moved from theme/bootstrap/less/moodle/user.less with 100% similarity]
theme/bootstrapbase/less/moodle/yui_fixes.less [moved from theme/bootstrap/less/moodle/yui_fixes.less with 100% similarity]
theme/bootstrapbase/pix/favicon.ico [moved from theme/bootstrap/pix/favicon.ico with 100% similarity]
theme/bootstrapbase/pix/fp/alias.png [moved from theme/bootstrap/pix/fp/alias.png with 100% similarity]
theme/bootstrapbase/pix/fp/alias_sm.png [moved from theme/bootstrap/pix/fp/alias_sm.png with 100% similarity]
theme/bootstrapbase/pix/fp/check.png [moved from theme/bootstrap/pix/fp/check.png with 100% similarity]
theme/bootstrapbase/pix/fp/cross.png [moved from theme/bootstrap/pix/fp/cross.png with 100% similarity]
theme/bootstrapbase/pix/fp/dnd_arrow.gif [moved from theme/bootstrap/pix/fp/dnd_arrow.gif with 100% similarity]
theme/bootstrapbase/pix/fp/link.png [moved from theme/bootstrap/pix/fp/link.png with 100% similarity]
theme/bootstrapbase/pix/fp/link_sm.png [moved from theme/bootstrap/pix/fp/link_sm.png with 100% similarity]
theme/bootstrapbase/pix/fp/path_folder.png [moved from theme/bootstrap/pix/fp/path_folder.png with 100% similarity]
theme/bootstrapbase/pix/fp/path_folder_rtl.png [moved from theme/bootstrap/pix/fp/path_folder_rtl.png with 100% similarity]
theme/bootstrapbase/pix/fp/view_icon_active.png [moved from theme/bootstrap/pix/fp/view_icon_active.png with 100% similarity]
theme/bootstrapbase/pix/fp/view_icon_inactive.png [moved from theme/bootstrap/pix/fp/view_icon_inactive.png with 100% similarity]
theme/bootstrapbase/pix/fp/view_icon_selected.png [moved from theme/bootstrap/pix/fp/view_icon_selected.png with 100% similarity]
theme/bootstrapbase/pix/fp/view_list_active.png [moved from theme/bootstrap/pix/fp/view_list_active.png with 100% similarity]
theme/bootstrapbase/pix/fp/view_list_inactive.png [moved from theme/bootstrap/pix/fp/view_list_inactive.png with 100% similarity]
theme/bootstrapbase/pix/fp/view_list_selected.png [moved from theme/bootstrap/pix/fp/view_list_selected.png with 100% similarity]
theme/bootstrapbase/pix/fp/view_tree_active.png [moved from theme/bootstrap/pix/fp/view_tree_active.png with 100% similarity]
theme/bootstrapbase/pix/fp/view_tree_inactive.png [moved from theme/bootstrap/pix/fp/view_tree_inactive.png with 100% similarity]
theme/bootstrapbase/pix/fp/view_tree_selected.png [moved from theme/bootstrap/pix/fp/view_tree_selected.png with 100% similarity]
theme/bootstrapbase/pix/glyphicons-halflings-white.png [moved from theme/bootstrap/pix/glyphicons-halflings-white.png with 100% similarity]
theme/bootstrapbase/pix/glyphicons-halflings.png [moved from theme/bootstrap/pix/glyphicons-halflings.png with 100% similarity]
theme/bootstrapbase/pix/header.jpg [moved from theme/bootstrap/pix/header.jpg with 100% similarity]
theme/bootstrapbase/pix/horizontal-menu-submenu-indicator.png [moved from theme/bootstrap/pix/horizontal-menu-submenu-indicator.png with 100% similarity]
theme/bootstrapbase/pix/screenshot.jpg [moved from theme/bootstrap/pix/screenshot.jpg with 100% similarity]
theme/bootstrapbase/pix/sprite.png [moved from theme/bootstrap/pix/sprite.png with 100% similarity]
theme/bootstrapbase/pix/vertical-menu-submenu-indicator.png [moved from theme/bootstrap/pix/vertical-menu-submenu-indicator.png with 100% similarity]
theme/bootstrapbase/pix/yui2-treeview-sprite-rtl.gif [moved from theme/bootstrap/pix/yui2-treeview-sprite-rtl.gif with 100% similarity]
theme/bootstrapbase/readme_moodle.txt [moved from theme/bootstrap/readme_moodle.txt with 84% similarity]
theme/bootstrapbase/renderers.php [moved from theme/bootstrap/renderers.php with 96% similarity]
theme/bootstrapbase/renderers/core.php [moved from theme/bootstrap/renderers/core.php with 98% similarity]
theme/bootstrapbase/style/README [new file with mode: 0644]
theme/bootstrapbase/style/editor.css [moved from theme/bootstrap/style/editor.css with 100% similarity]
theme/bootstrapbase/style/moodle.css [moved from theme/bootstrap/style/generated.css with 50% similarity]
theme/bootstrapbase/version.php [moved from theme/bootstrap/version.php with 85% similarity]
theme/bootstrapbase/yui/build/moodle-theme_bootstrap-bootstrap/moodle-theme_bootstrap-bootstrap-debug.js [moved from theme/bootstrap/yui/build/moodle-theme_bootstrap-bootstrap/moodle-theme_bootstrap-bootstrap-debug.js with 100% similarity]
theme/bootstrapbase/yui/build/moodle-theme_bootstrap-bootstrap/moodle-theme_bootstrap-bootstrap-min.js [moved from theme/bootstrap/yui/build/moodle-theme_bootstrap-bootstrap/moodle-theme_bootstrap-bootstrap-min.js with 100% similarity]
theme/bootstrapbase/yui/build/moodle-theme_bootstrap-bootstrap/moodle-theme_bootstrap-bootstrap.js [moved from theme/bootstrap/yui/build/moodle-theme_bootstrap-bootstrap/moodle-theme_bootstrap-bootstrap.js with 100% similarity]
theme/bootstrapbase/yui/build/moodle-theme_bootstrapbase-bootstrap/moodle-theme_bootstrapbase-bootstrap-debug.js [new file with mode: 0644]
theme/bootstrapbase/yui/build/moodle-theme_bootstrapbase-bootstrap/moodle-theme_bootstrapbase-bootstrap-min.js [new file with mode: 0644]
theme/bootstrapbase/yui/build/moodle-theme_bootstrapbase-bootstrap/moodle-theme_bootstrapbase-bootstrap.js [new file with mode: 0644]
theme/bootstrapbase/yui/src/bootstrap/build.json [moved from theme/bootstrap/yui/src/bootstrap/build.json with 68% similarity]
theme/bootstrapbase/yui/src/bootstrap/js/bootstrap.js [moved from theme/bootstrap/yui/src/bootstrap/js/bootstrap.js with 95% similarity]
theme/bootstrapbase/yui/src/bootstrap/js/bootstrapcollapse.js [moved from theme/bootstrap/yui/src/bootstrap/js/bootstrapcollapse.js with 100% similarity]
theme/bootstrapbase/yui/src/bootstrap/js/bootstrapdropdown.js [moved from theme/bootstrap/yui/src/bootstrap/js/bootstrapdropdown.js with 100% similarity]
theme/bootstrapbase/yui/src/bootstrap/js/bootstrapengine.js [moved from theme/bootstrap/yui/src/bootstrap/js/bootstrapengine.js with 100% similarity]
theme/bootstrapbase/yui/src/bootstrap/meta/bootstrap.json [moved from theme/bootstrap/yui/src/bootstrap/meta/bootstrap.json with 62% similarity]
theme/boxxie/config.php
theme/boxxie/lang/en/theme_boxxie.php
theme/boxxie/version.php
theme/brick/config.php
theme/brick/lang/en/theme_brick.php
theme/brick/version.php
theme/canvas/config.php
theme/canvas/style/core.css
theme/canvas/version.php
theme/clean/config.php
theme/clean/layout/general.php
theme/clean/lib.php
theme/clean/settings.php
theme/clean/version.php
theme/formal_white/config.php
theme/formal_white/db/install.php
theme/formal_white/db/upgrade.php
theme/formal_white/version.php
theme/formfactor/config.php
theme/formfactor/lang/en/theme_formfactor.php
theme/formfactor/version.php
theme/fusion/config.php
theme/fusion/lang/en/theme_fusion.php
theme/fusion/version.php
theme/image.php
theme/index.php
theme/leatherbound/config.php
theme/leatherbound/lang/en/theme_leatherbound.php
theme/leatherbound/version.php
theme/magazine/version.php
theme/mymobile/config.php
theme/mymobile/lang/en/theme_mymobile.php
theme/mymobile/layout/embedded.php
theme/mymobile/layout/general.php
theme/mymobile/lib.php
theme/mymobile/renderers.php
theme/mymobile/settings.php
theme/mymobile/version.php
theme/nimble/config.php
theme/nimble/lang/en/theme_nimble.php
theme/nimble/version.php
theme/nonzero/config.php
theme/nonzero/lang/en/theme_nonzero.php
theme/nonzero/lib.php
theme/nonzero/settings.php
theme/nonzero/version.php
theme/overlay/config.php
theme/overlay/lang/en/theme_overlay.php
theme/overlay/version.php
theme/serenity/version.php
theme/sky_high/config.php
theme/sky_high/version.php
theme/splash/version.php
theme/standard/config.php
theme/standard/version.php
theme/standardold/config.php
theme/standardold/version.php
theme/styles.php
theme/styles_debug.php
theme/switchdevice.php
theme/yui_combo.php
theme/yui_image.php
user/profile/field/checkbox/version.php
user/profile/field/datetime/version.php
user/profile/field/menu/version.php
user/profile/field/text/version.php
user/profile/field/textarea/version.php
version.php
webservice/amf/version.php
webservice/rest/version.php
webservice/soap/version.php
webservice/xmlrpc/version.php

index 35db018..8ea69e3 100644 (file)
@@ -127,7 +127,7 @@ if (function_exists('date_default_timezone_set') and function_exists('date_defau
 /** Used by library scripts to check they are being called by Moodle */
 define('MOODLE_INTERNAL', true);
 
-// Disables caching.. just in case.
+// Disables all caching.
 define('CACHE_DISABLE_ALL', true);
 
 // Check that PHP is of a sufficient version
index 27a38aa..dfc7a42 100644 (file)
@@ -29,6 +29,7 @@
  */
 
 define('CLI_SCRIPT', true);
+define('CACHE_DISABLE_ALL', true);
 
 // extra execution prevention - we can not just require config.php here
 if (isset($_SERVER['REMOTE_ADDR'])) {
index 72a03f0..a6b36ba 100644 (file)
@@ -30,6 +30,7 @@
  */
 
 define('CLI_SCRIPT', true);
+define('CACHE_DISABLE_ALL', true);
 
 require(dirname(dirname(dirname(__FILE__))).'/config.php');
 require_once($CFG->libdir.'/adminlib.php');       // various admin-only functions
index 9c1a913..329c79b 100644 (file)
@@ -47,6 +47,13 @@ if (!function_exists('iconv')) {
 
 define('NO_OUTPUT_BUFFERING', true);
 
+if (empty($_GET['cache']) and empty($_POST['cache'])) {
+    // Prevent caching at all cost when visiting this page directly,
+    // we redirect to self once we known no upgrades are necessary.
+    // Note: $_GET and $_POST are used here intentionally because our param cleaning is not loaded yet.
+    define('CACHE_DISABLE_ALL', true);
+}
+
 require('../config.php');
 require_once($CFG->libdir.'/adminlib.php');    // various admin-only functions
 require_once($CFG->libdir.'/upgradelib.php');  // general upgrade/install related functions
@@ -60,21 +67,28 @@ $showallplugins = optional_param('showallplugins', 0, PARAM_BOOL);
 $agreelicense   = optional_param('agreelicense', 0, PARAM_BOOL);
 $fetchupdates   = optional_param('fetchupdates', 0, PARAM_BOOL);
 $newaddonreq    = optional_param('installaddonrequest', null, PARAM_RAW);
+$cache          = optional_param('cache', 0, PARAM_BOOL);
 
-// Check some PHP server settings
-
-if (is_null($newaddonreq)) {
-    $PAGE->set_url('/admin/index.php');
-} else {
+// Set up PAGE.
+$url = new moodle_url('/admin/index.php');
+if (!is_null($newaddonreq)) {
     // We need to set the eventual add-on installation request in the $PAGE's URL
     // so that it is stored in $SESSION->wantsurl and the admin is redirected
     // correctly once they are logged-in.
-    $PAGE->set_url('/admin/index.php', array('installaddonrequest' => $newaddonreq));
+    $url->param('installaddonrequest', $newaddonreq);
 }
+if ($cache) {
+    $url->param('cache', $cache);
+}
+$PAGE->set_url($url);
+unset($url);
+
 $PAGE->set_pagelayout('admin'); // Set a default pagelayout
 
 $documentationlink = '<a href="http://docs.moodle.org/en/Installation">Installation docs</a>';
 
+// Check some PHP server settings
+
 if (ini_get_bool('session.auto_start')) {
     print_error('phpvaroff', 'debug', '', (object)array('name'=>'session.auto_start', 'link'=>$documentationlink));
 }
@@ -199,6 +213,14 @@ if (empty($CFG->version)) {
     print_error('missingconfigversion', 'debug');
 }
 
+// Detect config cache inconsistency, this happens when you switch branches on dev servers.
+if ($cache) {
+    if ($CFG->version != $DB->get_field('config', 'value', array('name'=>'version'))) {
+        purge_all_caches();
+        redirect(new moodle_url('/admin/index.php'), 'Config cache inconsistency detected, resetting caches...');
+    }
+}
+
 if ($version > $CFG->version) {  // upgrade
     purge_all_caches();
 
@@ -412,6 +434,12 @@ if (during_initial_install()) {
     upgrade_finished('upgradesettings.php');
 }
 
+// Now we can be sure everything was upgraded and caches work fine,
+// redirect if necessary to make sure caching is enabled.
+if (!$cache) {
+    redirect(new moodle_url($PAGE->url, array('cache' => 1)));
+}
+
 // Check for valid admin user - no guest autologin
 require_login(0, false);
 $context = context_system::instance();
@@ -498,7 +526,7 @@ admin_externalpage_setup('adminnotifications');
 if ($fetchupdates) {
     require_sesskey();
     $updateschecker->fetch();
-    redirect($PAGE->url);
+    redirect(new moodle_url('/admin/index.php'));
 }
 
 $output = $PAGE->get_renderer('core', 'admin');
index 659a56c..1ff7293 100644 (file)
@@ -78,9 +78,13 @@ class mnet_review_host_form extends moodleform {
         $mnet_peer = $this->_customdata['peer'];
 
         $mform->addElement('hidden', 'last_connect_time');
+        $mform->setType('last_connect_time', PARAM_INT);
         $mform->addElement('hidden', 'id');
+        $mform->setType('id', PARAM_INT);
         $mform->addElement('hidden', 'applicationid');
+        $mform->setType('applicationid', PARAM_INT);
         $mform->addElement('hidden', 'oldpublickey');
+        $mform->setType('oldpublickey', PARAM_PEM);
 
         $mform->addElement('text', 'name', get_string('site'), array('maxlength' => 80, 'size' => 50));
         $mform->setType('name', PARAM_NOTAGS);
@@ -148,6 +152,7 @@ class mnet_review_host_form extends moodleform {
             $mform->addGroup($radioarray, 'radioar', get_string('deleted'), array(' ', ' '), false);
         } else {
             $mform->addElement('hidden', 'deleted');
+            $mform->setType('deleted', PARAM_BOOL);
         }
 
         // finished with static stuff, print save button
index 30b4b9e..8ef4456 100644 (file)
@@ -50,6 +50,8 @@ class mnet_profile_form extends moodleform {
         }
 
         $mform->addElement('hidden', 'hostid', $this->_customdata['hostid']);
+        $mform->setType('hostid', PARAM_INT);
+
         $fields = mnet_profile_field_options();
 
         // Fields to import ----------------------------------------------------
index 497eead..63607e1 100644 (file)
@@ -39,6 +39,7 @@ class mnet_services_form extends moodleform {
         $myservices = mnet_get_service_info($mnet_peer);
 
         $mform->addElement('hidden', 'hostid', $mnet_peer->id);
+        $mform->setType('hostid', PARAM_INT);
 
         $count = 0;
         foreach ($myservices as $name => $versions) {
@@ -55,6 +56,8 @@ class mnet_services_form extends moodleform {
             $mform->addElement('html', '<h3>' .  get_string($name.'_name', $langmodule , $mnet_peer->name) . '</h3>' . get_string($name.'_description', $langmodule, $mnet_peer->name));
 
             $mform->addElement('hidden', 'exists[' . $version['serviceid'] . ']', 1);
+            // Temporary fix until MDL-38885 gets integrated.
+            $mform->setType('exists', PARAM_BOOL);
 
             $pubstr = get_string('publish','mnet');
             if (!empty($version['hostsubscribes'])) {
index 9f53ead..e708152 100644 (file)
@@ -681,7 +681,8 @@ class core_admin_renderer extends plugin_renderer_base {
         }
 
         $updateinfo .= $this->container_start('checkforupdates');
-        $updateinfo .= $this->single_button(new moodle_url($this->page->url, array('fetchupdates' => 1)), get_string('checkforupdates', 'core_plugin'));
+        $fetchurl = new moodle_url('/admin/index.php', array('fetchupdates' => 1, 'sesskey' => sesskey(), 'cache' => 1));
+        $updateinfo .= $this->single_button($fetchurl, get_string('checkforupdates', 'core_plugin'));
         if ($fetch) {
             $updateinfo .= $this->container(get_string('checkforupdateslast', 'core_plugin',
                 userdate($fetch, get_string('strftimedatetime', 'core_langconfig'))));
index 94b379d..e720160 100644 (file)
@@ -23,9 +23,12 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
         new lang_string('configprofileroles', 'admin'),
         array('student', 'teacher', 'editingteacher')));
 
-    $max_upload_choices = get_max_upload_sizes();
+    $maxbytes = 0;
+    if (!empty($CFG->maxbytes)) {
+        $maxbytes = $CFG->maxbytes;
+    }
+    $max_upload_choices = get_max_upload_sizes(0, 0, 0, $maxbytes);
     // maxbytes set to 0 will allow the maximum server limit for uploads
-    $max_upload_choices[0] = new lang_string('serverlimit', 'admin');
     $temp->add(new admin_setting_configselect('maxbytes', new lang_string('maxbytes', 'admin'), new lang_string('configmaxbytes', 'admin'), 0, $max_upload_choices));
     // 100MB
     $defaultuserquota = 104857600;
index 836d753..8f8cdbb 100644 (file)
@@ -1,4 +1,4 @@
-@admin
+@core @core_admin
 Feature: Display extended course names
   In order to display more info about the courses
   As a moodle admin
index 351e4d5..5d81113 100644 (file)
@@ -1,4 +1,4 @@
-@admin
+@core @core_admin
 Feature: An administrator can filter user accounts by role, cohort and other profile fields
   In order to find the user accounts I am looking for
   As a moodle admin
index e61208e..bc6e29f 100644 (file)
@@ -1,4 +1,4 @@
-@admin @_only_local
+@core @core_admin @_only_local
 Feature: Upload users
   In order to add users to the system
   As a moodle admin
index 8d18b1f..704a54c 100644 (file)
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900;
-$plugin->requires  = 2012112900;
+$plugin->version   = 2013050100;
+$plugin->requires  = 2013050100;
 $plugin->component = 'tool_assignmentupgrade';
-$plugin->dependencies = array('mod_assign' => 2012112900);
+$plugin->dependencies = array('mod_assign' => 2013050100);
index c803dd3..b28f4fc 100644 (file)
@@ -50,6 +50,9 @@ list($options, $unrecognized) = cli_get_params(
     )
 );
 
+if ($options['install'] or $options['drop']) {
+    define('CACHE_DISABLE_ALL', true);
+}
 
 // Checking util.php CLI script usage.
 $help = "
index d76edc8..c2f829b 100644 (file)
@@ -1,4 +1,4 @@
-@tool_behat
+@tool @tool_behat
 Feature: Page contents assertions
   In order to write good tests
   As a tests writer
index ef5a993..d09f880 100644 (file)
@@ -1,4 +1,4 @@
-@tool_behat
+@tool @tool_behat
 Feature: Set up contextual data for tests
   In order to write tests quickly
   As a moodle developer
index 066790f..7389d07 100644 (file)
@@ -1,4 +1,4 @@
-@tool_behat
+@tool @tool_behat
 Feature: Edit capabilities
   In order to extend and restrict moodle features
   As an admin or teacher
index 264c754..3fc9ce8 100644 (file)
@@ -1,4 +1,4 @@
-@tool_behat
+@tool @tool_behat
 Feature: List the system steps definitions
   In order to create new tests
   As a tests writer
index 866798f..4bf47d0 100644 (file)
@@ -1,4 +1,4 @@
-@tool_behat @core_form
+@tool @tool_behat
 Feature: Forms manipulation
   In order to interact with Moodle
   As a user
@@ -27,9 +27,9 @@ Feature: Forms manipulation
     And I log in as "admin"
     And I follow "Course 1"
     And I turn editing mode on
-    And I add a "forum" to section "1"
+    And I add a "Quiz" to section "1"
     When I expand all fieldsets
-    Then I should see "Display word count"
+    Then I should see "Close the quiz"
     And I should see "Group mode"
     And I should see "Grouping"
     And I should not see "Show more..."
index 550386f..8ced5fd 100644 (file)
@@ -1,4 +1,4 @@
-@tool_behat
+@tool @tool_behat
 Feature: Transform steps arguments
   In order to write tests with complex nasty arguments
   As a tests writer
index 53d9ee8..e64ef5d 100644 (file)
@@ -1,4 +1,4 @@
-@tool_behat
+@tool @tool_behat
 Feature: Set up the testing environment
   In order to execute automated acceptance tests
   As a moodle developer
index a5ddb15..e9e5e39 100644 (file)
@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012120700;
-$plugin->requires  = 2012120300; // Requires Moodle 2.5.
+$plugin->version   = 2013050100;
+$plugin->requires  = 2013050100; // Requires Moodle 2.5.
 $plugin->component = 'tool_behat';
index 0162c96..e14328a 100644 (file)
@@ -25,6 +25,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2012112900; // Requires this Moodle version
+$plugin->version   = 2013050100; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2013050100; // Requires this Moodle version
 $plugin->component = 'tool_capability'; // Full name of the plugin (used for diagnostics)
index 89c4cf2..2909c58 100644 (file)
@@ -25,6 +25,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900;
-$plugin->requires  = 2012112900;
+$plugin->version   = 2013050100;
+$plugin->requires  = 2013050100;
 $plugin->component = 'tool_customlang'; // Full name of the plugin (used for diagnostics)
index 75d1f5f..49c897d 100644 (file)
@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2012112900; // Requires this Moodle version.
+$plugin->version   = 2013050100; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2013050100; // Requires this Moodle version.
 $plugin->component = 'tool_dbtransfer'; // Full name of the plugin (used for diagnostics).
index 69970eb..0e01250 100644 (file)
@@ -25,8 +25,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2012112900; // Requires this Moodle version
+$plugin->version   = 2013050100; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2013050100; // Requires this Moodle version
 $plugin->component = 'tool_generator'; // Full name of the plugin (used for diagnostics)
 
 $plugin->maturity  = MATURITY_ALPHA; // this version's maturity level
index 35741ed..dc429d0 100644 (file)
@@ -25,8 +25,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2012112900; // Requires this Moodle version
+$plugin->version   = 2013050100; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2013050100; // Requires this Moodle version
 $plugin->component = 'tool_health'; // Full name of the plugin (used for diagnostics)
 
 $plugin->maturity  = MATURITY_ALPHA; // this version's maturity level
index de2204f..5524bf9 100644 (file)
@@ -25,6 +25,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2012112900; // Requires this Moodle version
+$plugin->version   = 2013050100; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2013050100; // Requires this Moodle version
 $plugin->component = 'tool_innodb'; // Full name of the plugin (used for diagnostics)
index fa4babb..903f354 100644 (file)
@@ -366,13 +366,6 @@ class tool_installaddon_installer {
             'ssl_verifyhost' => 2,
         );
 
-        $cacertfile = $CFG->dataroot.'/moodleorgca.crt';
-        if (is_readable($cacertfile)) {
-            // Do not use CA certs provided by the operating system. Instead,
-            // use this CA cert to verify the ZIP provider.
-            $options['cainfo'] = $cacertfile;
-        }
-
         $curl = new curl(array('proxy' => true));
 
         $result = $curl->download_one($source, null, $options);
index 49cc334..b6693ba 100644 (file)
@@ -151,13 +151,6 @@ class tool_installaddon_pluginfo_client {
             'CURLOPT_SSL_VERIFYPEER' => true,
         );
 
-        $cacertfile = $CFG->dataroot.'/moodleorgca.crt';
-        if (is_readable($cacertfile)) {
-            // Do not use CA certs provided by the operating system. Instead,
-            // use this CA cert to verify the updates provider.
-            $options['CURLOPT_CAINFO'] = $cacertfile;
-        }
-
         return $options;
     }
 
index 94ab2e5..dd9fc5e 100644 (file)
@@ -24,6 +24,6 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component  = 'tool_installaddon';
-$plugin->version    = 2013031400;
-$plugin->requires   = 2013031400;
+$plugin->version    = 2013050100;
+$plugin->requires   = 2013050100;
 $plugin->maturity   = MATURITY_BETA;
index 0cb98e6..400d1cd 100644 (file)
@@ -25,6 +25,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2012112900; // Requires this Moodle version
+$plugin->version   = 2013050100; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2013050100; // Requires this Moodle version
 $plugin->component = 'tool_langimport'; // Full name of the plugin (used for diagnostics)
index 62a091a..a71d28b 100644 (file)
@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2012112900; // Requires this Moodle version
+$plugin->version   = 2013050100; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2013050100; // Requires this Moodle version
 $plugin->component = 'tool_multilangupgrade'; // Full name of the plugin (used for diagnostics)
 
index b457025..035ce7b 100644 (file)
@@ -60,6 +60,10 @@ if (file_exists(__DIR__.'/../../../../vendor/phpunit/phpunit/PHPUnit/Autoload.ph
     }
 }
 
+if ($options['install'] or $options['drop']) {
+    define('CACHE_DISABLE_ALL', true);
+}
+
 if ($options['run']) {
     unset($options);
     unset($unrecognized);
index a993604..0885cc2 100644 (file)
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2012112900; // Requires this Moodle version
+$plugin->version   = 2013050100; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2013050100; // Requires this Moodle version
 $plugin->component = 'tool_phpunit'; // Full name of the plugin (used for diagnostics)
 
index 3db930c..a8c6c0e 100644 (file)
@@ -25,6 +25,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2012112900; // Requires this Moodle version
+$plugin->version   = 2013050100; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2013050100; // Requires this Moodle version
 $plugin->component = 'tool_profiling'; // Full name of the plugin (used for diagnostics)
index 16ece8b..5b9090e 100644 (file)
@@ -25,6 +25,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900;
-$plugin->requires  = 2012112900;
+$plugin->version   = 2013050100;
+$plugin->requires  = 2013050100;
 $plugin->component = 'tool_qeupgradehelper'; // Full name of the plugin (used for diagnostics)
index aeb5cd7..37d8952 100644 (file)
@@ -25,8 +25,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2012112900; // Requires this Moodle version
+$plugin->version   = 2013050100; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2013050100; // Requires this Moodle version
 $plugin->component = 'tool_replace'; // Full name of the plugin (used for diagnostics)
 
 $plugin->maturity  = MATURITY_ALPHA; // this version's maturity level
index 00b29d6..e6c9b92 100644 (file)
@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900;
-$plugin->requires  = 2012112900;
+$plugin->version   = 2013050100;
+$plugin->requires  = 2013050100;
 $plugin->component = 'tool_spamcleaner'; // Full name of the plugin (used for diagnostics)
 
index c43391f..366fe7f 100644 (file)
@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900;
-$plugin->requires  = 2012112900;
+$plugin->version   = 2013050100;
+$plugin->requires  = 2013050100;
 $plugin->component = 'tool_timezoneimport'; // Full name of the plugin (used for diagnostics)
 
index edd9eb8..3b6e669 100644 (file)
@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2012112900; // Requires this Moodle version
+$plugin->version   = 2013050100; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2013050100; // Requires this Moodle version
 $plugin->component = 'tool_unsuproles'; // Full name of the plugin (used for diagnostics)
 
index dd1baec..30a0dbf 100644 (file)
@@ -497,6 +497,7 @@ if ($formdata = $mform2->is_cancelled()) {
 
             $upt->track('username', html_writer::link(new moodle_url('/user/profile.php', array('id'=>$existinguser->id)), s($existinguser->username)), 'normal', false);
             $upt->track('suspended', $stryesnooptions[$existinguser->suspended] , 'normal', false);
+            $upt->track('auth', $existinguser->auth, 'normal', false);
 
             if (is_siteadmin($user->id)) {
                 $upt->track('status', $strusernotupdatedadmin, 'error');
@@ -510,8 +511,6 @@ if ($formdata = $mform2->is_cancelled()) {
             //load existing profile data
             profile_load_data($existinguser);
 
-            $upt->track('auth', $existinguser->auth, 'normal', false);
-
             $doupdate = false;
             $dologout = false;
 
index 8645f1c..6de83e5 100644 (file)
@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012120700; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2012112900; // Requires this Moodle version
+$plugin->version   = 2013050100; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2013050100; // Requires this Moodle version
 $plugin->component = 'tool_uploaduser'; // Full name of the plugin (used for diagnostics)
 
index ae5a6b4..1f53caf 100644 (file)
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2012112900; // Requires this Moodle version
+$plugin->version   = 2013050100; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2013050100; // Requires this Moodle version
 $plugin->component = 'tool_xmldb'; // Full name of the plugin (used for diagnostics)
 
index 6b22044..7e8e5d0 100644 (file)
@@ -1,22 +1,32 @@
 <?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/>.
 
 /**
- * @author Martin Dougiamas
- * @author Jerome GUTIERREZ
- * @author Iñaki Arenaza
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
  * Authentication Plugin: CAS Authentication
  *
  * Authentication using CAS (Central Authentication Server).
  *
- * 2006-08-28  File created.
+ * @author Martin Dougiamas
+ * @author Jerome GUTIERREZ
+ * @author Iñaki Arenaza
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @package auth_cas
  */
 
-if (!defined('MOODLE_INTERNAL')) {
-    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
-}
+defined('MOODLE_INTERNAL') || die();
 
 require_once($CFG->dirroot.'/auth/ldap/auth.php');
 require_once($CFG->dirroot.'/auth/cas/CAS/CAS.php');
index 0369963..33cf33a 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
@@ -38,8 +37,7 @@
  * We have optimized it as best as we could for PostgreSQL and MySQL, with 27K students
  * we have seen this take 10 minutes.
  *
- * @package    auth
- * @subpackage CAS
+ * @package    auth_cas
  * @copyright  2007 Jerome Gutierrez - based on code by Martin Langhoff
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
index 70a82a0..c30522c 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
@@ -16,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'auth_cas', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_cas', language 'en'.
  *
  * @package   auth_cas
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
index 11b32ca..3be1c89 100644 (file)
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    auth
- * @subpackage cas
+ * @package    auth_cas
  * @author     Martin Dougiamas
  * @author     Jerome GUTIERREZ
  * @author     Iñaki Arenaza
@@ -27,6 +26,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2013010800;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2012112900;        // Requires this Moodle version
+$plugin->version   = 2013050100;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2013050100;        // Requires this Moodle version
 $plugin->component = 'auth_cas';        // Full name of the plugin (used for diagnostics)
index 914a9fa..5b69e9e 100644 (file)
@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2012112900;        // Requires this Moodle version
+$plugin->version   = 2013050100;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2013050100;        // Requires this Moodle version
 $plugin->component = 'auth_db';         // Full name of the plugin (used for diagnostics)
index 777fe9f..9ac59bd 100644 (file)
@@ -1,20 +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/>.
 
 /**
- * @author Martin Dougiamas
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
  * Authentication Plugin: Email Authentication
  *
- * Standard authentication function.
- *
- * 2006-08-28  File created.
+ * @author Martin Dougiamas
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @package auth_email
  */
 
-if (!defined('MOODLE_INTERNAL')) {
-    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
-}
+defined('MOODLE_INTERNAL') || die();
 
 require_once($CFG->libdir.'/authlib.php');
 
index e1dbb71..6104551 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
@@ -16,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'auth_email', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_email', language 'en'.
  *
  * @package   auth_email
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
index e5e074d..d1f9822 100644 (file)
 /**
  * Version details
  *
- * @package    auth
- * @subpackage email
+ * @package    auth_email
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version   = 2012112900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2012112900;        // Requires this Moodle version
+$plugin->version   = 2013050100;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2013050100;        // Requires this Moodle version
 $plugin->component = 'auth_email';      // Full name of the plugin (used for diagnostics)
index 73e803d..75c8bd0 100644 (file)
@@ -1,19 +1,29 @@
 <?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/>.
+
 /**
- * @author Martin Dougiamas
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
  * Authentication Plugin: FirstClass Authentication
- *
  * Authentication using a FirstClass server.
- *
- * 2006-08-28  File created.
+
+ * @package auth_fc
+ * @author Martin Dougiamas
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  */
 
-if (!defined('MOODLE_INTERNAL')) {
-    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
-}
+defined('MOODLE_INTERNAL') || die();
 
 require_once($CFG->libdir.'/authlib.php');
 
index 7bc3498..46e75fc 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
@@ -16,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'auth_fc', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_fc', language 'en'.
  *
  * @package   auth_fc
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
index 0d52794..e361f81 100644 (file)
 /**
  * Version details
  *
- * @package    auth
- * @subpackage fc
+ * @package    auth_fc
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2012112900;        // Requires this Moodle version
+$plugin->version   = 2013050100;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2013050100;        // Requires this Moodle version
 $plugin->component = 'auth_fc';         // Full name of the plugin (used for diagnostics)
index 17df433..442f93e 100644 (file)
@@ -1,20 +1,29 @@
 <?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/>.
 
 /**
- * @author Martin Dougiamas
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
  * Authentication Plugin: IMAP Authentication
- *
  * Authenticates against an IMAP server.
  *
- * 2006-08-31  File created.
+ * @package auth_imap
+ * @author Martin Dougiamas
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  */
 
-if (!defined('MOODLE_INTERNAL')) {
-    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
-}
+defined('MOODLE_INTERNAL') || die();
 
 require_once($CFG->libdir.'/authlib.php');
 
index a13b8be..ccfe27b 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
@@ -16,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'auth_imap', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_imap', language 'en'.
  *
  * @package   auth_imap
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
index c88fe31..55d996d 100644 (file)
 /**
  * Version details
  *
- * @package    auth
- * @subpackage imap
+ * @package    auth_imap
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2012112900;        // Requires this Moodle version
+$plugin->version   = 2013050100;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2013050100;        // Requires this Moodle version
 $plugin->component = 'auth_imap';       // Full name of the plugin (used for diagnostics)
index 00f0bf9..d32f6bd 100644 (file)
@@ -1,21 +1,30 @@
 <?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/>.
 
 /**
- * @author Martin Dougiamas
- * @author Iñaki Arenaza
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
  * Authentication Plugin: LDAP Authentication
- *
  * Authentication using LDAP (Lightweight Directory Access Protocol).
  *
- * 2006-08-28  File created.
+ * @package auth_ldap
+ * @author Martin Dougiamas
+ * @author Iñaki Arenaza
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  */
 
-if (!defined('MOODLE_INTERNAL')) {
-    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
-}
+defined('MOODLE_INTERNAL') || die();
 
 // See http://support.microsoft.com/kb/305144 to interprete these values.
 if (!defined('AUTH_AD_ACCOUNTDISABLE')) {
index 57637ca..ee15538 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
@@ -42,8 +41,7 @@
  * We have optimized it as best as we could for PostgreSQL and MySQL, with 27K students
  * we have seen this take 10 minutes.
  *
- * @package    auth
- * @subpackage ldap
+ * @package    auth_ldap
  * @copyright  2004 Martin Langhoff
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
index 00d7015..54c174b 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
@@ -16,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'auth_ldap', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_ldap', language 'en'.
  *
  * @package   auth_ldap
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
index 40e9fb5..6f44d63 100644 (file)
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    auth
- * @subpackage ldap
+ * @package    auth_ldap
  * @author     Martin Dougiamas
  * @author     Iñaki Arenaza
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -26,6 +25,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2013010800;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2012112900;        // Requires this Moodle version
+$plugin->version   = 2013050100;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2013050100;        // Requires this Moodle version
 $plugin->component = 'auth_ldap';       // Full name of the plugin (used for diagnostics)
index 0c521e8..3b4fdae 100644 (file)
@@ -18,8 +18,7 @@
  * Authentication Plugin: Manual Authentication
  * Just does a simple check against the moodle database.
  *
- * @package    auth
- * @subpackage manual
+ * @package    auth_manual
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
index 0c37b61..ab21ba6 100644 (file)
@@ -17,8 +17,7 @@
 /**
  * Manual authentication plugin upgrade code
  *
- * @package    auth
- * @subpackage manual
+ * @package    auth_manual
  * @copyright  2011 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
index 69f6cd0..53d8909 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
@@ -16,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'auth_manual', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_manual', language 'en'.
  *
  * @package   auth_manual
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
index ce33730..b52f35d 100644 (file)
 /**
  * Manual authentication plugin version information
  *
- * @package    auth
- * @subpackage manual
+ * @package    auth_manual
  * @copyright  2011 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2012112900;        // Requires this Moodle version
+$plugin->version   = 2013050100;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2013050100;        // Requires this Moodle version
 $plugin->component = 'auth_manual';     // Full name of the plugin (used for diagnostics)
index 203d161..db7328b 100644 (file)
@@ -1,20 +1,29 @@
 <?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/>.
 
 /**
- * @author Martin Dougiamas
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
  * Authentication Plugin: Moodle Network Authentication
- *
  * Multiple host authentication support for Moodle Network.
  *
- * 2006-11-01  File created.
+ * @package auth_mnet
+ * @author Martin Dougiamas
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  */
 
-if (!defined('MOODLE_INTERNAL')) {
-    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
-}
+defined('MOODLE_INTERNAL') || die();
 
 require_once($CFG->libdir.'/authlib.php');
 
index 743f1ff..8a371d3 100644 (file)
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-
 /**
  * This file contains the mnet services for the mnet authentication plugin
  *
  * @since 2.0
- * @package moodlecore
- * @subpackage auth
+ * @package auth_mnet
  * @copyright 2010 Penny Leach
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
index 2f65822..4147bff 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,7 @@
 /**
  * Keeps track of upgrades to the auth_mnet plugin
  *
- * @package    auth
- * @subpackage mnet
+ * @package    auth_mnet
  * @copyright  2010 David Mudrak <david@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
index d44d058..d72e206 100644 (file)
@@ -1,15 +1,26 @@
 <?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/>.
 
 /**
- * @author Martin Dougiamas
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
  * Authentication Plugin: Moodle Network Authentication
- *
  * Multiple host authentication support for Moodle Network.
  *
- * 2006-11-01  File created.
+ * @package auth_mnet
+ * @author Martin Dougiamas
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  */
 
 require_once dirname(dirname(dirname(__FILE__))) . '/config.php';
index 1bcd01e..59adbf3 100644 (file)
@@ -1,15 +1,26 @@
 <?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/>.
 
 /**
- * @author Martin Dougiamas
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
  * Authentication Plugin: Moodle Network Authentication
- *
  * Multiple host authentication support for Moodle Network.
  *
- * 2006-11-01  File created.
+ * @package auth_mnet
+ * @author Martin Dougiamas
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  */
 
 require_once dirname(dirname(dirname(__FILE__))) . '/config.php';
index 915b4c2..7084050 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
@@ -16,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'auth_mnet', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_mnet', language 'en'.
  *
  * @package   auth_mnet
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
index a091fa2..765b59e 100644 (file)
 /**
  * Manual authentication plugin version information
  *
- * @package    auth
- * @subpackage mnet
+ * @package    auth_mnet
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2012112900;        // Requires this Moodle version
+$plugin->version   = 2013050100;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2013050100;        // Requires this Moodle version
 $plugin->component = 'auth_mnet';       // Full name of the plugin (used for diagnostics)
index 495b505..c2ad283 100644 (file)
@@ -1,20 +1,29 @@
 <?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/>.
 
 /**
- * @author Martin Dougiamas
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
  * Authentication Plugin: NNTP Authentication
- *
  * Authenticates against an NNTP server.
  *
- * 2006-08-31  File created.
+ * @package auth_nntp
+ * @author Martin Dougiamas
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  */
 
-if (!defined('MOODLE_INTERNAL')) {
-    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
-}
+defined('MOODLE_INTERNAL') || die();
 
 require_once($CFG->libdir.'/authlib.php');
 
index 096f7f7..fa10cac 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
@@ -16,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'auth_nntp', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_nntp', language 'en'.
  *
  * @package   auth_nntp
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
index 5a533dc..5984171 100644 (file)
 /**
  * Version information
  *
- * @package    auth
- * @subpackage nntp
+ * @package    auth_nntp
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2012112900;        // Requires this Moodle version
+$plugin->version   = 2013050100;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2013050100;        // Requires this Moodle version
 $plugin->component = 'auth_nntp';       // Full name of the plugin (used for diagnostics)
index 72f5fa8..29f018e 100644 (file)
@@ -1,20 +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/>.
 
 /**
+ * Nologin authentication login - prevents user login.
+ *
+ * @package auth_nologin
  * @author Petr Skoda
  * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
- * Authentication Plugin: No Authentication
- *
- * No authentication at all. This method approves everything!
- *
- * 2007-02-18  File created.
  */
 
-if (!defined('MOODLE_INTERNAL')) {
-    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
-}
+defined('MOODLE_INTERNAL') || die();
 
 require_once($CFG->libdir.'/authlib.php');
 
index ad4ba16..edb4c79 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
@@ -16,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'auth_nologin', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_nologin', language 'en'.
  *
  * @package   auth_nologin
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
index a9879ce..a5cc794 100644 (file)
 /**
  * Version information
  *
- * @package    auth
- * @subpackage nologin
+ * @package    auth_nologin
  * @copyright  2011 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2012112900;        // Requires this Moodle version
+$plugin->version   = 2013050100;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2013050100;        // Requires this Moodle version
 $plugin->component = 'auth_nologin';    // Full name of the plugin (used for diagnostics)
index 00eaf04..9d3bfc2 100644 (file)
@@ -1,20 +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/>.
 
 /**
+ * Anobody can login with any password.
+ *
+ * @package auth_none
  * @author Martin Dougiamas
  * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
- * Authentication Plugin: No Authentication
- *
- * No authentication at all. This method approves everything!
- *
- * 2006-08-31  File created.
  */
 
-if (!defined('MOODLE_INTERNAL')) {
-    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
-}
+defined('MOODLE_INTERNAL') || die();
 
 require_once($CFG->libdir.'/authlib.php');
 
index d5cf02b..a65dbd5 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
@@ -16,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'auth_none', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_none', language 'en'.
  *
  * @package   auth_none
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
index 80b43e1..eb2b3bc 100644 (file)
 /**
  * Version information
  *
- * @package    auth
- * @subpackage none
+ * @package    auth_none
  * @copyright  2011 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2012112900;        // Requires this Moodle version
+$plugin->version   = 2013050100;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2013050100;        // Requires this Moodle version
 $plugin->component = 'auth_none';       // Full name of the plugin (used for diagnostics)
index c0afbe0..fd76a09 100644 (file)
@@ -1,10 +1,20 @@
 <?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/>.
 
 /**
- * @author Martin Dougiamas
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
  * Authentication Plugin: PAM Authentication
  *
  * PAM (Pluggable Authentication Modules) for Moodle
  * Website 1: http://elearning.zhwin.ch/
  * Website 2: http://birdy1976.com/
  *
- * License:  GPL License v2
- *
- * 2006-08-31  File created.
+ * @package auth_pam
+ * @author Martin Dougiamas
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  */
 
-if (!defined('MOODLE_INTERNAL')) {
-    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
-}
+defined('MOODLE_INTERNAL') || die();
 
 require_once($CFG->libdir.'/authlib.php');
 
index 3f9fee1..f8d5375 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
@@ -16,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'auth_pam', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_pam', language 'en'.