Updating for 1.7.2 release

It used not to work with random questions, and there were problems with the computation of the grade, and regrading. Fix thanks to Paulo Matos, who not only fixed the bug and tested it, but was also incredibly patient waiting for me to have time to commit the changes to CVS.

This commit also includes a backport of a small state logic changes to the 1.7 stable branch.

.gitignore

@@ -1,28 +0,0 @@
-# This file specifies intentionally untracked files that all Moodle git
-# repositories should ignore. It is recommended not to modify this file in your
-# local clone. Instead, use .git/info/exclude and add new records there as
-# needed.
-#
-# Example: if you deploy a contributed plugin mod/foobar into your site, put
-# the following line into .git/info/exclude file in your Moodle clone:
-# /mod/foobar/
-#
-# See gitignore(5) man page for more details
-#
-/config.php
-/lib/editor/tinymce/extra/tools/temp/
-*~
-*.swp
-/tags
-/TAGS
-/cscope.*
-/.patches/
-/.idea/
-/nbproject/
-CVS
-.DS_Store
-/.settings/
-/.project
-/.buildpath
-/.cache
-phpunit.xml

COPYING.txt

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

README.txt

@@ -1,18 +1,21 @@
+README     $Id$
+------
+
 QUICK INSTALL
 =============
 
-For the impatient, here is a basic outline of the
-installation process, which normally takes me only
+For the impatient, here is a basic outline of the 
+installation process, which normally takes me only 
 a few minutes:
 
-1) Move the Moodle files into your web directory.
+1) Move the Moodle files into your web directory. 
 
 2) Create a single database for Moodle to store all
    it's tables in (or choose an existing database).
 
-3) Visit your Moodle site with a browser, you should
+3) Visit your Moodle site with a browser, you should 
    be taken to the install.php script, which will lead
-   you through creating a config.php file and then
+   you through creating a config.php file and then 
    setting up Moodle, creating an admin account etc.
 
 4) Set up a cron task to call the file admin/cron.php
@@ -21,7 +24,11 @@ a few minutes:
 
 For more information, see the INSTALL DOCUMENTATION:
 
-   http://docs.moodle.org/en/Installing_Moodle
+   http://docs.moodle.org/en/Installing_Moodle 
+
+A local copy can also be found in 
+
+   lang/en_utf8/help/install.html   (or your language)
 
 
 Good luck and have fun!

TRADEMARK.txt

@@ -1,34 +0,0 @@
-------------------------
-Moodle Trademark License
-------------------------
-
-The name Moodle™ is a registered trademark of the Moodle Trust.
-
-A key part of the business model that allows us to produce and
-distribute Moodle as completely Free open source software is that
-we restrict the commercial use of the Moodle trademark to those
-who have contracted to support Moodle development (Moodle Partners).
-
-If you are intending to use the name (and/or logo) to advertise
-generic Moodle™ services (eg Moodle Hosting, Moodle Support,
-Moodle Certification, Moodle Training, Moodle Consulting,
-Moodle Customisation, Moodle Courseware Development, Moodle
-Theme design, Moodle Integrations, Moodle Installations, etc)
-or as the name of a software package, then you must seek
-direct permission in writing from the Moodle Trust via the
-moodle.com helpdesk, in accordance with normal trademark
-restrictions.
-
-There are no restrictions on how you use the name in other
-contexts (for example, if you use Moodle just to provide
-courses then you can use the name freely to refer to it.)
-
-If you aren't sure of a particular case, please ask us via
-http://moodle.com/helpdesk: we'll be happy to either provide
-you with official permission in writing or help you fix
-your wording.
-
-Martin Dougiamas
-Executive Director
-Moodle Trust
-http://moodle.com

admin/auth.php

@@ -1,103 +1,330 @@
-<?php
+<?PHP  // $Id$
+       // config.php - allows admin to edit all configuration variables
 
-/**
- * Allows admin to edit all auth plugin settings.
- *
- * JH: copied and Hax0rd from admin/enrol.php and admin/filters.php
- *
- */
+    require_once('../config.php');
 
-require_once('../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->libdir.'/tablelib.php');
+    require_once($CFG->libdir.'/adminlib.php');
 
-require_login();
-require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('userauthentication', $adminroot);
 
-$returnurl = new moodle_url('/admin/settings.php', array('section'=>'manageauths'));
+    $auth = optional_param('auth', '', PARAM_SAFEDIR);
 
-$PAGE->set_url($returnurl);
 
-$action = optional_param('action', '', PARAM_ACTION);
-$auth   = optional_param('auth', '', PARAM_PLUGIN);
+    $focus = '';
 
-get_enabled_auth_plugins(true); // fix the list of enabled auths
-if (empty($CFG->auth)) {
-    $authsenabled = array();
-} else {
-    $authsenabled = explode(',', $CFG->auth);
+/// If data submitted, then process and store.
+
+    if ($config = data_submitted()) {
+
+        if (!confirm_sesskey()) {
+            error(get_string('confirmsesskeybad', 'error'));
+        }
+
+        $config = (array)$config;
+
+        // extract and sanitize the auth key explicitly
+        $modules = get_list_of_plugins("auth");
+        if (in_array($config['auth'], $modules)) {
+            $auth = $config['auth'];
+        } else {
+            notify("Error defining the authentication method");
+        }
+
+        // load the auth plugin library
+        require_once("{$CFG->dirroot}/auth/$auth/lib.php");
+
+        $err = array();
+        if (function_exists('auth_validate_form')) {
+            auth_validate_form($config, $err);
+        }
+
+        if (count($err) == 0) {
+            foreach ($config as $name => $value) {
+                if (preg_match('/^pluginconfig_(.+?)$/', $name, $matches)) {
+                    $plugin = "auth/$auth";
+                    $name   = $matches[1];
+                    if (! set_config($name, $value, $plugin)) {
+                        notify("Problem saving config $name as $value for plugin $plugin");
+                    }
+                } else { // normal handling for
+                    if (! set_config($name, $value)) {
+                        notify("Problem saving config $name as $value");
+                    }
+                }
+            }
+            redirect("auth.php?sesskey=$USER->sesskey", get_string("changessaved"), 1);
+            exit;
+
+        } else {
+            foreach ($err as $key => $value) {
+                $focus = "form.$key";
+            }
+        }
+    }
+
+/// Otherwise fill and print the form.
+
+    if (empty($config)) {
+        $config = $CFG;
+    }
+
+    $modules = get_list_of_plugins("auth");
+    $options = array();
+    foreach ($modules as $module) {
+        $options[$module] = get_string("auth_$module"."title", "auth");
+    }
+    asort($options);
+    if (!empty($auth) && in_array($auth, $modules)) {
+    } else {
+        $auth = $config->auth;
+    }
+
+    // changepassword link replaced by individual auth setting
+    if (!empty($config->changepassword)) {
+        if (empty($config->{'auth_'.$auth.'_changepasswordurl'})) {
+            $config->{'auth_'.$auth.'_changepasswordurl'} = $config->changepassword;
+        }
+        set_config('changepassword','');
+    }
+
+    $auth = clean_param($auth,PARAM_SAFEDIR);
+    require_once("$CFG->dirroot/auth/$auth/lib.php"); //just to make sure that current authentication functions are loaded
+    if (! isset($config->guestloginbutton)) {
+        $config->guestloginbutton = 1;
+    }
+    if (! isset($config->alternateloginurl)) {
+        $config->alternateloginurl = '';
+    }
+    if (! isset($config->auth_instructions)) {
+        $config->auth_instructions = "";
+    }
+    if (! isset($config->changepassword)) {
+        $config->changepassword = "";
+    }
+    if (! isset($config->{'auth_'.$auth.'_changepasswordurl'})) {
+        $config->{'auth_'.$auth.'_changepasswordurl'} = '';
+    }
+    if (! isset($config->{'auth_'.$auth.'_changepasswordhelp'})) {
+        $config->{'auth_'.$auth.'_changepasswordhelp'} = '';
+    }
+    $user_fields = array("firstname", "lastname", "email", "phone1", "phone2", "department", "address", "city", "country", "description", "idnumber", "lang");
+
+    $guestoptions[0] = get_string("hide");
+    $guestoptions[1] = get_string("show");
+
+    $createoptions[0] = get_string("no");
+    $createoptions[1] = get_string("yes");
+
+    $strauthentication        = get_string("authentication");
+    $strauthenticationoptions = get_string("authenticationoptions","auth");
+    $strsettings = get_string("settings");
+    $strusers = get_string("users");
+
+    admin_externalpage_print_header($adminroot);
+
+    echo "<center><b>";
+    echo "<form target=\"{$CFG->framename}\" name=\"authmenu\" method=\"post\" action=\"auth.php\">";
+    echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\" />";
+    print_string("chooseauthmethod","auth");
+
+    echo '&nbsp;&nbsp;';
+
+    choose_from_menu ($options, "auth", $auth, "","document.location='auth.php?sesskey=$USER->sesskey&auth='+document.authmenu.auth.options[document.authmenu.auth.selectedIndex].value", "");
+
+    echo "</b></center><br />";
+
+    print_simple_box_start("center", "100%");
+    print_heading($options[$auth]);
+
+    print_simple_box_start("center", "60%", '', 5, 'informationbox');
+    print_string("auth_$auth"."description", "auth");
+    print_simple_box_end();
+
+    echo "<hr />";
+
+    print_heading($strsettings);
+
+    echo "<table border=\"0\" width=\"100%\" cellpadding=\"4\">";
+
+    require_once("$CFG->dirroot/auth/$auth/config.html");
+    $CFG->pagepath = 'auth/' . $auth;
+
+    echo '<tr><td colspan="3">';
+    print_heading(get_string('auth_common_settings', 'auth'));
+    echo '<td/></tr>';
+
+    if ($auth != "email" and $auth != "none" and $auth != "manual") {
+        // display box for URL to change password. NB now on a per-method basis (multiple auth)
+        echo "<tr valign=\"top\">";
+        echo "<td align=\"right\" nowrap=\"nowrap\">";
+        print_string("changepassword", "auth");
+        echo ":</td>";
+        echo "<td>";
+        $passurl = $config->{'auth_'.$auth.'_changepasswordurl'};
+        echo "<input type=\"text\" name=\"auth_{$auth}_changepasswordurl\" size=\"40\" value=\"$passurl\" />";
+        echo "</td>";
+        echo "<td>";
+        print_string("auth_changepasswordurl_expl","auth",$auth);
+        echo "</td></tr>";
+
+        // display textbox for lost password help. NB now on a per-method basis (multiple auth)
+        echo "<tr valign=\"top\">";
+        echo "<td align=\"right\" nowrap=\"nowrap\">";
+        print_string("auth_changepasswordhelp", "auth");
+        echo ":</td>";
+        echo "<td>";
+        $passhelp = $config->{'auth_'.$auth.'_changepasswordhelp'};
+        echo "<textarea name=\"auth_{$auth}_changepasswordhelp\" cols=\"30\" rows=\"10\" wrap=\"virtual\">";
+        echo $passhelp;
+        echo "</textarea>\n";
+        echo "</td>";
+        echo "<td>";
+        print_string("auth_changepasswordhelp_expl","auth",$auth);
+        echo "</td></tr>";
+
+    }
+
+    echo "<tr valign=\"top\">";
+    echo "<td align=\"right\" nowrap=\"nowrap\">";
+    print_string("guestloginbutton", "auth");
+    echo ":</td>";
+    echo "<td>";
+    choose_from_menu($guestoptions, "guestloginbutton", $config->guestloginbutton, "");
+    echo "</td>";
+    echo "<td>";
+    print_string("showguestlogin","auth");
+    echo "</td></tr>";
+
+    if (function_exists('auth_user_create')){
+        echo "<tr valign=\"top\">";
+        echo "<td align=\"right\" nowrap=\"nowrap\">";
+        print_string("auth_user_create", "auth");
+        echo ":</td>";
+        echo "<td>";
+        choose_from_menu($createoptions, "auth_user_create", $config->auth_user_create, "");
+        echo "</td>";
+        echo "<td>";
+        print_string("auth_user_creation","auth");
+        echo "</td></tr>";
+    }
+
+
+/// An alternate url for the login form. It means we can use login forms that are integrated
+/// into non-moodle pages
+    echo '<tr valign="top">';
+    echo '<td algin="right" nowrap="nowrap">';
+    print_string('alternateloginurl', 'auth');
+    echo '</td>';
+    echo '<td>';
+    echo '<input type="text" size="40" name="alternateloginurl" alt="'.get_string('alternateloginurl', 'auth').'" value="'.$config->alternateloginurl.'" />';
+    echo '</td>';
+    echo '<td>';
+    print_string('alternatelogin', 'auth', htmlspecialchars($CFG->wwwroot.'/login/index.php'));
+    echo '</td>';
+    echo '</tr>';
+
+
+    echo '</table>';
+    echo '<p align="center"><input type="submit" value="'.get_string('savechanges').'"></p>';
+    echo '</form>';
+
+    print_simple_box_end();
+
+    admin_externalpage_print_footer($adminroot);
+    exit;
+
+/// Functions /////////////////////////////////////////////////////////////////
+
+//
+// Good enough for most auth plugins
+// but some may want a custom one if they are offering
+// other options
+// Note: pluginconfig_ fields have special handling.
+function print_auth_lock_options ($auth, $user_fields, $helptext, $retrieveopts, $updateopts) {
+
+    echo '<tr><td colspan="3">';
+    if ($retrieveopts) {
+        print_heading(get_string('auth_data_mapping', 'auth'));
+    } else {
+        print_heading(get_string('auth_fieldlocks', 'auth'));
+    }
+    echo '<td/></tr>';
+
+    $lockoptions = array ('unlocked'        => get_string('unlocked', 'auth'),
+                          'unlockedifempty' => get_string('unlockedifempty', 'auth'),
+                          'locked'          => get_string('locked', 'auth'));
+    $updatelocaloptions = array('oncreate'  => get_string('update_oncreate', 'auth'),
+                                'onlogin'   => get_string('update_onlogin', 'auth'));
+    $updateextoptions = array('0'  => get_string('update_never', 'auth'),
+                              '1'   => get_string('update_onupdate', 'auth'));
+
+    $pluginconfig = get_config("auth/$auth");
+
+    // helptext is on a field with rowspan
+    if (empty($helptext)) {
+                $helptext = '&nbsp;';
+    }
+
+    foreach ($user_fields as $field) {
+
+        // Define some vars we'll work with
+        if(empty($pluginconfig->{"field_map_$field"})) {
+            $pluginconfig->{"field_map_$field"} = '';
+        }
+        if(empty($pluginconfig->{"field_updatelocal_$field"})) {
+            $pluginconfig->{"field_updatelocal_$field"} = '';
+        }
+        if (empty($pluginconfig->{"field_updateremote_$field"})) {
+            $pluginconfig->{"field_updateremote_$field"} = '';
+        }
+        if (empty($pluginconfig->{"field_lock_$field"})) {
+            $pluginconfig->{"field_lock_$field"} = '';
+        }
+
+        // define the fieldname we display to the  user
+        $fieldname = $field;
+        if ($fieldname === 'lang') {
+            $fieldname = get_string('language');
+        } elseif (preg_match('/^(.+?)(\d+)$/', $fieldname, $matches)) {
+            $fieldname =  get_string($matches[1]) . ' ' . $matches[2];
+        } else {
+            $fieldname = get_string($fieldname);
+        }
+
+        echo '<tr valign="top"><td align="right">';
+        echo $fieldname;
+        echo '</td><td>';
+
+        if ($retrieveopts) {
+            $varname = 'field_map_' . $field;
+
+            echo "<input name=\"pluginconfig_{$varname}\" type=\"text\" size=\"30\" value=\"{$pluginconfig->$varname}\">";
+            echo '<div align="right">';
+            echo  get_string('auth_updatelocal', 'auth') . '&nbsp;&nbsp;';
+            choose_from_menu($updatelocaloptions, "pluginconfig_field_updatelocal_{$field}", $pluginconfig->{"field_updatelocal_$field"}, "");
+            echo '<br />';
+            if ($updateopts) {
+                echo  get_string('auth_updateremote', 'auth') . '&nbsp;&nbsp;';
+                 '&nbsp;&nbsp;';
+                choose_from_menu($updateextoptions, "pluginconfig_field_updateremote_{$field}", $pluginconfig->{"field_updateremote_$field"}, "");
+                echo '<br />';
+
+
+            }
+            echo  get_string('auth_fieldlock', 'auth') . '&nbsp;&nbsp;';
+            choose_from_menu($lockoptions, "pluginconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, "");
+            echo '</div>';
+        } else {
+            choose_from_menu($lockoptions, "pluginconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, "");
+        }
+        echo '</td>';
+        if (!empty($helptext)) {
+            echo '<td rowspan="' . count($user_fields) . '">' . $helptext . '</td>';
+            $helptext = '';
+        }
+        echo '</tr>';
+    }
 }
 
-if (!empty($auth) and !exists_auth_plugin($auth)) {
-    print_error('pluginnotinstalled', 'auth', $returnurl, $auth);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// process actions
-
-if (!confirm_sesskey()) {
-    redirect($returnurl);
-}
-
-switch ($action) {
-    case 'disable':
-        // remove from enabled list
-        $key = array_search($auth, $authsenabled);
-        if ($key !== false) {
-            unset($authsenabled[$key]);
-            set_config('auth', implode(',', $authsenabled));
-        }
-
-        if ($auth == $CFG->registerauth) {
-            set_config('registerauth', '');
-        }
-        session_gc(); // remove stale sessions
-        break;
-
-    case 'enable':
-        // add to enabled list
-        if (!in_array($auth, $authsenabled)) {
-            $authsenabled[] = $auth;
-            $authsenabled = array_unique($authsenabled);
-            set_config('auth', implode(',', $authsenabled));
-        }
-        session_gc(); // remove stale sessions
-        break;
-
-    case 'down':
-        $key = array_search($auth, $authsenabled);
-        // check auth plugin is valid
-        if ($key === false) {
-            print_error('pluginnotenabled', 'auth', $returnurl, $auth);
-        }
-        // move down the list
-        if ($key < (count($authsenabled) - 1)) {
-            $fsave = $authsenabled[$key];
-            $authsenabled[$key] = $authsenabled[$key + 1];
-            $authsenabled[$key + 1] = $fsave;
-            set_config('auth', implode(',', $authsenabled));
-        }
-        break;
-
-    case 'up':
-        $key = array_search($auth, $authsenabled);
-        // check auth is valid
-        if ($key === false) {
-            print_error('pluginnotenabled', 'auth', $returnurl, $auth);
-        }
-        // move up the list
-        if ($key >= 1) {
-            $fsave = $authsenabled[$key];
-            $authsenabled[$key] = $authsenabled[$key - 1];
-            $authsenabled[$key - 1] = $fsave;
-            set_config('auth', implode(',', $authsenabled));
-        }
-        break;
-
-    default:
-        break;
-}
-
-redirect($returnurl);
-
-
+?>

admin/auth_config.php

@@ -1,179 +0,0 @@
-<?php
-/**
- * Edit configuration for an individual auth plugin
- */
-
-require_once '../config.php';
-require_once $CFG->libdir.'/adminlib.php';
-
-$auth = required_param('auth', PARAM_PLUGIN);
-$PAGE->set_pagetype('admin-auth-' . $auth);
-
-admin_externalpage_setup('authsetting'.$auth);
-
-$authplugin = get_auth_plugin($auth);
-$err = array();
-
-$returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageauths";
-
-// save configuration changes
-if ($frm = data_submitted() and confirm_sesskey()) {
-
-    $authplugin->validate_form($frm, $err);
-
-    if (count($err) == 0) {
-
-        // save plugin config
-        if ($authplugin->process_config($frm)) {
-
-            // save field lock configuration
-            foreach ($frm as $name => $value) {
-                if (preg_match('/^lockconfig_(.+?)$/', $name, $matches)) {
-                    $plugin = "auth/$auth";
-                    $name   = $matches[1];
-                    set_config($name, $value, $plugin);
-                }
-            }
-            redirect($returnurl);
-            exit;
-        }
-    } else {
-        foreach ($err as $key => $value) {
-            $focus = "form.$key";
-        }
-    }
-} else {
-    $frmlegacystyle = get_config('auth/'.$auth);
-    $frmnewstyle    = get_config('auth_'.$auth);
-    $frm = (object)array_merge((array)$frmlegacystyle, (array)$frmnewstyle);
-}
-
-$user_fields = $authplugin->userfields;
-//$user_fields = array("firstname", "lastname", "email", "phone1", "phone2", "institution", "department", "address", "city", "country", "description", "idnumber", "lang");
-
-/// Get the auth title (from core or own auth lang files)
-    $authtitle = $authplugin->get_title();
-/// Get the auth descriptions (from core or own auth lang files)
-    $authdescription = $authplugin->get_description();
-
-// output configuration form
-echo $OUTPUT->header();
-
-// choose an authentication method
-echo "<form id=\"authmenu\" method=\"post\" action=\"auth_config.php\">\n";
-echo "<div>\n";
-echo "<input type=\"hidden\" name=\"sesskey\" value=\"".sesskey()."\" />\n";
-echo "<input type=\"hidden\" name=\"auth\" value=\"".$auth."\" />\n";
-
-// auth plugin description
-echo $OUTPUT->box_start();
-echo $OUTPUT->heading($authtitle);
-echo $OUTPUT->box_start('informationbox');
-echo $authdescription;
-echo $OUTPUT->box_end();
-echo "<hr />\n";
-$authplugin->config_form($frm, $err, $user_fields);
-echo $OUTPUT->box_end();
-echo '<p style="text-align: center"><input type="submit" value="' . get_string("savechanges") . "\" /></p>\n";
-echo "</div>\n";
-echo "</form>\n";
-
-echo $OUTPUT->footer();
-exit;
-
-/// Functions /////////////////////////////////////////////////////////////////
-
-// Good enough for most auth plugins
-// but some may want a custom one if they are offering
-// other options
-// Note: lockconfig_ fields have special handling.
-function print_auth_lock_options ($auth, $user_fields, $helptext, $retrieveopts, $updateopts) {
-    global $OUTPUT;
-    echo '<tr><td colspan="3">';
-    if ($retrieveopts) {
-        echo $OUTPUT->heading(get_string('auth_data_mapping', 'auth'));
-    } else {
-        echo $OUTPUT->heading(get_string('auth_fieldlocks', 'auth'));
-    }
-    echo '</td></tr>';
-
-    $lockoptions = array ('unlocked'        => get_string('unlocked', 'auth'),
-                          'unlockedifempty' => get_string('unlockedifempty', 'auth'),
-                          'locked'          => get_string('locked', 'auth'));
-    $updatelocaloptions = array('oncreate'  => get_string('update_oncreate', 'auth'),
-                                'onlogin'   => get_string('update_onlogin', 'auth'));
-    $updateextoptions = array('0'  => get_string('update_never', 'auth'),
-                              '1'   => get_string('update_onupdate', 'auth'));
-
-    $pluginconfig = get_config("auth/$auth");
-
-    // helptext is on a field with rowspan
-    if (empty($helptext)) {
-                $helptext = '&nbsp;';
-    }
-
-    foreach ($user_fields as $field) {
-
-        // Define some vars we'll work with
-        if (!isset($pluginconfig->{"field_map_$field"})) {
-            $pluginconfig->{"field_map_$field"} = '';
-        }
-        if (!isset($pluginconfig->{"field_updatelocal_$field"})) {
-            $pluginconfig->{"field_updatelocal_$field"} = '';
-        }
-        if (!isset($pluginconfig->{"field_updateremote_$field"})) {
-            $pluginconfig->{"field_updateremote_$field"} = '';
-        }
-        if (!isset($pluginconfig->{"field_lock_$field"})) {
-            $pluginconfig->{"field_lock_$field"} = '';
-        }
-
-        // define the fieldname we display to the  user
-        $fieldname = $field;
-        if ($fieldname === 'lang') {
-            $fieldname = get_string('language');
-        } elseif (preg_match('/^(.+?)(\d+)$/', $fieldname, $matches)) {
-            $fieldname =  get_string($matches[1]) . ' ' . $matches[2];
-        } elseif ($fieldname == 'url') {
-            $fieldname = get_string('webpage');
-        } else {
-            $fieldname = get_string($fieldname);
-        }
-        if ($retrieveopts) {
-            $varname = 'field_map_' . $field;
-
-            echo '<tr valign="top"><td align="right">';
-            echo '<label for="lockconfig_'.$varname.'">'.$fieldname.'</label>';
-            echo '</td><td>';
-
-            echo "<input id=\"lockconfig_{$varname}\" name=\"lockconfig_{$varname}\" type=\"text\" size=\"30\" value=\"{$pluginconfig->$varname}\" />";
-            echo '<div style="text-align: right">';
-            echo '<label for="menulockconfig_field_updatelocal_'.$field.'">'.get_string('auth_updatelocal', 'auth') . '</label>&nbsp;';
-            echo html_writer::select($updatelocaloptions, "lockconfig_field_updatelocal_{$field}", $pluginconfig->{"field_updatelocal_$field"}, false);
-            echo '<br />';
-            if ($updateopts) {
-                echo '<label for="menulockconfig_field_updateremote_'.$field.'">'.get_string('auth_updateremote', 'auth') . '</label>&nbsp;';
-                echo html_writer::select($updateextoptions, "lockconfig_field_updateremote_{$field}", $pluginconfig->{"field_updateremote_$field"}, false);
-                echo '<br />';
-
-
-            }
-            echo '<label for="menulockconfig_field_lock_'.$field.'">'.get_string('auth_fieldlock', 'auth') . '</label>&nbsp;';
-            echo html_writer::select($lockoptions, "lockconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, false);
-            echo '</div>';
-        } else {
-            echo '<tr valign="top"><td align="right">';
-            echo '<label for="menulockconfig_field_lock_'.$field.'">'.$fieldname.'</label>';
-            echo '</td><td>';
-            echo html_writer::select($lockoptions, "lockconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, false);
-        }
-        echo '</td>';
-        if (!empty($helptext)) {
-            echo '<td rowspan="' . count($user_fields) . '">' . $helptext . '</td>';
-            $helptext = '';
-        }
-        echo '</tr>';
-    }
-}
-
-

admin/block.php

@@ -1,28 +1,29 @@
-<?php
+<?PHP  // $Id$
 
 // block.php - allows admin to edit all local configuration variables for a block
 
     require_once('../config.php');
     require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('manageblocks', $adminroot);
+    require_once($CFG->libdir.'/blocklib.php');
 
     $blockid = required_param('block', PARAM_INT);
 
-    if(!$blockrecord = blocks_get_record($blockid)) {
-        print_error('blockdoesnotexist', 'error');
+    if(($blockrecord = blocks_get_record($blockid)) === false) {
+        error('This block does not exist');
     }
 
-    admin_externalpage_setup('blocksetting'.$blockrecord->name);
-
     $block = block_instance($blockrecord->name);
     if($block === false) {
-        print_error('blockcannotinistantiate', 'error');
+        error('Problem in instantiating block object');
     }
 
     // Define the data we're going to silently include in the instance config form here,
     // so we can strip them from the submitted data BEFORE handling it.
     $hiddendata = array(
         'block' => $blockid,
-        'sesskey' => sesskey()
+        'sesskey' => $USER->sesskey
     );
 
     /// If data submitted, then process and store.
@@ -30,10 +31,10 @@
     if ($config = data_submitted()) {
 
         if (!confirm_sesskey()) {
-             print_error('confirmsesskeybad', 'error');
+             error(get_string('confirmsesskeybad', 'error'));
         }
         if(!$block->has_config()) {
-            print_error('blockcannotconfig', 'error');
+            error('This block does not support global configuration');
         }
         $remove = array_keys($hiddendata);
         foreach($remove as $item) {
@@ -49,14 +50,16 @@
     $strmanageblocks = get_string('manageblocks');
     $strblockname = $block->get_title();
 
-    echo $OUTPUT->header();
+    // $CFG->pagepath is used to generate the body and id attributes for the body tag
+    // of the page. It is also used to generate the link to the Moodle Docs for this view.
+    $CFG->pagepath = 'block/' . $block->name() . '/config';
 
-    echo $OUTPUT->heading($strblockname);
 
-    echo $OUTPUT->notification('This block still uses an old-style config_global.html file. ' .
-            'It must be updated by a developer to use a settings.php file.');
+    admin_externalpage_print_header($adminroot);
 
-    echo $OUTPUT->box(get_string('configwarning', 'admin'), 'generalbox boxwidthnormal boxaligncenter');
+    print_heading($strblockname);
+
+    print_simple_box('<center>'.get_string('configwarning', 'admin').'</center>', 'center', '50%');
     echo '<br />';
 
     echo '<form method="post" action="block.php">';
@@ -65,12 +68,8 @@
         echo '<input type="hidden" name="'. $name .'" value="'. $val .'" />';
     }
     echo '</p>';
-
-    echo $OUTPUT->box_start();
-    include($CFG->dirroot.'/blocks/'. $block->name() .'/config_global.html');
-    echo $OUTPUT->box_end();
-
+    $block->config_print();
     echo '</form>';
-    echo $OUTPUT->footer();
-
+    admin_externalpage_print_footer($adminroot);
 
+?>

admin/blocks.php

@@ -1,19 +1,22 @@
-<?php
+<?PHP // $Id$
 
     // Allows the admin to configure blocks (hide/show, delete and configure)
 
     require_once('../config.php');
     require_once($CFG->libdir.'/adminlib.php');
+    require_once($CFG->libdir.'/blocklib.php');
     require_once($CFG->libdir.'/tablelib.php');
+    require_once($CFG->libdir.'/ddllib.php');
 
-    admin_externalpage_setup('manageblocks');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('manageblocks', $adminroot);
 
     $confirm  = optional_param('confirm', 0, PARAM_BOOL);
     $hide     = optional_param('hide', 0, PARAM_INT);
     $show     = optional_param('show', 0, PARAM_INT);
     $delete   = optional_param('delete', 0, PARAM_INT);
-    $unprotect = optional_param('unprotect', 0, PARAM_INT);
-    $protect = optional_param('protect', 0, PARAM_INT);
+    $multiple = optional_param('multiple', 0, PARAM_INT);
+
 
 /// Print headings
 
@@ -25,222 +28,199 @@
     $strsettings = get_string('settings');
     $strcourses = get_string('blockinstances', 'admin');
     $strname = get_string('name');
-    $strshowblockcourse = get_string('showblockcourse');
-    $strprotecthdr = get_string('blockprotect', 'admin'). $OUTPUT->help_icon('blockprotect','admin');
-    $strprotect = get_string('blockprotect', 'admin');
-    $strunprotect = get_string('blockunprotect', 'admin');
+    $strmultiple = get_string('blockmultiple', 'admin');
+
+    admin_externalpage_print_header($adminroot);
+
+    print_heading($strmanageblocks);
 
 /// If data submitted, then process and store.
 
     if (!empty($hide) && confirm_sesskey()) {
-        if (!$block = $DB->get_record('block', array('id'=>$hide))) {
-            print_error('blockdoesnotexist', 'error');
+        if (!$block = get_record('block', 'id', $hide)) {
+            error("Block doesn't exist!");
         }
-        $DB->set_field('block', 'visible', '0', array('id'=>$block->id));      // Hide block
-        admin_get_root(true, false);  // settings not required - only pages
+        set_field('block', 'visible', '0', 'id', $block->id);      // Hide block
     }
 
     if (!empty($show) && confirm_sesskey() ) {
-        if (!$block = $DB->get_record('block', array('id'=>$show))) {
-            print_error('blockdoesnotexist', 'error');
+        if (!$block = get_record('block', 'id', $show)) {
+            error("Block doesn't exist!");
         }
-        $DB->set_field('block', 'visible', '1', array('id'=>$block->id));      // Show block
-        admin_get_root(true, false);  // settings not required - only pages
+        set_field('block', 'visible', '1', 'id', $block->id);      // Show block
     }
 
-    if (!isset($CFG->undeletableblocktypes) || (!is_array($CFG->undeletableblocktypes) && !is_string($CFG->undeletableblocktypes))) {
-        $undeletableblocktypes = array('navigation', 'settings');
-    } else if (is_string($CFG->undeletableblocktypes)) {
-        $undeletableblocktypes = explode(',', $CFG->undeletableblocktypes);
-    } else {
-        $undeletableblocktypes = $CFG->undeletableblocktypes;
-    }
-
-    if (!empty($protect) && confirm_sesskey()) {
-        if (!$block = $DB->get_record('block', array('id'=>$protect))) {
-            print_error('blockdoesnotexist', 'error');
+    if (!empty($multiple) && confirm_sesskey()) {
+        if (!$block = blocks_get_record($multiple)) {
+            error("Block doesn't exist!");
         }
-        if (!in_array($block->name, $undeletableblocktypes)) {
-            $undeletableblocktypes[] = $block->name;
-            set_config('undeletableblocktypes', implode(',', $undeletableblocktypes));
-        }
-        admin_get_root(true, false);  // settings not required - only pages
-    }
-
-    if (!empty($unprotect) && confirm_sesskey()) {
-        if (!$block = $DB->get_record('block', array('id'=>$unprotect))) {
-            print_error('blockdoesnotexist', 'error');
-        }
-        if (in_array($block->name, $undeletableblocktypes)) {
-            $undeletableblocktypes = array_diff($undeletableblocktypes, array($block->name));
-            set_config('undeletableblocktypes', implode(',', $undeletableblocktypes));
-        }
-        admin_get_root(true, false);  // settings not required - only pages
+        $block->multiple = !$block->multiple;
+        update_record('block', $block);
     }
 
     if (!empty($delete) && confirm_sesskey()) {
-        echo $OUTPUT->header();
-        echo $OUTPUT->heading($strmanageblocks);
 
         if (!$block = blocks_get_record($delete)) {
-            print_error('blockdoesnotexist', 'error');
+            error("Block doesn't exist!");
         }
 
-        if (get_string_manager()->string_exists('pluginname', "block_$block->name")) {
-            $strblockname = get_string('pluginname', "block_$block->name");
-        } else {
+        if (!block_is_compatible($block->name)) {
             $strblockname = $block->name;
         }
+        else {
+            $blockobject = block_instance($block->name);
+            $strblockname = $blockobject->get_title();
+        }
 
         if (!$confirm) {
-            echo $OUTPUT->confirm(get_string('blockdeleteconfirm', '', $strblockname), 'blocks.php?delete='.$block->id.'&confirm=1', 'blocks.php');
-            echo $OUTPUT->footer();
+            notice_yesno(get_string('blockdeleteconfirm', '', $strblockname),
+                         'blocks.php?delete='.$block->id.'&amp;confirm=1&amp;sesskey='.$USER->sesskey,
+                         'blocks.php');
+            admin_externalpage_print_footer($adminroot);
             exit;
 
         } else {
-            uninstall_plugin('block', $block->name);
+            // Inform block it's about to be deleted
+            $blockobject = block_instance($block->name);
+            if ($blockobject) {
+                $blockobject->before_delete();  //only if we can create instance, block might have been already removed
+            }
+
+            // First delete instances and then block
+            $instances = get_records('block_instance', 'blockid', $block->id);
+            if(!empty($instances)) {
+                foreach($instances as $instance) {
+                    blocks_delete_instance($instance);
+                    blocks_delete_instance($instance, true);
+                }
+            }
+
+            // Delete block
+            if (!delete_records('block', 'id', $block->id)) {
+                notify("Error occurred while deleting the $strblockname record from blocks table");
+            }
+
+            // Then the tables themselves
+            if ($tables = $db->Metatables()) {
+                $prefix = $CFG->prefix.$block->name;
+                $prefix2 = $CFG->prefix.'block_'.$block->name;
+                foreach ($tables as $table) {
+                    if (strpos($table, $prefix) === 0 || strpos($table, $prefix2) === 0) {
+                    /// If the match has been due to the 1st condition, debug to developers
+                        if (strpos($table, $prefix) === 0) {
+                            debugging('This block has some wrongly named tables. See Moodle Docs coding guidelines (and MDL-6786)', DEBUG_DEVELOPER);
+                        }
+                    /// Strip prefix from $table
+                        $table = preg_replace("/^{$CFG->prefix}/", '', $table);
+                        $xmldb_table = new XMLDBTable($table);
+                        if (!drop_table($xmldb_table, true, false)) {
+                            notify("ERROR: while trying to drop table $table");
+                        }
+                    }
+                }
+            }
+            // Delete the capabilities that were defined by this block
+            capabilities_cleanup('block/'.$block->name);
 
-            $a = new stdClass();
             $a->block = $strblockname;
             $a->directory = $CFG->dirroot.'/blocks/'.$block->name;
             notice(get_string('blockdeletefiles', '', $a), 'blocks.php');
         }
     }
 
-    echo $OUTPUT->header();
-    echo $OUTPUT->heading($strmanageblocks);
-
 /// Main display starts here
 
 /// Get and sort the existing blocks
 
-    if (!$blocks = $DB->get_records('block', array(), 'name ASC')) {
-        print_error('noblocks', 'error');  // Should never happen
+    if (false === ($blocks = get_records('block'))) {
+        error('No blocks found!');  // Should never happen
     }
 
     $incompatible = array();
 
+    foreach ($blocks as $block) {
+        if(!block_is_compatible($block->name)) {
+            notify('Block '. $block->name .' is not compatible with the current version of Moodle and needs to be updated by a programmer.');
+            $incompatible[] = $block;
+            continue;
+        }
+        if(($blockobject = block_instance($block->name)) === false) {
+            // Failed to load
+            continue;
+        }
+        $blockbyname[$blockobject->get_title()] = $block->id;
+        $blockobjects[$block->id] = $blockobject;
+    }
+
+    if(empty($blockbyname)) {
+        error('One or more blocks are registered in the database, but they all failed to load!');
+    }
+
+    ksort($blockbyname);
+
 /// Print the table of all blocks
 
     $table = new flexible_table('admin-blocks-compatible');
 
-    $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'undeletable', 'delete', 'settings'));
-    $table->define_headers(array($strname, $strcourses, $strversion, $strhide.'/'.$strshow, $strprotecthdr, $strdelete, $strsettings));
+    $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'multiple', 'delete', 'settings'));
+    $table->define_headers(array($strname, $strcourses, $strversion, $strhide.'/'.$strshow, $strmultiple, $strdelete, $strsettings));
     $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
-    $table->set_attribute('class', 'compatibleblockstable blockstable generaltable');
+
+    $table->set_attribute('cellspacing', '0');
+    $table->set_attribute('id', 'blocks');
+    $table->set_attribute('class', 'generaltable generalbox');
+
     $table->setup();
-    $tablerows = array();
 
-    // Sort blocks using current locale.
-    $blocknames = array();
-    foreach ($blocks as $blockid=>$block) {
-        $blockname = $block->name;
-        if (file_exists("$CFG->dirroot/blocks/$blockname/block_$blockname.php")) {
-            $blocknames[$blockid] = get_string('pluginname', 'block_'.$blockname);
-        } else {
-            $blocknames[$blockid] = $blockname;
-        }
-    }
-    collatorlib::asort($blocknames);
+    foreach ($blockbyname as $blockname => $blockid) {
 
-    foreach ($blocknames as $blockid=>$strblockname) {
-        $block = $blocks[$blockid];
-        $blockname = $block->name;
+        $blockobject = $blockobjects[$blockid];
 
-        if (!file_exists("$CFG->dirroot/blocks/$blockname/block_$blockname.php")) {
-            $blockobject  = false;
-            $strblockname = '<span class="notifyproblem">'.$strblockname.' ('.get_string('missingfromdisk').')</span>';
-            $plugin = new stdClass();
-            $plugin->version = $block->version;
-
-        } else {
-            $plugin = new stdClass();
-            $plugin->version = '???';
-            if (file_exists("$CFG->dirroot/blocks/$blockname/version.php")) {
-                include("$CFG->dirroot/blocks/$blockname/version.php");
-            }
-
-            if (!$blockobject  = block_instance($block->name)) {
-                $incompatible[] = $block;
-                continue;
-            }
-        }
-
-        $delete = '<a href="blocks.php?delete='.$blockid.'&amp;sesskey='.sesskey().'">'.$strdelete.'</a>';
+        $delete = '<a href="blocks.php?delete='.$blockid.'&amp;sesskey='.$USER->sesskey.'">'.$strdelete.'</a>';
 
         $settings = ''; // By default, no configuration
-        if ($blockobject and $blockobject->has_config()) {
-            $blocksettings = admin_get_root()->locate('blocksetting' . $block->name);
-
-            if ($blocksettings instanceof admin_externalpage) {
-                $settings = '<a href="' . $blocksettings->url .  '">' . get_string('settings') . '</a>';
-            } else if ($blocksettings instanceof admin_settingpage) {
-                $settings = '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=blocksetting'.$block->name.'">'.$strsettings.'</a>';
-            } else {
-                $settings = '<a href="block.php?block='.$blockid.'">'.$strsettings.'</a>';
-            }
+        if($blockobject->has_config()) {
+            $settings = '<a href="block.php?block='.$blockid.'">'.$strsettings.'</a>';
         }
 
-        // MDL-11167, blocks can be placed on mymoodle, or the blogs page
-        // and it should not show up on course search page
-
-        $totalcount = $DB->count_records('block_instances', array('blockname'=>$blockname));
-        $count = $DB->count_records('block_instances', array('blockname'=>$blockname, 'pagetypepattern'=>'course-view-*'));
-
-        if ($count>0) {
-            $blocklist = "<a href=\"{$CFG->wwwroot}/course/search.php?blocklist=$blockid&amp;sesskey=".sesskey()."\" ";
-            $blocklist .= "title=\"$strshowblockcourse\" >$totalcount</a>";
-        }
-        else {
-            $blocklist = "$totalcount";
-        }
+        $count = count_records('block_instance', 'blockid', $blockid);
         $class = ''; // Nothing fancy, by default
 
-        if (!$blockobject) {
-            // ignore
-            $visible = '';
-        } else if ($blocks[$blockid]->visible) {
-            $visible = '<a href="blocks.php?hide='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strhide.'">'.
-                       '<img src="'.$OUTPUT->pix_url('i/hide') . '" class="icon" alt="'.$strhide.'" /></a>';
+        if ($blocks[$blockid]->visible) {
+            $visible = '<a href="blocks.php?hide='.$blockid.'&amp;sesskey='.$USER->sesskey.'" title="'.$strhide.'">'.
+                       '<img src="'.$CFG->pixpath.'/i/hide.gif" height="16" width="16" alt="" /></a>';
         } else {
-            $visible = '<a href="blocks.php?show='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strshow.'">'.
-                       '<img src="'.$OUTPUT->pix_url('i/show') . '" class="icon" alt="'.$strshow.'" /></a>';
+            $visible = '<a href="blocks.php?show='.$blockid.'&amp;sesskey='.$USER->sesskey.'" title="'.$strshow.'">'.
+                       '<img src="'.$CFG->pixpath.'/i/show.gif" height="16" width="16" alt="" /></a>';
             $class = ' class="dimmed_text"'; // Leading space required!
         }
-
-        if ($block->version == $plugin->version) {
-            $version = $block->version;
-        } else {
-            $version = "$block->version ($plugin->version)";
+        if ($blockobject->instance_allow_multiple()) {
+            if($blocks[$blockid]->multiple) {
+                $multiple = '<span style="white-space: nowrap;">'.get_string('yes').' (<a href="blocks.php?multiple='.$blockid.'&amp;sesskey='.$USER->sesskey.'">'.get_string('change', 'admin').'</a>)</span>';
+            }
+            else {
+                $multiple = '<span style="white-space: nowrap;">'.get_string('no').' (<a href="blocks.php?multiple='.$blockid.'&amp;sesskey='.$USER->sesskey.'">'.get_string('change', 'admin').'</a>)</span>';
+            }
+        }
+        else {
+            $multiple = '';
         }
 
-        if (!$blockobject) {
-            // ignore
-            $undeletable = '';
-        } else if (in_array($blockname, $undeletableblocktypes)) {
-            $undeletable = '<a href="blocks.php?unprotect='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strunprotect.'">'.
-                       '<img src="'.$OUTPUT->pix_url('t/unlock') . '" class="icon" alt="'.$strunprotect.'" /></a>';
-        } else {
-            $undeletable = '<a href="blocks.php?protect='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strprotect.'">'.
-                       '<img src="'.$OUTPUT->pix_url('t/unlock_gray') . '" class="icon" alt="'.$strprotect.'" /></a>';
-        }
-
-        $row = array(
-            '<span'.$class.'>'.$strblockname.'</span>',
-            $blocklist,
-            '<span'.$class.'>'.$version.'</span>',
+        $table->add_data(array(
+            '<span'.$class.'>'.$blockobject->get_title().'</span>',
+            $count,
+            $blockobject->get_version(),
             $visible,
-            $undeletable,
+            $multiple,
             $delete,
             $settings
-        );
-        $table->add_data($row);
+        ));
     }
 
     $table->print_html();
 
-    if (!empty($incompatible)) {
-        echo $OUTPUT->heading(get_string('incompatibleblocks', 'blockstable', 'admin'));
+    if(!empty($incompatible)) {
+        print_heading(get_string('incompatibleblocks', 'admin'));
 
         $table = new flexible_table('admin-blocks-incompatible');
 
@@ -248,19 +228,21 @@
         $table->define_headers(array($strname, $strdelete));
         $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
 
-        $table->set_attribute('class', 'incompatibleblockstable generaltable');
+        $table->set_attribute('cellspacing', '0');
+        $table->set_attribute('id', 'incompatible');
+        $table->set_attribute('class', 'generaltable generalbox');
 
         $table->setup();
 
         foreach ($incompatible as $block) {
             $table->add_data(array(
                 $block->name,
-                '<a href="blocks.php?delete='.$block->id.'&amp;sesskey='.sesskey().'">'.$strdelete.'</a>',
+                '<a href="blocks.php?delete='.$block->id.'&amp;sesskey='.$USER->sesskey.'">'.$strdelete.'</a>',
             ));
         }
         $table->print_html();
     }
 
-    echo $OUTPUT->footer();
-
+    admin_externalpage_print_footer($adminroot);
 
+?>

admin/category.php

@@ -1,160 +0,0 @@
-<?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/>.
-
-/**
- * This file is used to display a categories sub categories, external pages, and settings.
- *
- * @since      2.3
- * @package    admin
- * @copyright  2011 Sam Hemelryk
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once('../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-
-$category = required_param('category', PARAM_SAFEDIR);
-$return = optional_param('return','', PARAM_ALPHA);
-$adminediting = optional_param('adminedit', -1, PARAM_BOOL);
-
-/// no guest autologin
-require_login(0, false);
-$PAGE->set_context(get_context_instance(CONTEXT_SYSTEM));
-$PAGE->set_url('/admin/category.php', array('category' => $category));
-$PAGE->set_pagetype('admin-setting-' . $category);
-$PAGE->set_pagelayout('admin');
-$PAGE->navigation->clear_cache();
-
-$adminroot = admin_get_root(); // need all settings
-$settingspage = $adminroot->locate($category, true);
-
-if (empty($settingspage) or !($settingspage instanceof admin_category)) {
-    print_error('categoryerror', 'admin', "$CFG->wwwroot/$CFG->admin/");
-}
-
-if (!($settingspage->check_access())) {
-    print_error('accessdenied', 'admin');
-}
-
-
-$statusmsg = '';
-$errormsg  = '';
-
-if ($data = data_submitted() and confirm_sesskey()) {
-    if (admin_write_settings($data)) {
-        $statusmsg = get_string('changessaved');
-    }
-
-    if (empty($adminroot->errors)) {
-        switch ($return) {
-            case 'site': redirect("$CFG->wwwroot/");
-            case 'admin': redirect("$CFG->wwwroot/$CFG->admin/");
-        }
-    } else {
-        $errormsg = get_string('errorwithsettings', 'admin');
-        $firsterror = reset($adminroot->errors);
-    }
-    $adminroot = admin_get_root(true); //reload tree
-    $settingspage = $adminroot->locate($category, true);
-}
-
-if ($PAGE->user_allowed_editing() && $adminediting != -1) {
-    $USER->editing = $adminediting;
-}
-
-if ($PAGE->user_allowed_editing()) {
-    $url = clone($PAGE->url);
-    if ($PAGE->user_is_editing()) {
-        $caption = get_string('blockseditoff');
-        $url->param('adminedit', 'off');
-    } else {
-        $caption = get_string('blocksediton');
-        $url->param('adminedit', 'on');
-    }
-    $buttons = $OUTPUT->single_button($url, $caption, 'get');
-}
-
-$savebutton = false;
-$outputhtml = '';
-foreach ($settingspage->children as $childpage) {
-    if ($childpage->is_hidden()) {
-        continue;
-    }
-    if ($childpage instanceof admin_externalpage) {
-        $outputhtml .= $OUTPUT->heading(html_writer::link($childpage->url, $childpage->visiblename), 3);
-    } else if ($childpage instanceof admin_settingpage) {
-        $outputhtml .= $OUTPUT->heading(html_writer::link(new moodle_url('/'.$CFG->admin.'/settings.php', array('section' => $childpage->name)), $childpage->visiblename), 3);
-    } else if ($childpage instanceof admin_category) {
-        $outputhtml .= $OUTPUT->heading(html_writer::link(new moodle_url('/'.$CFG->admin.'/category.php', array('category' => $childpage->name)), get_string('admincategory', 'admin', $childpage->visiblename)), 3);
-    } else {
-        continue;
-    }
-    if (!empty($childpage->settings)) {
-        $outputhtml .= html_writer::start_tag('fieldset', array('class' => 'adminsettings'));
-        foreach ($childpage->settings as $setting) {
-            if (empty($setting->nosave)) {
-                $savebutton = true;
-            }
-            $fullname = $setting->get_full_name();
-            if (array_key_exists($fullname, $adminroot->errors)) {
-                $data = $adminroot->errors[$fullname]->data;
-            } else {
-                $data = $setting->get_setting();
-            }
-            $outputhtml .= html_writer::tag('div', '<!-- -->', array('class' => 'clearer'));
-            $outputhtml .= $setting->output_html($data);
-        }
-        $outputhtml .= html_writer::end_tag('fieldset');
-    }
-}
-if ($savebutton) {
-    $outputhtml .= html_writer::start_tag('div', array('class' => 'form-buttons'));
-    $outputhtml .= html_writer::empty_tag('input', array('class' => 'form-submit', 'type' => 'submit', 'value' => get_string('savechanges','admin')));
-    $outputhtml .= html_writer::end_tag('div');
-}
-
-$visiblepathtosection = array_reverse($settingspage->visiblepath);
-$PAGE->set_title("$SITE->shortname: " . implode(": ",$visiblepathtosection));
-$PAGE->set_heading($SITE->fullname);
-$PAGE->set_button($buttons);
-
-echo $OUTPUT->header();
-
-if ($errormsg !== '') {
-    echo $OUTPUT->notification($errormsg);
-} else if ($statusmsg !== '') {
-    echo $OUTPUT->notification($statusmsg, 'notifysuccess');
-}
-
-$path = array_reverse($settingspage->visiblepath);
-if (is_array($path)) {
-    $visiblename = join(' / ', $path);
-} else {
-    $visiblename = $path;
-}
-echo $OUTPUT->heading(get_string('admincategory', 'admin', $visiblename), 2);
-
-echo html_writer::start_tag('form', array('action' => '', 'method' => 'post', 'id' => 'adminsettings'));
-echo html_writer::start_tag('div');
-echo html_writer::input_hidden_params(new moodle_url($PAGE->url, array('sesskey' => sesskey(), 'return' => $return)));
-echo html_writer::end_tag('div');
-echo html_writer::start_tag('fieldset');
-echo html_writer::tag('div', '<!-- -->', array('class' => 'clearer'));
-echo $outputhtml;
-echo html_writer::end_tag('fieldset');
-echo html_writer::end_tag('form');
-
-echo $OUTPUT->footer();

admin/cli/automated_backups.php

@@ -1,100 +0,0 @@
-<?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/>.
-
-/**
- * Automated backups CLI cron
- *
- * This script executes
- *
- * @package    core
- * @subpackage cli
- * @copyright  2010 Sam Hemelryk
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require(dirname(dirname(dirname(__FILE__))).'/config.php');
-require_once($CFG->libdir.'/clilib.php');      // cli only functions
-require_once($CFG->libdir.'/cronlib.php');
-
-// now get cli options
-list($options, $unrecognized) = cli_get_params(array('help'=>false),
-                                               array('h'=>'help'));
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-if ($options['help']) {
-    $help =
-"Execute automated backups.
-
-This script executes automated backups completely and is designed to be
-called via cron.
-
-Options:
--h, --help            Print out this help
-
-Example:
-\$sudo -u www-data /usr/bin/php admin/cli/automated_backups.php
-";
-
-    echo $help;
-    die;
-}
-if (CLI_MAINTENANCE) {
-    echo "CLI maintenance mode active, backup execution suspended.\n";
-    exit(1);
-}
-
-if (moodle_needs_upgrading()) {
-    echo "Moodle upgrade pending, backup execution suspended.\n";
-    exit(1);
-}
-
-require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->libdir.'/gradelib.php');
-
-if (!empty($CFG->showcronsql)) {
-    $DB->set_debug(true);
-}
-if (!empty($CFG->showcrondebugging)) {
-    $CFG->debug = DEBUG_DEVELOPER;
-    $CFG->debugdisplay = true;
-}
-
-$starttime = microtime();
-
-/// emulate normal session
-cron_setup_user();
-
-/// Start output log
-$timenow = time();
-
-mtrace("Server Time: ".date('r',$timenow)."\n\n");
-
-// Run automated backups if required.
-require_once($CFG->dirroot.'/backup/util/includes/backup_includes.php');
-require_once($CFG->dirroot.'/backup/util/helper/backup_cron_helper.class.php');
-backup_cron_automated_helper::run_automated_backup(backup_cron_automated_helper::RUN_IMMEDIATELY);
-
-mtrace("Automated cron backups completed correctly");
-
-$difftime = microtime_diff($starttime, microtime());
-mtrace("Execution took ".$difftime." seconds");

admin/cli/cron.php

@@ -1,61 +0,0 @@
-<?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/>.
-
-/**
- * CLI cron
- *
- * This script looks through all the module directories for cron.php files
- * and runs them.  These files can contain cleanup functions, email functions
- * or anything that needs to be run on a regular basis.
- *
- * @package    core
- * @subpackage cli
- * @copyright  2009 Petr Skoda (http://skodak.org)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require(dirname(dirname(dirname(__FILE__))).'/config.php');
-require_once($CFG->libdir.'/clilib.php');      // cli only functions
-require_once($CFG->libdir.'/cronlib.php');
-
-// now get cli options
-list($options, $unrecognized) = cli_get_params(array('help'=>false),
-                                               array('h'=>'help'));
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-if ($options['help']) {
-    $help =
-"Execute periodic cron actions.
-
-Options:
--h, --help            Print out this help
-
-Example:
-\$sudo -u www-data /usr/bin/php admin/cli/cron.php
-";
-
-    echo $help;
-    die;
-}
-
-cron_run();

admin/cli/install.php

@@ -1,690 +0,0 @@
-<?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/>.
-
-/**
- * This script creates config.php file and prepares database.
- *
- * This script is not intended for beginners!
- * Potential problems:
- * - su to apache account or sudo before execution
- * - not compatible with Windows platform
- *
- * @package    core
- * @subpackage cli
- * @copyright  2009 Petr Skoda (http://skodak.org)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-// extra execution prevention - we can not just require config.php here
-if (isset($_SERVER['REMOTE_ADDR'])) {
-    exit(1);
-}
-
-$help =
-"Command line Moodle installer, creates config.php and initializes database.
-Please note you must execute this script with the same uid as apache
-or use chmod/chown after installation.
-
-Site defaults may be changed via local/defaults.php.
-
-Options:
---chmod=OCTAL-MODE    Permissions of new directories created within dataroot.
-                      Default is 2777. You may want to change it to 2770
-                      or 2750 or 750. See chmod man page for details.
---lang=CODE           Installation and default site language.
---wwwroot=URL         Web address for the Moodle site,
-                      required in non-interactive mode.
---dataroot=DIR        Location of the moodle data folder,
-                      must not be web accessible. Default is moodledata
-                      in the parent directory.
---dbtype=TYPE         Database type. Default is mysqli
---dbhost=HOST         Database host. Default is localhost
---dbname=NAME         Database name. Default is moodle
---dbuser=USERNAME     Database user. Default is root
---dbpass=PASSWORD     Database password. Default is blank
---dbsocket            Use database sockets. Available for some databases only.
---prefix=STRING       Table prefix for above database tables. Default is mdl_
---fullname=STRING     The fullname of the site
---shortname=STRING    The shortname of the site
---adminuser=USERNAME  Username for the moodle admin account. Default is admin
---adminpass=PASSWORD  Password for the moodle admin account,
-                      required in non-interactive mode.
---non-interactive     No interactive questions, installation fails if any
-                      problem encountered.
---agree-license       Indicates agreement with software license,
-                      required in non-interactive mode.
---allow-unstable      Install even if the version is not marked as stable yet,
-                      required in non-interactive mode.
--h, --help            Print out this help
-
-Example:
-\$sudo -u www-data /usr/bin/php admin/cli/install.php --lang=cs
-"; //TODO: localize, mark as needed in install - to be translated later when everything is finished
-
-
-// distro specific customisation
-$distrolibfile = dirname(dirname(dirname(__FILE__))).'/install/distrolib.php';
-$distro = null;
-if (file_exists($distrolibfile)) {
-    require_once($distrolibfile);
-    if (function_exists('distro_get_config')) {
-        $distro = distro_get_config();
-    }
-}
-
-// Nothing to do if config.php exists
-$configfile = dirname(dirname(dirname(__FILE__))).'/config.php';
-if (file_exists($configfile)) {
-    require($configfile);
-    require_once($CFG->libdir.'/clilib.php');
-    list($options, $unrecognized) = cli_get_params(array('help'=>false), array('h'=>'help'));
-
-    if ($options['help']) {
-        echo $help;
-        echo "\n\n";
-    }
-
-    if ($DB->get_manager()->table_exists('config')) {
-        cli_error(get_string('clialreadyinstalled', 'install'));
-    } else {
-        cli_error(get_string('clialreadyconfigured', 'install'));
-    }
-}
-
-$olddir = getcwd();
-
-// change directory so that includes below work properly
-chdir(dirname($_SERVER['argv'][0]));
-
-// Servers should define a default timezone in php.ini, but if they don't then make sure something is defined.
-// This is a quick hack.  Ideally we should ask the admin for a value.  See MDL-22625 for more on this.
-if (function_exists('date_default_timezone_set') and function_exists('date_default_timezone_get')) {
-    @date_default_timezone_set(@date_default_timezone_get());
-}
-
-// make sure PHP errors are displayed - helps with diagnosing of problems
-@error_reporting(E_ALL);
-@ini_set('display_errors', '1');
-// we need a lot of memory
-@ini_set('memory_limit', '128M');
-
-/** Used by library scripts to check they are being called by Moodle */
-define('MOODLE_INTERNAL', true);
-
-// Check that PHP is of a sufficient version
-if (version_compare(phpversion(), "5.3.2") < 0) {
-    $phpversion = phpversion();
-    // do NOT localise - lang strings would not work here and we CAN NOT move it after installib
-    fwrite(STDERR, "Moodle 2.1 or later requires at least PHP 5.3.2 (currently using version $phpversion).\n");
-    fwrite(STDERR, "Please upgrade your server software or install older Moodle version.\n");
-    exit(1);
-}
-
-// set up configuration
-$CFG = new stdClass();
-$CFG->lang                 = 'en';
-$CFG->dirroot              = dirname(dirname(dirname(__FILE__)));
-$CFG->libdir               = "$CFG->dirroot/lib";
-$CFG->wwwroot              = "http://localhost";
-$CFG->httpswwwroot         = $CFG->wwwroot;
-$CFG->docroot              = 'http://docs.moodle.org';
-$CFG->running_installer    = true;
-$CFG->early_install_lang   = true;
-
-$parts = explode('/', str_replace('\\', '/', dirname(dirname(__FILE__))));
-$CFG->admin                = array_pop($parts);
-
-//point pear include path to moodles lib/pear so that includes and requires will search there for files before anywhere else
-//the problem is that we need specific version of quickforms and hacked excel files :-(
-ini_set('include_path', $CFG->libdir.'/pear' . PATH_SEPARATOR . ini_get('include_path'));
-
-require_once($CFG->libdir.'/installlib.php');
-require_once($CFG->libdir.'/clilib.php');
-require_once($CFG->libdir.'/setuplib.php');
-require_once($CFG->libdir.'/textlib.class.php');
-require_once($CFG->libdir.'/weblib.php');
-require_once($CFG->libdir.'/dmllib.php');
-require_once($CFG->libdir.'/moodlelib.php');
-require_once($CFG->libdir.'/deprecatedlib.php');
-require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->libdir.'/componentlib.class.php');
-
-require($CFG->dirroot.'/version.php');
-$CFG->target_release = $release;
-
-//Database types
-$databases = array('mysqli' => moodle_database::get_driver_instance('mysqli', 'native'),
-                   'pgsql'  => moodle_database::get_driver_instance('pgsql',  'native'),
-                   'oci'    => moodle_database::get_driver_instance('oci',    'native'),
-                   'sqlsrv' => moodle_database::get_driver_instance('sqlsrv', 'native'), // MS SQL*Server PHP driver
-                   'mssql'  => moodle_database::get_driver_instance('mssql',  'native'), // FreeTDS driver
-                  );
-foreach ($databases as $type=>$database) {
-    if ($database->driver_installed() !== true) {
-        unset($databases[$type]);
-    }
-}
-if (empty($databases)) {
-    $defaultdb = '';
-} else {
-    reset($databases);
-    $defaultdb = key($databases);
-}
-
-// now get cli options
-list($options, $unrecognized) = cli_get_params(
-    array(
-        'chmod'             => isset($distro->directorypermissions) ? sprintf('%04o',$distro->directorypermissions) : '2777', // let distros set dir permissions
-        'lang'              => $CFG->lang,
-        'wwwroot'           => '',
-        'dataroot'          => empty($distro->dataroot) ? str_replace('\\', '/', dirname(dirname(dirname(dirname(__FILE__)))).'/moodledata'): $distro->dataroot, // initialised later after including libs or by distro
-        'dbtype'            => empty($distro->dbtype) ? $defaultdb : $distro->dbtype, // let distro skip dbtype selection
-        'dbhost'            => empty($distro->dbhost) ? 'localhost' : $distro->dbhost, // let distros set dbhost
-        'dbname'            => 'moodle',
-        'dbuser'            => empty($distro->dbuser) ? 'root' : $distro->dbuser, // let distros set dbuser
-        'dbpass'            => '',
-        'dbsocket'          => false,
-        'prefix'            => 'mdl_',
-        'fullname'          => '',
-        'shortname'         => '',
-        'adminuser'         => 'admin',
-        'adminpass'         => '',
-        'non-interactive'   => false,
-        'agree-license'     => false,
-        'allow-unstable'    => false,
-        'help'              => false
-    ),
-    array(
-        'h' => 'help'
-    )
-);
-
-$interactive = empty($options['non-interactive']);
-
-// set up language
-$lang = clean_param($options['lang'], PARAM_SAFEDIR);
-if (file_exists($CFG->dirroot.'/install/lang/'.$lang)) {
-    $CFG->lang = $lang;
-}
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-if ($options['help']) {
-    echo $help;
-    die;
-}
-
-//Print header
-echo get_string('cliinstallheader', 'install', $CFG->target_release)."\n";
-
-//Fist select language
-if ($interactive) {
-    cli_separator();
-    $languages = get_string_manager()->get_list_of_translations();
-    // format the langs nicely - 3 per line
-    $c = 0;
-    $langlist = '';
-    foreach ($languages as $key=>$lang) {
-        $c++;
-        $length = iconv_strlen($lang, 'UTF-8');
-        $padded = $lang.str_repeat(' ', 38-$length);
-        $langlist .= $padded;
-        if ($c % 3 == 0) {
-            $langlist .= "\n";
-        }
-    }
-    $default = $CFG->lang;
-    cli_heading(get_string('availablelangs', 'install'));
-    echo $langlist."\n";
-    $prompt = get_string('clitypevaluedefault', 'admin', $CFG->lang);
-    $error = '';
-    do {
-        echo $error;
-        $input = cli_input($prompt, $default);
-        $input = clean_param($input, PARAM_SAFEDIR);
-
-        if (!file_exists($CFG->dirroot.'/install/lang/'.$input)) {
-            $error = get_string('cliincorrectvalueretry', 'admin')."\n";
-        } else {
-            $error = '';
-        }
-    } while ($error !== '');
-    $CFG->lang = $input;
-} else {
-    // already selected and verified
-}
-
-// Set directorypermissions first
-$chmod = octdec(clean_param($options['chmod'], PARAM_INT));
-if ($interactive) {
-    cli_separator();
-    cli_heading(get_string('datarootpermission', 'install'));
-    $prompt = get_string('clitypevaluedefault', 'admin', decoct($chmod));
-    $error = '';
-    do {
-        echo $error;
-        $input = cli_input($prompt, decoct($chmod));
-        $input = octdec(clean_param($input, PARAM_INT));
-        if (empty($input)) {
-            $error = get_string('cliincorrectvalueretry', 'admin')."\n";
-        } else {
-            $error = '';
-        }
-    } while ($error !== '');
-    $chmod = $input;
-
-} else {
-    if (empty($chmod)) {
-        $a = (object)array('option' => 'chmod', 'value' => decoct($chmod));
-        cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
-    }
-}
-$CFG->directorypermissions = $chmod;
-
-//We need wwwroot before we test dataroot
-$wwwroot = clean_param($options['wwwroot'], PARAM_URL);
-$wwwroot = trim($wwwroot, '/');
-if ($interactive) {
-    cli_separator();
-    cli_heading(get_string('wwwroot', 'install'));
-    if (strpos($wwwroot, 'http') === 0) {
-        $prompt = get_string('clitypevaluedefault', 'admin', $wwwroot);
-    } else {
-        $wwwroot = null;
-        $prompt = get_string('clitypevalue', 'admin');
-    }
-    $error = '';
-    do {
-        echo $error;
-        $input = cli_input($prompt, $wwwroot);
-        $input = clean_param($input, PARAM_URL);
-        $input = trim($input, '/');
-        if (strpos($input, 'http') !== 0) {
-            $error = get_string('cliincorrectvalueretry', 'admin')."\n";
-        } else {
-            $error = '';
-        }
-    } while ($error !== '');
-    $wwwroot = $input;
-
-} else {
-    if (strpos($wwwroot, 'http') !== 0) {
-        $a = (object)array('option'=>'wwwroot', 'value'=>$wwwroot);
-        cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
-    }
-}
-$CFG->wwwroot       = $wwwroot;
-$CFG->httpswwwroot  = $CFG->wwwroot;
-
-
-//We need dataroot before lang download
-$CFG->dataroot = $options['dataroot'];
-if ($interactive) {
-    cli_separator();
-    $i=0;
-    while(is_dataroot_insecure()) {
-        $parrent = dirname($CFG->dataroot);
-        $i++;
-        if ($parrent == '/' or $parrent == '.' or preg_match('/^[a-z]:\\\?$/i', $parrent) or ($i > 100)) {
-            $CFG->dataroot = ''; //can not find secure location for dataroot
-            break;
-        }
-        $CFG->dataroot = dirname($parrent).'/moodledata';
-    }
-    cli_heading(get_string('dataroot', 'install'));
-    $error = '';
-    do {
-        if ($CFG->dataroot !== '') {
-            $prompt = get_string('clitypevaluedefault', 'admin', $CFG->dataroot);
-        } else {
-            $prompt = get_string('clitypevalue', 'admin');
-        }
-        echo $error;
-        $CFG->dataroot = cli_input($prompt, $CFG->dataroot);
-        if ($CFG->dataroot === '') {
-            $error = get_string('cliincorrectvalueretry', 'admin')."\n";
-        } else if (is_dataroot_insecure()) {
-            $CFG->dataroot = '';
-            $error = get_string('pathsunsecuredataroot', 'install')."\n";
-        } else {
-            if (install_init_dataroot($CFG->dataroot, $CFG->directorypermissions)) {
-                $error = '';
-            } else {
-                $a = (object)array('dataroot' => $CFG->dataroot);
-                $error = get_string('pathserrcreatedataroot', 'install', $a)."\n";
-            }
-        }
-
-    } while ($error !== '');
-
-} else {
-    if (is_dataroot_insecure()) {
-        cli_error(get_string('pathsunsecuredataroot', 'install'));
-    }
-    if (!install_init_dataroot($CFG->dataroot, $CFG->directorypermissions)) {
-        $a = (object)array('dataroot' => $CFG->dataroot);
-        cli_error(get_string('pathserrcreatedataroot', 'install', $a));
-    }
-}
-$CFG->tempdir  = $CFG->dataroot.'/temp';
-$CFG->cachedir = $CFG->dataroot.'/cache';
-
-// download required lang packs
-if ($CFG->lang !== 'en') {
-    $installer = new lang_installer($CFG->lang);
-    $results = $installer->run();
-    foreach ($results as $langcode => $langstatus) {
-        if ($langstatus === lang_installer::RESULT_DOWNLOADERROR) {
-            $a       = new stdClass();
-            $a->url  = $installer->lang_pack_url($langcode);
-            $a->dest = $CFG->dataroot.'/lang';
-            cli_problem(get_string('remotedownloaderror', 'error', $a));
-        }
-    }
-}
-
-// switch the string_manager instance to stop using install/lang/
-$CFG->early_install_lang = false;
-$CFG->langotherroot      = $CFG->dataroot.'/lang';
-$CFG->langlocalroot      = $CFG->dataroot.'/lang';
-get_string_manager(true);
-
-// make sure we are installing stable release or require a confirmation
-if (isset($maturity)) {
-    if (($maturity < MATURITY_STABLE) and !$options['allow-unstable']) {
-        $maturitylevel = get_string('maturity'.$maturity, 'admin');
-
-        if ($interactive) {
-            cli_separator();
-            cli_heading(get_string('notice'));
-            echo get_string('maturitycorewarning', 'admin', $maturitylevel) . PHP_EOL;
-            echo get_string('morehelp') . ': ' . get_docs_url('admin/versions') . PHP_EOL;
-            echo get_string('continue') . PHP_EOL;
-            $prompt = get_string('cliyesnoprompt', 'admin');
-            $input = cli_input($prompt, '', array(get_string('clianswerno', 'admin'), get_string('cliansweryes', 'admin')));
-            if ($input == get_string('clianswerno', 'admin')) {
-                exit(1);
-            }
-        } else {
-            cli_problem(get_string('maturitycorewarning', 'admin', $maturitylevel));
-            cli_error(get_string('maturityallowunstable', 'admin'));
-        }
-    }
-}
-
-// ask for db type - show only drivers available
-if ($interactive) {
-    $options['dbtype'] = strtolower($options['dbtype']);
-    cli_separator();
-    cli_heading(get_string('databasetypehead', 'install'));
-    foreach ($databases as $type=>$database) {
-        echo " $type \n";
-    }
-    if (!empty($databases[$options['dbtype']])) {
-        $prompt = get_string('clitypevaluedefault', 'admin', $options['dbtype']);
-    } else {
-        $prompt = get_string('clitypevalue', 'admin');
-    }
-    $CFG->dbtype = cli_input($prompt, $options['dbtype'], array_keys($databases));
-
-} else {
-    if (empty($databases[$options['dbtype']])) {
-        $a = (object)array('option'=>'dbtype', 'value'=>$options['dbtype']);
-        cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
-    }
-    $CFG->dbtype = $options['dbtype'];
-}
-$database = $databases[$CFG->dbtype];
-
-
-// ask for db host
-if ($interactive) {
-    cli_separator();
-    cli_heading(get_string('databasehost', 'install'));
-    if ($options['dbhost'] !== '') {
-        $prompt = get_string('clitypevaluedefault', 'admin', $options['dbhost']);
-    } else {
-        $prompt = get_string('clitypevalue', 'admin');
-    }
-    $CFG->dbhost = cli_input($prompt, $options['dbhost']);
-
-} else {
-    $CFG->dbhost = $options['dbhost'];
-}
-
-// ask for db name
-if ($interactive) {
-    cli_separator();
-    cli_heading(get_string('databasename', 'install'));
-    if ($options['dbname'] !== '') {
-        $prompt = get_string('clitypevaluedefault', 'admin', $options['dbname']);
-    } else {
-        $prompt = get_string('clitypevalue', 'admin');
-    }
-    $CFG->dbname = cli_input($prompt, $options['dbname']);
-
-} else {
-    $CFG->dbname = $options['dbname'];
-}
-
-// ask for db prefix
-if ($interactive) {
-    cli_separator();
-    cli_heading(get_string('dbprefix', 'install'));
-    //TODO: solve somehow the prefix trouble for oci
-    if ($options['prefix'] !== '') {
-        $prompt = get_string('clitypevaluedefault', 'admin', $options['prefix']);
-    } else {
-        $prompt = get_string('clitypevalue', 'admin');
-    }
-    $CFG->prefix = cli_input($prompt, $options['prefix']);
-
-} else {
-    $CFG->prefix = $options['prefix'];
-}
-
-// ask for db user
-if ($interactive) {
-    cli_separator();
-    cli_heading(get_string('databaseuser', 'install'));
-    if ($options['dbuser'] !== '') {
-        $prompt = get_string('clitypevaluedefault', 'admin', $options['dbuser']);
-    } else {
-        $prompt = get_string('clitypevalue', 'admin');
-    }
-    $CFG->dbuser = cli_input($prompt, $options['dbuser']);
-
-} else {
-    $CFG->dbuser = $options['dbuser'];
-}
-
-// ask for db password
-if ($interactive) {
-    cli_separator();
-    cli_heading(get_string('databasepass', 'install'));
-    do {
-        if ($options['dbpass'] !== '') {
-            $prompt = get_string('clitypevaluedefault', 'admin', $options['dbpass']);
-        } else {
-            $prompt = get_string('clitypevalue', 'admin');
-        }
-
-        $CFG->dbpass = cli_input($prompt, $options['dbpass']);
-        if (function_exists('distro_pre_create_db')) { // Hook for distros needing to do something before DB creation
-            $distro = distro_pre_create_db($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix, array('dbpersist'=>0, 'dbsocket'=>$options['dbsocket']), $distro);
-        }
-        $hint_database = install_db_validate($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix, array('dbpersist'=>0, 'dbsocket'=>$options['dbsocket']));
-    } while ($hint_database !== '');
-
-} else {
-    $CFG->dbpass = $options['dbpass'];
-    $hint_database = install_db_validate($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix, array('dbpersist'=>0, 'dbsocket'=>$options['dbsocket']));
-    if ($hint_database !== '') {
-        cli_error(get_string('dbconnectionerror', 'install'));
-    }
-}
-
-// ask for fullname
-if ($interactive) {
-    cli_separator();
-    cli_heading(get_string('fullsitename', 'moodle'));
-
-    if ($options['fullname'] !== '') {
-        $prompt = get_string('clitypevaluedefault', 'admin', $options['fullname']);
-    } else {
-        $prompt = get_string('clitypevalue', 'admin');
-    }
-
-    do {
-        $options['fullname'] = cli_input($prompt, $options['fullname']);
-    } while (empty($options['fullname']));
-} else {
-    if (empty($options['fullname'])) {
-        $a = (object)array('option'=>'fullname', 'value'=>$options['fullname']);
-        cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
-    }
-}
-
-// ask for shortname
-if ($interactive) {
-    cli_separator();
-    cli_heading(get_string('shortsitename', 'moodle'));
-
-    if ($options['shortname'] !== '') {
-        $prompt = get_string('clitypevaluedefault', 'admin', $options['shortname']);
-    } else {
-        $prompt = get_string('clitypevalue', 'admin');
-    }
-
-    do {
-        $options['shortname'] = cli_input($prompt, $options['shortname']);
-    } while (empty($options['shortname']));
-} else {
-    if (empty($options['shortname'])) {
-        $a = (object)array('option'=>'shortname', 'value'=>$options['shortname']);
-        cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
-    }
-}
-
-// ask for admin user name
-if ($interactive) {
-    cli_separator();
-    cli_heading(get_string('cliadminusername', 'install'));
-    if (!empty($options['adminuser'])) {
-        $prompt = get_string('clitypevaluedefault', 'admin', $options['adminuser']);
-    } else {
-        $prompt = get_string('clitypevalue', 'admin');
-    }
-    do {
-        $options['adminuser'] = cli_input($prompt, $options['adminuser']);
-    } while (empty($options['adminuser']) or $options['adminuser'] === 'guest');
-} else {
-    if (empty($options['adminuser']) or $options['adminuser'] === 'guest') {
-        $a = (object)array('option'=>'adminuser', 'value'=>$options['adminuser']);
-        cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
-    }
-}
-
-// ask for admin user password
-if ($interactive) {
-    cli_separator();
-    cli_heading(get_string('cliadminpassword', 'install'));
-    $prompt = get_string('clitypevalue', 'admin');
-    do {
-        $options['adminpass'] = cli_input($prompt);
-    } while (empty($options['adminpass']) or $options['adminpass'] === 'admin');
-} else {
-    if (empty($options['adminpass']) or $options['adminpass'] === 'admin') {
-        $a = (object)array('option'=>'adminpass', 'value'=>$options['adminpass']);
-        cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
-    }
-}
-
-if ($interactive) {
-    if (!$options['agree-license']) {
-        cli_separator();
-        cli_heading(get_string('copyrightnotice'));
-        echo "Moodle  - Modular Object-Oriented Dynamic Learning Environment\n";
-        echo get_string('gpl3')."\n\n";
-        echo get_string('doyouagree')."\n";
-        $prompt = get_string('cliyesnoprompt', 'admin');
-        $input = cli_input($prompt, '', array(get_string('clianswerno', 'admin'), get_string('cliansweryes', 'admin')));
-        if ($input == get_string('clianswerno', 'admin')) {
-            exit(1);
-        }
-    }
-} else {
-    if (!$options['agree-license']) {
-        cli_error(get_string('climustagreelicense', 'install'));
-    }
-}
-
-// Finally we have all info needed for config.php
-$configphp = install_generate_configphp($database, $CFG);
-umask(0137);
-if (($fh = fopen($configfile, 'w')) !== false) {
-    fwrite($fh, $configphp);
-    fclose($fh);
-}
-
-if (!file_exists($configfile)) {
-    cli_error('Can not create config file.');
-}
-
-// remember selected language
-$installlang = $CFG->lang;
-// return back to original dir before executing setup.php which changes the dir again
-chdir($olddir);
-// We have config.php, it is a real php script from now on :-)
-require($configfile);
-
-// use selected language
-$CFG->lang = $installlang;
-$SESSION->lang = $CFG->lang;
-
-require("$CFG->dirroot/version.php");
-
-// Test environment first.
-require_once($CFG->libdir . '/environmentlib.php');
-list($envstatus, $environment_results) = check_moodle_environment(normalize_version($release), ENV_SELECT_RELEASE);
-if (!$envstatus) {
-    $errors = environment_get_errors($environment_results);
-    cli_heading(get_string('environment', 'admin'));
-    foreach ($errors as $error) {
-        list($info, $report) = $error;
-        echo "!! $info !!\n$report\n\n";
-    }
-    exit(1);
-}
-
-// Test plugin dependencies.
-require_once($CFG->libdir . '/pluginlib.php');
-$failed = array();
-if (!plugin_manager::instance()->all_plugins_ok($version, $failed)) {
-    cli_problem(get_string('pluginscheckfailed', 'admin', array('pluginslist' => implode(', ', array_unique($failed)))));
-    cli_error(get_string('pluginschecktodo', 'admin'));
-}
-
-install_cli_database($options, $interactive);
-
-echo get_string('cliinstallfinished', 'install')."\n";
-exit(0); // 0 means success

admin/cli/install_database.php

@@ -1,173 +0,0 @@
-<?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/>.
-
-/**
- * This installs Moodle into empty database, config.php must already exist.
- *
- * This script is intended for advanced usage such as in Debian packages.
- * - sudo to www-data (apache account) before
- * - not compatible with Windows platform
- *
- * @package    core
- * @subpackage cli
- * @copyright  2010 Petr Skoda (http://skodak.org)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-// extra execution prevention - we can not just require config.php here
-if (isset($_SERVER['REMOTE_ADDR'])) {
-    exit(1);
-}
-
-$help =
-"Advanced command line Moodle database installer.
-Please note you must execute this script with the same uid as apache.
-
-Site defaults may be changed via local/defaults.php.
-
-Options:
---lang=CODE           Installation and default site language. Default is en.
---adminuser=USERNAME  Username for the moodle admin account. Default is admin.
---adminpass=PASSWORD  Password for the moodle admin account.
---agree-license       Indicates agreement with software license.
---fullname=STRING     Name of the site
---shortname=STRING    Name of the site
--h, --help            Print out this help
-
-Example:
-\$sudo -u www-data /usr/bin/php admin/cli/install_database.php --lang=cs --adminpass=soMePass123 --agree-license
-";
-
-// Check that PHP is of a sufficient version
-if (version_compare(phpversion(), "5.3.2") < 0) {
-    $phpversion = phpversion();
-    // do NOT localise - lang strings would not work here and we CAN NOT move it after installib
-    fwrite(STDERR, "Moodle 2.1 or later requires at least PHP 5.3.2 (currently using version $phpversion).\n");
-    fwrite(STDERR, "Please upgrade your server software or install older Moodle version.\n");
-    exit(1);
-}
-
-// Nothing to do if config.php does not exist
-$configfile = dirname(dirname(dirname(__FILE__))).'/config.php';
-if (!file_exists($configfile)) {
-    fwrite(STDERR, 'config.php does not exist, can not continue'); // do not localize
-    fwrite(STDERR, "\n");
-    exit(1);
-}
-
-// Include necessary libs
-require($configfile);
-
-require_once($CFG->libdir.'/clilib.php');
-require_once($CFG->libdir.'/installlib.php');
-require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->libdir.'/componentlib.class.php');
-
-// make sure no tables are installed yet
-if ($DB->get_tables() ) {
-    cli_error(get_string('clitablesexist', 'install'));
-}
-
-$CFG->early_install_lang = true;
-get_string_manager(true);
-
-raise_memory_limit(MEMORY_EXTRA);
-
-// now get cli options
-list($options, $unrecognized) = cli_get_params(
-    array(
-        'lang'              => 'en',
-        'adminuser'         => 'admin',
-        'adminpass'         => '',
-        'fullname'          => '',
-        'shortname'         => '',
-        'agree-license'     => false,
-        'help'              => false
-    ),
-    array(
-        'h' => 'help'
-    )
-);
-
-
-if ($options['help']) {
-    echo $help;
-    die;
-}
-
-if (!$options['agree-license']) {
-    cli_error('You have to agree to the license. --help prints out the help'); // TODO: localize
-}
-
-if ($options['adminpass'] === true or $options['adminpass'] === '') {
-    cli_error('You have to specify admin password. --help prints out the help'); // TODO: localize
-}
-
-$options['lang'] = clean_param($options['lang'], PARAM_SAFEDIR);
-if (!file_exists($CFG->dirroot.'/install/lang/'.$options['lang'])) {
-    $options['lang'] = 'en';
-}
-$CFG->lang = $options['lang'];
-
-// download required lang packs
-if ($CFG->lang !== 'en') {
-    make_upload_directory('lang');
-    $installer = new lang_installer($CFG->lang);
-    $results = $installer->run();
-    foreach ($results as $langcode => $langstatus) {
-        if ($langstatus === lang_installer::RESULT_DOWNLOADERROR) {
-            $a       = new stdClass();
-            $a->url  = $installer->lang_pack_url($langcode);
-            $a->dest = $CFG->dataroot.'/lang';
-            cli_problem(get_string('remotedownloaderror', 'error', $a));
-        }
-    }
-}
-
-// switch the string_manager instance to stop using install/lang/
-$CFG->early_install_lang = false;
-get_string_manager(true);
-
-require("$CFG->dirroot/version.php");
-
-// Test environment first.
-require_once($CFG->libdir . '/environmentlib.php');
-list($envstatus, $environment_results) = check_moodle_environment(normalize_version($release), ENV_SELECT_RELEASE);
-if (!$envstatus) {
-    $errors = environment_get_errors($environment_results);
-    cli_heading(get_string('environment', 'admin'));
-    foreach ($errors as $error) {
-        list($info, $report) = $error;
-        echo "!! $info !!\n$report\n\n";
-    }
-    exit(1);
-}
-
-// Test plugin dependencies.
-require_once($CFG->libdir . '/pluginlib.php');
-$failed = array();
-if (!plugin_manager::instance()->all_plugins_ok($version, $failed)) {
-    cli_problem(get_string('pluginscheckfailed', 'admin', array('pluginslist' => implode(', ', array_unique($failed)))));
-    cli_error(get_string('pluginschecktodo', 'admin'));
-}
-
-install_cli_database($options, true);
-
-echo get_string('cliinstallfinished', 'install')."\n";
-exit(0); // 0 means success

admin/cli/maintenance.php

@@ -1,76 +0,0 @@
-<?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/>.
-
-/**
- * Enable or disable maintenance mode
- *
- * @package    core
- * @subpackage cli
- * @copyright  2009 Petr Skoda (http://skodak.org)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require(dirname(dirname(dirname(__FILE__))).'/config.php');
-require_once($CFG->libdir.'/clilib.php');      // cli only functions
-
-
-// now get cli options
-list($options, $unrecognized) = cli_get_params(array('enable'=>false, 'disable'=>false, 'help'=>false),
-                                               array('h'=>'help'));
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-if ($options['help']) {
-    $help =
-"Maintenance mode settings.
-Current status displayed if not option specified.
-
-Options:
---enable              Enable maintenance mode
---disable             Disable maintenance mode
--h, --help            Print out this help
-
-Example:
-\$sudo -u www-data /usr/bin/php admin/cli/maintenance.php
-"; //TODO: localize - to be translated later when everything is finished
-
-    echo $help;
-    die;
-}
-
-cli_heading(get_string('sitemaintenancemode', 'admin')." ($CFG->wwwroot)");
-
-if ($options['enable']) {
-    set_config('maintenance_enabled', 1);
-    echo get_string('sitemaintenanceon', 'admin')."\n";
-    exit(0);
-} else if ($options['disable']) {
-    set_config('maintenance_enabled', 0);
-    echo get_string('sitemaintenanceoff', 'admin')."\n";
-    exit(0);
-}
-
-if (!empty($CFG->maintenance_enabled)) {
-    echo get_string('clistatusenabled', 'admin')."\n";
-} else {
-    echo get_string('clistatusdisabled', 'admin')."\n";
-}

admin/cli/mysql_collation.php

@@ -1,211 +0,0 @@
-<?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/>.
-
-/**
- * MySQL collation conversion tool.
- *
- * @package    core
- * @copyright  2012 Petr Skoda (http://skodak.org)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require(dirname(dirname(dirname(__FILE__))).'/config.php');
-require_once($CFG->libdir.'/clilib.php');      // cli only functions
-
-if ($DB->get_dbfamily() !== 'mysql') {
-    cli_error('This function is designed for MySQL databases only!');
-}
-
-// now get cli options
-list($options, $unrecognized) = cli_get_params(array('help'=>false, 'list'=>false, 'collation'=>false, 'available'=>false),
-    array('h'=>'help', 'l'=>'list', 'a'=>'available'));
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-$help =
-    "MySQL collation conversions script.
-
-It is strongly recommended to stop the web server before the conversion.
-This script may be executed before the main upgrade - 1.9.x data for example.
-
-Options:
---collation=COLLATION Convert MySQL tables to different collation
--l, --list            Show table and column information
--a, --available       Show list of available collations
--h, --help            Print out this help
-
-Example:
-\$ sudo -u www-data /usr/bin/php admin/cli/mysql_collation.php --collation=utf8_general_ci
-";
-
-if (!empty($options['collation'])) {
-    $collations = mysql_get_collations();
-    $collation = clean_param($options['collation'], PARAM_ALPHANUMEXT);
-    $collation = strtolower($collation);
-    if (!isset($collations[$collation])) {
-        cli_error("Error: collation '$collation' is not available on this server!");
-    }
-
-    echo "Converting tables and columns to '$collation' for $CFG->wwwroot:\n";
-    $prefix = $DB->get_prefix();
-    $prefix = str_replace('_', '\\_', $prefix);
-    $sql = "SHOW TABLE STATUS WHERE Name LIKE BINARY '$prefix%'";
-    $rs = $DB->get_recordset_sql($sql);
-    $converted = 0;
-    $skipped   = 0;
-    $errors    = 0;
-    foreach ($rs as $table) {
-        echo str_pad($table->name, 40). " - ";
-
-        if ($table->collation === $collation) {
-            echo "NO CHANGE\n";
-            $skipped++;
-
-        } else {
-            $DB->change_database_structure("ALTER TABLE $table->name DEFAULT COLLATE = $collation");
-            echo "CONVERTED\n";
-            $converted++;
-        }
-
-        $sql = "SHOW FULL COLUMNS FROM $table->name WHERE collation IS NOT NULL";
-        $rs2 = $DB->get_recordset_sql($sql);
-        foreach ($rs2 as $column) {
-            $column = (object)array_change_key_case((array)$column, CASE_LOWER);
-            echo '    '.str_pad($column->field, 36). " - ";
-            if ($column->collation === $collation) {
-                echo "NO CHANGE\n";
-                $skipped++;
-                continue;
-            }
-
-            if ($column->type === 'tinytext' or $column->type === 'mediumtext' or $column->type === 'text' or $column->type === 'longtext') {
-                $notnull = ($column->null === 'NO') ? 'NOT NULL' : 'NULL';
-                $default = (!is_null($column->default) and $column->default !== '') ? "DEFAULT '$column->default'" : '';
-                // primary, unique and inc are not supported for texts
-                $sql = "ALTER TABLE $table->name MODIFY COLUMN $column->field $column->type COLLATE $collation $notnull $default";
-                $DB->change_database_structure($sql);
-
-            } else if (strpos($column->type, 'varchar') === 0) {
-                $notnull = ($column->null === 'NO') ? 'NOT NULL' : 'NULL';
-                $default = !is_null($column->default) ? "DEFAULT '$column->default'" : '';
-                // primary, unique and inc are not supported for texts
-                $sql = "ALTER TABLE $table->name MODIFY COLUMN $column->field $column->type COLLATE $collation $notnull $default";
-                $DB->change_database_structure($sql);
-            } else {
-                echo "ERROR (unknown column type: $column->type)\n";
-                $error++;
-                continue;
-            }
-            echo "CONVERTED\n";
-            $converted++;
-        }
-        $rs2->close();
-    }
-    $rs->close();
-    echo "Converted: $converted, skipped: $skipped, errors: $errors\n";
-    exit(0); // success
-
-} else if (!empty($options['list'])) {
-    echo "List of tables for $CFG->wwwroot:\n";
-    $prefix = $DB->get_prefix();
-    $prefix = str_replace('_', '\\_', $prefix);
-    $sql = "SHOW TABLE STATUS WHERE Name LIKE BINARY '$prefix%'";
-    $rs = $DB->get_recordset_sql($sql);
-    $counts = array();
-    foreach ($rs as $table) {
-        if (isset($counts[$table->collation])) {
-            $counts[$table->collation]++;
-        } else {
-            $counts[$table->collation] = 1;
-        }
-        echo str_pad($table->name, 40);
-        echo $table->collation.  "\n";
-        $collations = mysql_get_column_collations($table->name);
-        foreach ($collations as $columname=>$collation) {
-            if (isset($counts[$collation])) {
-                $counts[$collation]++;
-            } else {
-                $counts[$collation] = 1;
-            }
-            echo '    ';
-            echo str_pad($columname, 36);
-            echo $collation.  "\n";
-        }
-    }
-    $rs->close();
-
-    echo "\n";
-    echo "Table collations summary for $CFG->wwwroot:\n";
-    foreach ($counts as $collation => $count) {
-        echo "$collation: $count\n";
-    }
-    exit(0); // success
-
-} else if (!empty($options['available'])) {
-    echo "List of available MySQL collations for $CFG->wwwroot:\n";
-    $collations = mysql_get_collations();
-    foreach ($collations as $collation) {
-        echo " $collation\n";
-    }
-    die;
-
-} else {
-    echo $help;
-    die;
-}
-
-
-
-// ========== Some functions ==============
-
-function mysql_get_collations() {
-    global $DB;
-
-    $collations = array();
-    $sql = "SHOW COLLATION WHERE Collation LIKE 'utf8\_%' AND Charset = 'utf8'";
-    $rs = $DB->get_recordset_sql($sql);
-    foreach ($rs as $collation) {
-        $collations[$collation->collation] = $collation->collation;
-    }
-    $rs->close();
-
-    $collation = $DB->get_dbcollation();
-    if (isset($collations[$collation])) {
-        $collations[$collation] .= ' (default)';
-    }
-
-    return $collations;
-}
-
-function mysql_get_column_collations($tablename) {
-    global $DB;
-
-    $collations = array();
-    $sql = "SELECT column_name, collation_name
-              FROM INFORMATION_SCHEMA.COLUMNS
-             WHERE table_schema = DATABASE() AND table_name = ? AND collation_name IS NOT NULL";
-    $rs = $DB->get_recordset_sql($sql, array($tablename));
-    foreach($rs as $record) {
-        $collations[$record->column_name] = $record->collation_name;
-    }
-    $rs->close();
-    return $collations;
-}

admin/cli/mysql_engine.php

@@ -1,180 +0,0 @@
-<?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/>.
-
-/**
- * MySQL engine conversion tool.
- *
- * @package    core
- * @subpackage cli
- * @copyright  2009 Petr Skoda (http://skodak.org)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require(dirname(dirname(dirname(__FILE__))).'/config.php');
-require_once($CFG->libdir.'/clilib.php');      // cli only functions
-
-if ($DB->get_dbfamily() !== 'mysql') {
-    cli_error('This function is designed for MySQL databases only!');
-}
-
-// now get cli options
-list($options, $unrecognized) = cli_get_params(array('help'=>false, 'list'=>false, 'engine'=>false, 'available'=>false),
-                                               array('h'=>'help', 'l'=>'list', 'a'=>'available'));
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-$help =
-"MySQL engine conversions script.
-
-It is recommended to stop the web server before the conversion.
-Do not use MyISAM if possible, because it is not ACID compliant
-and does not support transactions.
-
-Options:
---engine=ENGINE       Convert MySQL tables to different engine
--l, --list            Show table information
--a, --available       Show list of available engines
--h, --help            Print out this help
-
-Example:
-\$sudo -u www-data /usr/bin/php admin/cli/mysql_engine.php --engine=InnoDB
-";
-
-if (!empty($options['engine'])) {
-    $engines = mysql_get_engines();
-    $engine = clean_param($options['engine'], PARAM_ALPHA);
-    if (!isset($engines[strtoupper($engine)])) {
-        cli_error("Error: engine '$engine' is not available on this server!");
-    }
-
-    echo "Converting tables to '$engine' for $CFG->wwwroot:\n";
-    $prefix = $DB->get_prefix();
-    $prefix = str_replace('_', '\\_', $prefix);
-    $sql = "SHOW TABLE STATUS WHERE Name LIKE BINARY '$prefix%'";
-    $rs = $DB->get_recordset_sql($sql);
-    $converted = 0;
-    $skipped   = 0;
-    $errors    = 0;
-    foreach ($rs as $table) {
-        if (strtoupper($table->engine) === strtoupper($engine)) {
-            $newengine = mysql_get_table_engine($table->name);
-            echo str_pad($table->name, 40). " - NO CONVERSION NEEDED ($newengine)\n";
-            $skipped++;
-            continue;
-        }
-        echo str_pad($table->name, 40). " - ";
-
-        try {
-            $DB->change_database_structure("ALTER TABLE {$table->name} ENGINE = $engine");
-            $newengine = mysql_get_table_engine($table->name);
-            if (strtoupper($newengine) !== strtoupper($engine)) {
-                echo "ERROR ($newengine)\n";
-                $errors++;
-                continue;
-            }
-            echo "DONE ($newengine)\n";
-            $converted++;
-        } catch (moodle_exception $e) {
-            echo $e->getMessage()."\n";
-            $errors++;
-            continue;
-        }
-    }
-    $rs->close();
-    echo "Converted: $converted, skipped: $skipped, errors: $errors\n";
-    exit(0); // success
-
-} else if (!empty($options['list'])) {
-    echo "List of tables for $CFG->wwwroot:\n";
-    $prefix = $DB->get_prefix();
-    $prefix = str_replace('_', '\\_', $prefix);
-    $sql = "SHOW TABLE STATUS WHERE Name LIKE BINARY '$prefix%'";
-    $rs = $DB->get_recordset_sql($sql);
-    $counts = array();
-    foreach ($rs as $table) {
-        if (isset($counts[$table->engine])) {
-            $counts[$table->engine]++;
-        } else {
-            $counts[$table->engine] = 1;
-        }
-        echo str_pad($table->engine, 10);
-        echo $table->name .  "\n";
-    }
-    $rs->close();
-
-    echo "\n";
-    echo "Table engines summary for $CFG->wwwroot:\n";
-    foreach ($counts as $engine => $count) {
-        echo "$engine: $count\n";
-    }
-    exit(0); // success
-
-} else if (!empty($options['available'])) {
-    echo "List of available MySQL engines for $CFG->wwwroot:\n";
-    $engines = mysql_get_engines();
-    foreach ($engines as $engine) {
-        echo " $engine\n";
-    }
-    die;
-
-} else {
-    echo $help;
-    die;
-}
-
-
-
-// ========== Some functions ==============
-
-function mysql_get_engines() {
-    global $DB;
-
-    $sql = "SHOW Engines";
-    $rs = $DB->get_recordset_sql($sql);
-    $engines = array();
-    foreach ($rs as $engine) {
-        if (strtoupper($engine->support) !== 'YES' and strtoupper($engine->support) !== 'DEFAULT') {
-            continue;
-        }
-        $engines[strtoupper($engine->engine)] = $engine->engine;
-        if (strtoupper($engine->support) === 'DEFAULT') {
-            $engines[strtoupper($engine->engine)] .= ' (default)';
-        }
-    }
-    $rs->close();
-
-    return $engines;
-}
-
-function mysql_get_table_engine($tablename) {
-    global $DB;
-
-    $engine = null;
-    $sql = "SHOW TABLE STATUS WHERE Name = '$tablename'"; // no special chars expected here
-    $rs = $DB->get_recordset_sql($sql);
-    if ($rs->valid()) {
-        $record = $rs->current();
-        $engine = $record->engine;
-    }
-    $rs->close();
-    return $engine;
-}

admin/cli/purge_caches.php

@@ -1,53 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * @package    core
- * @subpackage cli
- * @copyright  2011 David Mudrak <david@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require(dirname(dirname(dirname(__FILE__))).'/config.php');
-require_once($CFG->libdir.'/clilib.php');
-
-list($options, $unrecognized) = cli_get_params(array('help' => false), array('h' => 'help'));
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized), 2);
-}
-
-if ($options['help']) {
-    $help =
-"Invalidates all Moodle internal caches
-
-Options:
--h, --help            Print out this help
-
-Example:
-\$sudo -u www-data /usr/bin/php admin/cli/purge_caches.php
-";
-
-    echo $help;
-    exit(0);
-}
-
-purge_all_caches();
-
-exit(0);

admin/cli/reset_password.php

@@ -1,81 +0,0 @@
-<?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/>.
-
-/**
- * This script allows you to reset any local user password.
- *
- * @package    core
- * @subpackage cli
- * @copyright  2009 Petr Skoda (http://skodak.org)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require(dirname(dirname(dirname(__FILE__))).'/config.php');
-require_once($CFG->libdir.'/clilib.php');      // cli only functions
-
-
-// now get cli options
-list($options, $unrecognized) = cli_get_params(array('help'=>false),
-                                               array('h'=>'help'));
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-if ($options['help']) {
-    $help =
-"Reset local user passwords, useful especially for admin acounts.
-
-There are no security checks here because anybody who is able to
-execute this file may execute any PHP too.
-
-Options:
--h, --help            Print out this help
-
-Example:
-\$sudo -u www-data /usr/bin/php admin/cli/reset_password.php
-"; //TODO: localize - to be translated later when everything is finished
-
-    echo $help;
-    die;
-}
-cli_heading('Password reset'); // TODO: localize
-$prompt = "enter username (manual authentication only)"; // TODO: localize
-$username = cli_input($prompt);
-
-if (!$user = $DB->get_record('user', array('auth'=>'manual', 'username'=>$username, 'mnethostid'=>$CFG->mnet_localhost_id))) {
-    cli_error("Can not find user '$username'");
-}
-
-$prompt = "Enter new password"; // TODO: localize
-$password = cli_input($prompt);
-
-$errmsg = '';//prevent eclipse warning
-if (!check_password_policy($password, $errmsg)) {
-    cli_error($errmsg);
-}
-
-$hashedpassword = hash_internal_user_password($password);
-
-$DB->set_field('user', 'password', $hashedpassword, array('id'=>$user->id));
-
-echo "Password changed\n";
-
-exit(0); // 0 means success

admin/cli/upgrade.php

@@ -1,171 +0,0 @@
-<?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/>.
-
-/**
- * This script creates config.php file and prepares database.
- *
- * This script is not intended for beginners!
- * Potential problems:
- * - su to apache account or sudo before execution
- * - not compatible with Windows platform
- *
- * @package    core
- * @subpackage cli
- * @copyright  2009 Petr Skoda (http://skodak.org)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require(dirname(dirname(dirname(__FILE__))).'/config.php');
-require_once($CFG->libdir.'/adminlib.php');       // various admin-only functions
-require_once($CFG->libdir.'/upgradelib.php');     // general upgrade/install related functions
-require_once($CFG->libdir.'/clilib.php');         // cli only functions
-require_once($CFG->libdir.'/environmentlib.php');
-require_once($CFG->libdir.'/pluginlib.php');
-
-// now get cli options
-list($options, $unrecognized) = cli_get_params(
-    array(
-        'non-interactive'   => false,
-        'allow-unstable'    => false,
-        'help'              => false
-    ),
-    array(
-        'h' => 'help'
-    )
-);
-
-$interactive = empty($options['non-interactive']);
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-if ($options['help']) {
-    $help =
-"Command line Moodle upgrade.
-Please note you must execute this script with the same uid as apache!
-
-Site defaults may be changed via local/defaults.php.
-
-Options:
---non-interactive     No interactive questions or confirmations
---allow-unstable      Upgrade even if the version is not marked as stable yet,
-                      required in non-interactive mode.
--h, --help            Print out this help
-
-Example:
-\$sudo -u www-data /usr/bin/php admin/cli/upgrade.php
-"; //TODO: localize - to be translated later when everything is finished
-
-    echo $help;
-    die;
-}
-
-if (empty($CFG->version)) {
-    cli_error(get_string('missingconfigversion', 'debug'));
-}
-
-require("$CFG->dirroot/version.php");       // defines $version, $release, $branch and $maturity
-$CFG->target_release = $release;            // used during installation and upgrades
-
-if ($version < $CFG->version) {
-    cli_error(get_string('downgradedcore', 'error'));
-}
-
-$oldversion = "$CFG->release ($CFG->version)";
-$newversion = "$release ($version)";
-
-if (!moodle_needs_upgrading()) {
-    cli_error(get_string('cliupgradenoneed', 'core_admin', $newversion), 0);
-}
-
-// Test environment first.
-list($envstatus, $environment_results) = check_moodle_environment(normalize_version($release), ENV_SELECT_RELEASE);
-if (!$envstatus) {
-    $errors = environment_get_errors($environment_results);
-    cli_heading(get_string('environment', 'admin'));
-    foreach ($errors as $error) {
-        list($info, $report) = $error;
-        echo "!! $info !!\n$report\n\n";
-    }
-    exit(1);
-}
-
-// Test plugin dependencies.
-$failed = array();
-if (!plugin_manager::instance()->all_plugins_ok($version, $failed)) {
-    cli_problem(get_string('pluginscheckfailed', 'admin', array('pluginslist' => implode(', ', array_unique($failed)))));
-    cli_error(get_string('pluginschecktodo', 'admin'));
-}
-
-if ($interactive) {
-    $a = new stdClass();
-    $a->oldversion = $oldversion;
-    $a->newversion = $newversion;
-    echo cli_heading(get_string('databasechecking', '', $a)) . PHP_EOL;
-}
-
-// make sure we are upgrading to a stable release or display a warning
-if (isset($maturity)) {
-    if (($maturity < MATURITY_STABLE) and !$options['allow-unstable']) {
-        $maturitylevel = get_string('maturity'.$maturity, 'admin');
-
-        if ($interactive) {
-            cli_separator();
-            cli_heading(get_string('notice'));
-            echo get_string('maturitycorewarning', 'admin', $maturitylevel) . PHP_EOL;
-            echo get_string('morehelp') . ': ' . get_docs_url('admin/versions') . PHP_EOL;
-            cli_separator();
-        } else {
-            cli_problem(get_string('maturitycorewarning', 'admin', $maturitylevel));
-            cli_error(get_string('maturityallowunstable', 'admin'));
-        }
-    }
-}
-
-if ($interactive) {
-    echo html_to_text(get_string('upgradesure', 'admin', $newversion))."\n";
-    $prompt = get_string('cliyesnoprompt', 'admin');
-    $input = cli_input($prompt, '', array(get_string('clianswerno', 'admin'), get_string('cliansweryes', 'admin')));
-    if ($input == get_string('clianswerno', 'admin')) {
-        exit(1);
-    }
-}
-
-if ($version > $CFG->version) {
-    upgrade_core($version, true);
-}
-set_config('release', $release);
-set_config('branch', $branch);
-
-// unconditionally upgrade
-upgrade_noncore(true);
-
-// log in as admin - we need doanything permission when applying defaults
-$admins = get_admins();
-$admin = reset($admins);
-session_set_user($admin);
-
-// apply all default settings, just in case do it twice to fill all defaults
-admin_apply_default_settings(NULL, false);
-admin_apply_default_settings(NULL, false);
-
-echo get_string('cliupgradefinished', 'admin')."\n";
-exit(0); // 0 means success

admin/config.php

@@ -0,0 +1,185 @@
+<?php  // $Id$
+       // config.php - allows admin to edit all configuration variables
+
+    require_once('../config.php');
+
+    $focus = '';
+
+    if ($site = get_site()) {   // If false then this is a new installation
+        require_login();
+        require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    }
+
+/// This is to overcome the "insecure forms paradox"
+    if (isset($secureforms) and $secureforms == 0) {
+        $match = 'nomatch';
+    } else {
+        $match = '';
+    }
+
+/// If data submitted, then process and store.
+
+    if ($config = data_submitted($match)) {  
+
+        if (!empty($USER->id)) {            // Additional identity check
+            if (!confirm_sesskey()) {
+                error(get_string('confirmsesskeybad', 'error'));
+            }
+        }
+
+        validate_form($config, $err);
+
+        if (count($err) == 0) {
+            foreach ($config as $name => $value) {
+                if ($name == "sessioncookie") {
+                    $value = eregi_replace("[^a-zA-Z0-9_]", "", $value);
+                }
+                if ($name == "defaultallowedmodules") {
+                    $value = implode(',',$value);
+                }
+                if ($name == 'hiddenuserfields') {
+                    if (in_array('none', $value)) {
+                        $value = '';
+                    } else {
+                        $value = implode(',',$value);
+                    }
+                }
+                if ($name == "locale") {
+                    $value = trim($value);
+                }
+                $conf = new object();
+                $conf->name  = $name;
+                $conf->value = $value;
+                if ($current = get_record('config', 'name', $name)) {
+                    $conf->id = $current->id;
+                    if (! update_record('config', $conf)) {
+                        error("Error: Could not update $name to $value");
+                    }
+                } else {
+                    if (! insert_record('config', $conf)) {
+                        error("Error: could not add new variable $name !");
+                    }
+                }
+            }
+            redirect('index.php');
+            exit;
+
+        } else {
+            foreach ($err as $key => $value) {
+                $focus = "form.$key";
+            }
+        }
+    }
+
+/// Otherwise fill and print the form.
+
+    if (empty($config)) {
+        $config = $CFG;
+    }
+
+    $sesskey = !empty($USER->id) ? $USER->sesskey : '';
+
+
+    $stradmin = get_string('administration');
+    $strconfiguration = get_string('configuration');
+    $strconfigvariables = get_string('configvariables', 'admin');
+
+    if ($site) {
+        print_header("$site->shortname: $strconfigvariables", $site->fullname,
+                      "<a href=\"index.php\">$stradmin</a> -> ".
+                      "<a href=\"configure.php\">$strconfiguration</a> -> $strconfigvariables", $focus);
+        print_heading($strconfigvariables);
+    } else {
+        print_header();
+        print_heading($strconfigvariables);
+        print_simple_box(get_string('configintro', 'admin'), 'center', "50%");
+        echo '<br />';
+    }
+
+
+
+/// Get all the configuration fields and helptext
+    require('configvars.php');
+
+/// Cycle through the sections to get the sectionnames
+    $linktext = '';
+    foreach($configvars as $sectionname=>$section) {
+        if ($linktext !== '') {
+            $linktext .= ' | ';
+        }
+        $linktext .= '<a href="#configsection'.$sectionname.'">'.get_string('configsection'.$sectionname, 'admin').'</a>';
+    }
+        
+    echo "<center>$linktext</center>\n";
+
+    
+    echo '<form method="post" action="config.php" name="form">';
+    echo '<center><input type="submit" value="'.get_string('savechanges').'" /></center>';
+
+/// Cycle through each section of the configuration
+    foreach ($configvars as $sectionname=>$section) {
+
+        print_heading('<a name="configsection'.$sectionname.'"></a>'.get_string('configsection'.$sectionname, 'admin'));
+
+        $table = NULL;
+        $table->data = array();
+        foreach ($section as $configvariable=>$configobject) {
+            $table->data[] = array ( $configvariable.': ',
+                                     $configobject->field
+                                   );
+            if ($configobject->display_warning()) {
+                $table->data[] = array ( '&nbsp;',
+                                         '<span class="configwarning">'.$configobject->warning.'</span>'
+                                       );
+            }
+            $table->data[] = array ( '&nbsp;',
+                                     '<span class="confighelp">'.$configobject->help.'</span>'
+                                   );
+            $table->align = array ('right', 'left');
+        }
+        print_table($table);
+
+    }
+    echo '<center>';
+    echo '<input type="hidden" name="sesskey" value="'.$sesskey.'" />';
+    echo '<input type="submit" value="'.get_string('savechanges').'" />';
+    echo '</center>';
+                
+    echo '</form>';
+    
+
+
+    
+
+    /// Lock some options
+
+    $httpsurl = str_replace('http://', 'https://', $CFG->wwwroot);
+    if ($httpsurl != $CFG->wwwroot) {
+        if (ini_get('allow_url_fopen')) {
+            if ((($fh = @fopen($httpsurl, 'r')) == false) and ($config->loginhttps == 0)) {
+                echo '<script type="text/javascript">'."\n";
+                echo '<!--'."\n";
+                echo "eval('document.form.loginhttps.disabled=true');\n";
+                echo '-->'."\n";
+                echo '</script>'."\n";
+            }
+        }
+    }
+
+
+    if ($site) {
+        print_footer();
+    }
+
+    exit;
+
+/// Functions /////////////////////////////////////////////////////////////////
+
+function validate_form(&$form, &$err) {
+
+    // Currently no checks are needed ...
+
+    return true;
+}
+
+?>

admin/configvars.php

@@ -0,0 +1,660 @@
+<?php // $Id$
+      // Shane Elliott
+defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
+
+/// Add new sitewide configuration variables to this file.
+
+
+/// $configvars is parsed by config.php
+/// It is an array of arrays of objects
+/// $configvars[sectionname][configvariablename] = configvar object
+    $configvars = array();
+
+
+/// no, yes strings and menu options are used in a number of places
+/// so we define them here to save time on repeatedly calling
+/// get_string()
+    $stryes = get_string('yes');
+    $strno  = get_string('no');
+
+    $noyesoptions[0] = $strno;
+    $noyesoptions[1] = $stryes;
+
+
+
+/// A class to hold the configurable information
+/// $field   - the html code for the form field
+/// $help    - help text for the field
+/// $warning - optional warning text to be displayed
+/// method display_warning() - a generic function that can be used in an extended class
+///     e.g. enablerssfeeds
+class configvar {
+
+    var $field;
+    var $help;
+    var $warning;
+
+    function configvar($help, $field, $warning='') {
+        $this->help    = $help;
+        $this->field   = $field;
+        $this->warning = $warning;
+    }
+
+    function display_warning() {
+        return false;
+    }
+}
+
+
+
+
+
+////////////////////////////////////////////////////////////////////
+/// Miscellaneous config variables
+////////////////////////////////////////////////////////////////////
+    $misc = array();
+
+
+/// maxeditingtime
+    unset($options);
+    $options[3600] = get_string('numminutes', '', 60);
+    $options[2700] = get_string('numminutes', '', 45);
+    $options[1800] = get_string('numminutes', '', 30);
+    $options[900]  = get_string('numminutes', '', 15);
+    $options[300]  = get_string('numminutes', '', 5);
+    $options[60]   = get_string('numminutes', '', 1);
+
+    $misc['maxeditingtime'] = new configvar (get_string('configmaxeditingtime', 'admin'),
+        choose_from_menu ($options, 'maxeditingtime', $config->maxeditingtime, '', '', '', true) );
+
+/// debug
+    unset($options);
+    $options[5]  = $strno;
+    $options[15] = $stryes;
+
+    $misc['debug'] = new configvar (get_string('configdebug', 'admin'),
+        choose_from_menu ($options, 'debug', $config->debug, '', '', '', true) );
+
+    $misc['perfdebug'] = new configvar (get_string('configperfdebug', 'admin'),
+        choose_from_menu ($options, 'perfdebug', $config->perfdebug, '', '', '', true) );
+
+/// enablerssfeeds
+class configvarrss extends configvar {
+    function display_warning() {
+        return (!function_exists('utf8_encode'));
+    }
+}
+
+    $misc['enablerssfeeds'] = new configvarrss (get_string('configenablerssfeeds', 'admin'),
+        choose_from_menu ($noyesoptions, 'enablerssfeeds', $config->enablerssfeeds, '', '', '', true),
+        '<font color="red"> You need to add XML support to your PHP installation.</font>' );
+
+    $misc['mymoodleredirect'] = new configvar (get_string('configmymoodleredirect','admin'),
+        choose_from_menu($noyesoptions,'mymoodleredirect',$config->mymoodleredirect,'','','',true));
+
+    unset($options);
+    $options[5] = get_string('worldblogs','blog');
+    $options[4] = get_string('siteblogs','blog');
+    $options[3] = get_string('courseblogs','blog');
+    $options[2] = get_string('groupblogs','blog');
+    $options[1] = get_string('personalblogs','blog');
+    $options[0] = get_string('disableblogs','blog');
+
+    $misc['bloglevel'] = new configvar (get_string('configbloglevel', 'admin'),
+        choose_from_menu ($options, 'bloglevel', $config->bloglevel,'','','',true));
+
+////////////////////////////////////////////////////////////////////
+/// OPERATING SYSTEM config variables
+////////////////////////////////////////////////////////////////////
+    $operatingsystem = array();
+
+/// gdversion
+    unset($options);
+    $options[0] = get_string('gdnot');
+    $options[1] = get_string('gd1');
+    $options[2] = get_string('gd2');
+
+    $installed  = check_gd_version();
+
+    $operatingsystem['gdversion'] = new configvar (get_string('configgdversion', 'admin'),
+        choose_from_menu ($options, 'gdversion', $installed, '', '', '', true) );
+
+/// dbsessions
+    $operatingsystem['dbsessions'] = new configvar (get_string('configdbsessions', 'admin'),
+        choose_from_menu ($noyesoptions, 'dbsessions', $config->dbsessions, '', '', '', true) );
+
+/// sessiontimeout
+    unset($options);
+    $options[14400] = get_string('numhours', '', 4);
+    $options[10800] = get_string('numhours', '', 3);
+    $options[7200]  = get_string('numhours', '', 2);
+    $options[5400]  = get_string('numhours', '', '1.5');
+    $options[3600]  = get_string('numminutes', '', 60);
+    $options[2700]  = get_string('numminutes', '', 45);
+    $options[1800]  = get_string('numminutes', '', 30);
+    $options[900]   = get_string('numminutes', '', 15);
+    $options[300]   = get_string('numminutes', '', 5);
+
+    $operatingsystem['sessiontimeout'] = new configvar (get_string('configsessiontimeout', 'admin'),
+        choose_from_menu ($options, 'sessiontimeout', $config->sessiontimeout, '', '', '', true) );
+
+/// sessioncookie
+    $operatingsystem['sessioncookie'] = new configvar (get_string('configsessioncookie', 'admin'),
+        '<input name="sessioncookie" type="text" size="10" value="'.s($config->sessioncookie).'" alt="sessioncookie" />' );
+    $operatingsystem['sessioncookiepath'] = new configvar (get_string('configsessioncookiepath', 'admin'),
+        '<input name="sessioncookiepath" type="text" size="10" value="'.s($config->sessioncookiepath).'" alt="sessioncookiepath" />' );
+
+/// zip
+    $operatingsystem['zip'] = new configvar (get_string('configzip', 'admin'),
+        '<input name="zip" type="text" size="30" value="'.s($config->zip).'" alt="zip" />' );
+
+/// unzip
+    $operatingsystem['unzip'] = new configvar (get_string('configunzip', 'admin'),
+        '<input name="unzip" type="text" size="30" value="'.s($config->unzip).'" alt="unzip" />' );
+
+    $operatingsystem['pathtodu'] = new configvar(get_string('configpathtodu', 'admin'),
+        '<input name="pathtodu" type="text" size="30" value="'.s($config->pathtodu).'" alt="pathtodu" />');                                                
+
+/// slasharguments
+    unset($options);
+    $options[0] = "file.php?file=/1/pic.jpg";
+    $options[1] = "file.php/1/pic.jpg";
+
+    $operatingsystem['slasharguments'] = new configvar (get_string('configslasharguments', 'admin'),
+        choose_from_menu ($options, 'slasharguments', $config->slasharguments, '', '', '', true) );
+
+/// proxyhost
+    $operatingsystem['proxyhost'] = new configvar (get_string('configproxyhost', 'admin'),
+        '<input name="proxyhost" type="text" size="30" value="'.s($config->proxyhost).'" alt="proxyhost" />' );
+
+/// proxyport
+    $operatingsystem['proxyport'] = new configvar ('',
+        '<input name="proxyport" type="text" size="5" value="'.s($config->proxyport).'" alt="proxyport" />' );
+
+
+
+////////////////////////////////////////////////////////////////////
+/// PERMISSIONS config variables
+////////////////////////////////////////////////////////////////////
+    $permissions = array();
+
+/// teacherassignteachers
+    $permissions['teacherassignteachers'] = new configvar (get_string('configteacherassignteachers', 'admin'),
+        choose_from_menu ($noyesoptions, 'teacherassignteachers', $config->teacherassignteachers, '', '', '', true) );
+
+/// allowunenroll
+    $permissions['allowunenroll'] = new configvar (get_string('configallowunenroll', 'admin'),
+        choose_from_menu ($noyesoptions, 'allowunenroll', $config->allowunenroll, '', '', '', true) );
+
+/// allusersaresitestudents
+    $permissions['allusersaresitestudents'] = new configvar (get_string('configallusersaresitestudents', 'admin'),
+        choose_from_menu ($noyesoptions, 'allusersaresitestudents', $config->allusersaresitestudents, '', '', '', true) );
+
+/// showsiteparticipantslist
+    unset($options);
+    $options[0]  = get_string('siteteachers');
+    $options[1]  = get_string('allteachers');
+    $options[2]  = get_string('studentsandteachers');
+
+    $permissions['showsiteparticipantslist'] = new configvar (get_string('configshowsiteparticipantslist', 'admin'),
+        choose_from_menu ($options, 'showsiteparticipantslist', $config->showsiteparticipantslist, '', '', '', true) );
+
+/// forcelogin
+    $permissions['forcelogin'] = new configvar (get_string('configforcelogin', 'admin'),
+        choose_from_menu ($noyesoptions, 'forcelogin', $config->forcelogin, '', '', '', true) );
+
+/// forceloginforprofiles
+   $permissions['forceloginforprofiles'] = new configvar (get_string('configforceloginforprofiles', 'admin'),
+        choose_from_menu ($noyesoptions, 'forceloginforprofiles', $config->forceloginforprofiles, '', '', '', true) );
+
+/// opentogoogle
+    $permissions['opentogoogle'] = new configvar (get_string('configopentogoogle', 'admin'),
+        choose_from_menu ($noyesoptions, 'opentogoogle', $config->opentogoogle, '', '', '', true) );
+
+/// maxbytes
+    $options = get_max_upload_sizes();
+
+    $permissions['maxbytes'] = new configvar (get_string('configmaxbytes', 'admin'),
+        choose_from_menu ($options, 'maxbytes', $config->maxbytes, '', '', 0, true) );
+
+/// messaging
+    $permissions['messaging'] = new configvar (get_string('configmessaging', 'admin'),
+        choose_from_menu ($noyesoptions, 'messaging', $config->messaging, '', '', '', true) );
+
+/// allowobjectembed
+    $permissions['allowobjectembed'] = new configvar (get_string('configallowobjectembed', 'admin'),
+        choose_from_menu ($noyesoptions, 'allowobjectembed', $config->allowobjectembed, '', '', '', true) );
+
+/// enabletrusttext
+    $permissions['enabletrusttext'] = new configvar (get_string('configenabletrusttext', 'admin'),
+        choose_from_menu ($noyesoptions, 'enabletrusttext', $config->enabletrusttext, '', '', '', true) );
+
+    unset($options);
+    $options['none'] = 'No courses';
+    $options['all'] = 'All courses';
+    $options['requested'] = 'Requested courses';
+
+    $permissions['restrictmodulesfor'] = new configvar (get_string('configrestrictmodulesfor','admin'),
+   ' <script language="JavaScript">
+    function togglemodules(index) {
+        if (index == 0) {
+            document.getElementById(\'allowedmodules\').disabled=true;
+        }
+        else {
+            document.getElementById(\'allowedmodules\').disabled=false;
+        }
+    }
+    </script>'.
+        choose_from_menu($options,'restrictmodulesfor',$config->restrictmodulesfor,'','togglemodules(this.selectedIndex);','',true) );
+
+    $permissions['restrictbydefault'] = new configvar (get_string('configrestrictbydefault','admin'),
+        choose_from_menu($noyesoptions, 'restrictbydefault',$config->restrictbydefault,'','','',true) );
+
+    $allowstr = '<select name="defaultallowedmodules[]" id="allowedmodules" multiple="multiple" size="10"'.((empty($config->restrictmodulesfor)) ? "disabled=\"disabled\"" : "").'>';
+
+    $allowedmodules = array();
+    if (!empty($config->defaultallowedmodules)) {
+        $allowedmodules = explode(',',$config->defaultallowedmodules);
+    }
+
+//  On a fresh install of Moodle, this could be empty; prevent a warning on the following loop.
+    if (!$mods = get_records("modules")) {
+        $mods = array();
+    }
+    $s = "selected=\"selected\"";
+    $allowstr .= '<option value="0" '.((empty($allowedmodules)) ? $s : '').'>'.get_string('allownone').'</option>'."\n";
+    foreach ($mods as $mod) {
+        $selected = "";
+        if (in_array($mod->id,$allowedmodules)) 
+            $selected = $s;
+        $allowstr .= '<option '.$selected.' value="'.$mod->id.'">'.$mod->name.'</option>'."\n";
+    }  
+    $allowstr .= '</select>';
+
+    $permissions['defaultallowedmodules'] = new configvar (get_string('configdefaultallowedmodules','admin'),$allowstr);
+
+
+/// course requests
+    $reqcourse['enablecourserequests'] = new configvar (get_string('configenablecourserequests', 'admin'),
+        choose_from_menu ($noyesoptions,'enablecourserequests',$config->enablecourserequests,'','','',true) );
+
+/// default category for course requests
+    require_once($CFG->dirroot.'/course/lib.php');
+    $reqcourse['defaultrequestedcategory'] = new configvar (get_string('configdefaultrequestedcategory', 'admin'),
+        choose_from_menu (make_categories_options(), 'defaultrequestedcategory',$config->defaultrequestedcategory,'','','',true) );
+
+    $reqcourse['requestedteachername'] = new configvar (get_string('configrequestedteachername','admin'),
+        '<input type="text" name="requestedteachername" size="20" maxlength="100" value="'.s($config->requestedteachername).'" />');
+
+    $reqcourse['requestedteachersname'] = new configvar (get_string('configrequestedteachersname','admin'),
+        '<input type="text" name="requestedteachersname" size="20" maxlength="100" value="'.s($config->requestedteachersname).'" />');
+
+    $reqcourse['requestedstudentname'] = new configvar (get_string('configrequestedstudentname','admin'),
+        '<input type="text" name="requestedstudentname" size="20" maxlength="100" value="'.s($config->requestedstudentname).'" />');
+
+    $reqcourse['requestedstudentsname'] = new configvar (get_string('configrequestedstudentsname','admin'),
+        '<input type="text" name="requestedstudentsname" size="20" maxlength="100" value="'.s($config->requestedstudentsname).'" />');
+
+////////////////////////////////////////////////////////////////////
+/// INTERFACE config variables
+////////////////////////////////////////////////////////////////////
+    $interface = array();
+
+/// language settings
+    $interface['lang'] = new configvar ( get_string('configlang', 'admin'),
+        choose_from_menu(get_list_of_languages(), 'lang', $config->lang, '', '', '', true) );
+
+/// language menu
+    $interface['langmenu'] = new configvar ( get_string('configlangmenu', 'admin'),
+        choose_from_menu($noyesoptions, 'langmenu', $config->langmenu, '', '', '', true) );
+
+/// language list
+    $interface['langlist'] = new configvar ( get_string('configlanglist', 'admin'),
+        '<input name="langlist" type="text" size="60" value="'.s($config->langlist).'" alt="langlist" />' );
+
+/// language menu
+    $interface['langcache'] = new configvar ( get_string('configlangcache', 'admin'),
+        choose_from_menu($noyesoptions, 'langcache', $config->langcache, '', '', '', true) );
+
+/// locale
+    $interface['locale'] = new configvar ( get_string('configlocale', 'admin'),
+        '<input name="locale" type="text" size="15" value="'.s($config->locale).'" alt="locale" />' );
+
+/// docroot
+    $interface['docroot'] = new configvar ( get_string('configdocroot', 'admin'),
+        '<input name="docroot" type="text" size="60" value="'.s($config->docroot).'" alt="docroot" />' );
+
+/// doctonewwindow
+    $interface['doctonewwindow'] = new configvar ( get_string('configdoctonewwindow', 'admin'),
+        choose_from_menu($noyesoptions, 'doctonewwindow', $config->doctonewwindow, '', '', '', true) );
+
+/// timezone
+    $interface['timezone'] = new configvar ( get_string('configtimezone', 'admin'),
+        choose_from_menu (get_list_of_timezones(), 'timezone', $config->timezone, get_string('serverlocaltime'), '', '99', true ) );
+
+/// country
+    $interface['country'] = new configvar ( get_string('configcountry', 'admin'),
+        choose_from_menu (get_list_of_countries(), 'country', $config->country, get_string('selectacountry'), '', 0, true) );
+
+/// framename
+    if (empty($config->framename)) {
+        $config->framename = "_top";
+    }
+
+    $interface['framename'] = new configvar (get_string('configframename', 'admin'),
+        '<input name="framename" type="text" size="15" value="'.s($config->framename).'" alt="framename" />' );
+
+/// language list
+    $interface['themelist'] = new configvar ( get_string('configthemelist', 'admin'),
+        '<input name="themelist" type="text" size="60" value="'.s($config->themelist).'" alt="themelist" />' );
+
+/// user themes
+    $interface['allowuserthemes'] = new configvar (get_string('configallowuserthemes', 'admin'),
+        choose_from_menu ($noyesoptions, 'allowuserthemes', $config->allowuserthemes, '', '', '', true) );
+
+/// course themes
+    $interface['allowcoursethemes'] = new configvar (get_string('configallowcoursethemes', 'admin'),
+        choose_from_menu ($noyesoptions, 'allowcoursethemes', $config->allowcoursethemes, '', '', '', true) );
+
+/// allowuserblockhiding
+    $interface['allowuserblockhiding'] = new configvar (get_string('configallowuserblockhiding', 'admin'),
+        choose_from_menu ($noyesoptions, 'allowuserblockhiding', $config->allowuserblockhiding, '', '', '', true) );
+
+/// showblocksonmodpages
+    $interface['showblocksonmodpages'] = new configvar (get_string('configshowblocksonmodpages', 'admin'),
+        choose_from_menu ($noyesoptions, 'showblocksonmodpages', $config->showblocksonmodpages, '', '', '', true) );
+
+
+/// tabselectedtofront
+    $interface['tabselectedtofront'] = new configvar (get_string('tabselectedtofront', 'admin'),
+        choose_from_menu ($noyesoptions, 'tabselectedtofront', $config->tabselectedtofront, '', '', '', true) );
+
+
+
+////////////////////////////////////////////////////////////////////
+/// USER config variables
+////////////////////////////////////////////////////////////////////
+    $user = array();
+
+/// sitepolicy
+    $user['sitepolicy'] = new configvar (get_string('configsitepolicy', 'admin'),
+        '<input type="text" name="sitepolicy" size="60" value="'.$config->sitepolicy.'" alt="sitepolicy" />' );
+
+
+/// fullnamedisplay
+    unset($options);
+    $options['language']  = get_string('language');
+    $options['firstname lastname']  = get_string('firstname') . ' + ' . get_string('lastname');
+    $options['lastname firstname']  = get_string('lastname') . ' + ' . get_string('firstname');
+    $options['firstname']  = get_string('firstname');
+
+    $user['fullnamedisplay'] = new configvar (get_string('configfullnamedisplay', 'admin'),
+        choose_from_menu ($options, 'fullnamedisplay', $config->fullnamedisplay, '', '', '', true) );
+
+/// extendedusernamechars
+    $user['extendedusernamechars'] = new configvar (get_string('configextendedusernamechars', 'admin'),
+        choose_from_menu ($noyesoptions, 'extendedusernamechars', $config->extendedusernamechars, '', '', '', true) );
+
+/// autologinguests
+    $user['autologinguests'] = new configvar (get_string('configautologinguests', 'admin'),
+        choose_from_menu ($noyesoptions, 'autologinguests', $config->autologinguests, '', '', '', true) );
+
+/// hiddenuserfields
+    $fields = array('none', 'description', 'city', 'country', 'webpage', 'icqnumber', 'skypeid', 'yahooid', 'aimid', 'msnid', 'lastaccess');
+    if (empty($config->hiddenuserfields)) {
+        $config->hiddenuserfields = 'none';
+    }
+    $configfields = array_flip(explode(',', $config->hiddenuserfields));
+    $fieldoptions = '';
+    foreach ($fields as $value) {
+        $fieldoptions .= '<option value="'.$value.'"';
+        if (isset($configfields[$value])) {
+            $fieldoptions .= ' selected="selected"';
+        }
+        $fieldoptions .= '>'.get_string($value).'</option>';
+    }
+
+    $user['hiddenuserfields'] = new configvar (get_string('confighiddenuserfields', 'admin'),
+        '<select id="menuhiddenuserfields" name="hiddenuserfields[]" size="10" multiple="multiple">'.$fieldoptions.'</select>' );
+
+
+
+
+////////////////////////////////////////////////////////////////////
+/// SECURITY config variables
+////////////////////////////////////////////////////////////////////
+    $security = array();
+
+/// displayloginfailures
+    unset($options);
+    $options[''] = get_string('nobody');
+    $options['admin'] = get_string('administrators');
+    $options['teacher'] = get_string('administratorsandteachers');
+    $options['everybody'] = get_string('everybody');
+
+    $security['displayloginfailures'] = new configvar (get_string('configdisplayloginfailures', 'admin'),
+        choose_from_menu($options, 'displayloginfailures', $config->displayloginfailures, '', '', '', true) );
+
+/// notifyloginfailures
+    unset($options);
+    $options[''] = get_string('nobody');
+    $options['mainadmin'] = get_string('administrator');
+    $options['alladmins'] = get_string('administratorsall');
+
+    $security['notifyloginfailures'] = new configvar (get_string('confignotifyloginfailures', 'admin'),
+        choose_from_menu($options, 'notifyloginfailures', $config->notifyloginfailures, '', '', '', true) );
+
+/// notifyloginthreshold
+    unset($options);
+    for ($i=1; $i<=100; $i++) {
+        $options[$i] = "$i";
+    }
+
+    $security['notifyloginthreshold'] = new configvar (get_string('confignotifyloginthreshold', 'admin'),
+        choose_from_menu($options, 'notifyloginthreshold', $config->notifyloginthreshold, '', '', '', true) );
+
+/// secureforms
+    $security['secureforms'] = new configvar (get_string('configsecureforms', 'admin'),
+        choose_from_menu ($noyesoptions, 'secureforms', $config->secureforms, '', '', '', true) );
+
+/// loginhttps
+    $security['loginhttps'] = new configvar (get_string('configloginhttps', 'admin'),
+        choose_from_menu ($noyesoptions, 'loginhttps', $config->loginhttps, '', '', '', true) );
+
+/// runclamonupload
+    $security['runclamonupload'] = new configvar (get_string('configrunclamonupload', 'admin'),
+        choose_from_menu($noyesoptions, 'runclamonupload', $config->runclamonupload, '', '', '', true) );
+
+/// pathtoclam
+    $security['pathtoclam'] = new configvar (get_string('configpathtoclam', 'admin'),
+        '<input type="text" name="pathtoclam" size="30" value="'.$config->pathtoclam.'" alt="pathtoclam" />' );
+
+/// quarantinedir
+    $security['quarantinedir'] = new configvar (get_string('configquarantinedir', 'admin'),
+        '<input type="text" name="quarantinedir" size="30" value="'.$config->quarantinedir.'" alt="quarantinedir" />' );
+
+/// clamfailureonupload
+    unset($options);
+    $options['donothing'] = get_string('configclamdonothing', 'admin');
+    $options['actlikevirus'] = get_string('configclamactlikevirus', 'admin');
+
+    $security['clamfailureonupload'] = new configvar (get_string('configclamfailureonupload', 'admin'),
+        choose_from_menu($options, 'clamfailureonupload', $config->clamfailureonupload, '', '', '', true) );
+
+
+
+
+////////////////////////////////////////////////////////////////////
+/// MAINTENANCE config variables
+////////////////////////////////////////////////////////////////////
+    $maintenance = array();
+
+/// longtimenosee
+    unset($options);
+    $options[0]    = get_string('never');
+    $options[1000] = get_string('numdays', '', 1000);
+    $options[365]  = get_string('numdays', '', 365);
+    $options[180]  = get_string('numdays', '', 180);
+    $options[150]  = get_string('numdays', '', 150);
+    $options[120]  = get_string('numdays', '', 120);
+    $options[90]   = get_string('numdays', '', 90);
+    $options[60]   = get_string('numdays', '', 60);
+    $options[30]   = get_string('numdays', '', 30);
+    $options[21]   = get_string('numdays', '', 21);
+    $options[14]   = get_string('numdays', '', 14);
+    $options[7]   = get_string('numdays', '', 7);
+
+    $maintenance['longtimenosee'] = new configvar (get_string('configlongtimenosee', 'admin'),
+        choose_from_menu ($options, 'longtimenosee', $config->longtimenosee, '', '', '', true) );
+
+/// deleteunconfirmed
+    unset($options);
+    $options[0]    = get_string('never');
+    $options[168]  = get_string('numdays', '', 7);
+    $options[144]  = get_string('numdays', '', 6);
+    $options[120]  = get_string('numdays', '', 5);
+    $options[96]   = get_string('numdays', '', 4);
+    $options[72]   = get_string('numdays', '', 3);
+    $options[48]   = get_string('numdays', '', 2);
+    $options[24]   = get_string('numdays', '', 1);
+    $options[12]   = get_string('numhours', '', 12);
+    $options[6]    = get_string('numhours', '', 6);
+    $options[1]    = get_string('numhours', '', 1);
+
+    $maintenance['deleteunconfirmed'] = new configvar (get_string('configdeleteunconfirmed', 'admin'),
+        choose_from_menu ($options, 'deleteunconfirmed', $config->deleteunconfirmed, '', '', '', true) );
+
+/// loglifetime
+    unset($options);
+    $options[0]    = get_string('neverdeletelogs');
+    $options[1000] = get_string('numdays', '', 1000);
+    $options[365]  = get_string('numdays', '', 365);
+    $options[180]  = get_string('numdays', '', 180);
+    $options[150]  = get_string('numdays', '', 150);
+    $options[120]  = get_string('numdays', '', 120);
+    $options[90]   = get_string('numdays', '', 90);
+    $options[60]   = get_string('numdays', '', 60);
+    $options[30]   = get_string('numdays', '', 30);
+
+    $maintenance['loglifetime'] = new configvar (get_string('configloglifetime', 'admin'),
+        choose_from_menu ($options, 'loglifetime', $config->loglifetime, '', '', '', true) );
+
+
+////////////////////////////////////////////////////////////////////
+/// MAIL config variables
+////////////////////////////////////////////////////////////////////
+    $mail = array();
+
+/// smtphosts
+    $mail['smtphosts'] = new configvar (get_string('configsmtphosts', 'admin'),
+        '<input name="smtphosts" type="text" size="30" value="'.s($config->smtphosts).'" alt="smtphosts" />' );
+
+/// smtpuser
+    $mail['smtpuser'] = new configvar (get_string('configsmtpuser', 'admin'),
+        '<input name="smtpuser" type="text" size="10" value="'.s($config->smtpuser).'" alt="smtpuser" />' );
+
+/// smtppass
+    $mail['smtppass'] = new configvar ('',
+        '<input name="smtppass" type="password" size="10" value="'.s($config->smtppass).'" alt="smtppass" />' );
+
+/// noreplyaddress
+    $mail['noreplyaddress'] = new configvar (get_string('confignoreplyaddress', 'admin'),
+        '<input name="noreplyaddress" type="text" size="30" value="'.s($config->noreplyaddress).'" alt="noreplyaddress" />' );
+
+/// digestmailtime
+    $hours = array();
+    for ($i=0; $i<=23; $i++) {
+        $hours[$i] = sprintf("%02d",$i);
+    }
+
+    $mail['digestmailtime'] = new configvar (get_string('configdigestmailtime', 'admin'),
+        choose_from_menu($hours, 'digestmailtime', $config->digestmailtime, '', '', 0, true) );
+
+/// allowemailaddresses
+    $mail['allowemailaddresses'] = new configvar (get_string('configallowemailaddresses', 'admin'),
+        '<input name="allowemailaddresses" type="text" size="60" value="'.s($config->allowemailaddresses).'" alt="allowemailaddresses" />' );
+
+/// denyemailaddresses
+    $mail['denyemailaddresses'] = new configvar (get_string('configdenyemailaddresses', 'admin'),
+        '<input name="denyemailaddresses" type="text" size="60" value="'.s($config->denyemailaddresses).'" alt="denyemailaddresses" />' );
+
+    if (!empty($CFG->unicodedb)) { ///These options are only available if running under unicodedb
+    /// sitemailcharset
+        unset($options);
+        unset($charsets);
+        $charsets = get_list_of_charsets();
+        $options['0'] = get_string('none');
+        $options = array_merge($options, $charsets);
+        $mail['sitemailcharset'] = new configvar (get_string('configsitemailcharset', 'admin'),
+            choose_from_menu($options, 'sitemailcharset', $config->sitemailcharset, '', '', '', true));
+
+    /// allowusermailcharset
+        $mail['allowusermailcharset'] = new configvar (get_string('configallowusermailcharset', 'admin'),
+            choose_from_menu($noyesoptions, 'allowusermailcharset', $config->allowusermailcharset, '', '', '', true));
+    }
+    
+/// enable stats
+if (empty($CFG->disablestatsprocessing)) {
+    $stats['enablestats'] = new configvar (get_string('configenablestats','admin'),
+        choose_from_menu($noyesoptions, 'enablestats', $config->enablestats, '', '', '', true) );
+
+    unset($options);
+    $options['none'] = get_string('none');
+    $options[60*60*24*7] = get_string('numweeks','moodle',1);
+    $options[60*60*24*14] = get_string('numweeks','moodle',2);
+    $options[60*60*24*21] = get_string('numweeks','moodle',3);
+    $options[60*60*24*28] = get_string('nummonths','moodle',1);
+    $options[60*60*24*56] = get_string('nummonths','moodle',2);
+    $options[60*60*24*84] = get_string('nummonths','moodle',3);
+    $options[60*60*24*112] = get_string('nummonths','moodle',4);
+    $options[60*60*24*140] = get_string('nummonths','moodle',5);
+    $options[60*60*24*168] = get_string('nummonths','moodle',6);
+    $options['all'] = get_string('all');
+    
+    $stats['statsfirstrun'] = new configvar (get_string('configstatsfirstrun','admin'),
+       choose_from_menu($options,'statsfirstrun',$config->statsfirstrun,'','','',true) );
+
+    unset($options);
+    $options[0] = get_string('untilcomplete');
+    $options[60*60] = '1 '.get_string('hour');
+    $options[60*60*2] = '2 '.get_string('hours');
+    $options[60*60*3] = '3 '.get_string('hours');
+    $options[60*60*4] = '4 '.get_string('hours');
+    $options[60*60*5] = '5 '.get_string('hours');
+    $options[60*60*6] = '6 '.get_string('hours');
+    $options[60*60*7] = '7 '.get_string('hours');
+    $options[60*60*8] = '8 '.get_string('hours');
+
+    if (empty($config->statsruntimestarthour)) {
+        $config->statsruntimestarthour = 0;
+    }
+    if (empty($config->statsruntimestartminute)) {
+        $config->statsruntimestartminute = 0;
+    }
+
+    $stats['statsmaxruntime'] = new configvar (get_string('configstatsmaxruntime','admin'),
+      choose_from_menu($options,'statsmaxruntime',$config->statsmaxruntime,'','','',true) );                                        
+
+    $stats['statsruntimestart'] = new configvar (get_string('configstatsruntimestart','admin'),
+      print_time_selector("statsruntimestarthour","statsruntimestartminute",make_timestamp(2000,1,1,$config->statsruntimestarthour,$config->statsruntimestartminute),5,true) );
+
+    $stats['statsuserthreshold'] = new configvar (get_string('configstatsuserthreshold','admin'),
+      '<input type="text" name="statsuserthreshold" size="4" value="'.$config->statsuserthreshold.'" />');
+}                                        
+
+////////////////////////////////////////////////////////////////////
+
+    $configvars['interface']       = $interface;
+    $configvars['security']        = $security;
+    $configvars['operatingsystem'] = $operatingsystem;
+    $configvars['maintenance']     = $maintenance;
+    $configvars['mail']            = $mail;
+    $configvars['user']            = $user;
+    $configvars['permissions']     = $permissions;
+    $configvars['requestedcourse'] = $reqcourse;
+    $configvars['misc']            = $misc;
+if (empty($CFG->disablestatsprocessing)) {
+    $configvars['stats']           = $stats;
+}
+
+?>

admin/cron.php

@@ -1,95 +1,366 @@
-<?php
+<?PHP // $Id$
 
-// 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/>.
+/// This script looks through all the module directories for cron.php files
+/// and runs them.  These files can contain cleanup functions, email functions
+/// or anything that needs to be run on a regular basis.
+///
+/// This file is best run from cron on the host system (ie outside PHP).
+/// The script can either be invoked via the web server or via a standalone
+/// version of PHP compiled for CGI.
+///
+/// eg   wget -q -O /dev/null 'http://moodle.somewhere.edu/admin/cron.php'
+/// or   php /web/moodle/admin/cron.php 
 
-/**
- * Web cron
- *
- * This script looks through all the module directories for cron.php files
- * and runs them.  These files can contain cleanup functions, email functions
- * or anything that needs to be run on a regular basis.
- *
- * This file is best run from cron on the host system (ie outside PHP).
- * It is strongly recommended to add password protection via admin settings.
- *
- * eg   wget -q -O /dev/null 'http: *moodle.somewhere.edu/admin/cron.php?password=SeCreT666'
- *
- * It is also possible to use CLI script admin/cli/cron.php instead,
- * you can not call this script from command line any more.
- *
- * @package    core
- * @subpackage admin
- * @copyright  1999 onwards Martin Dougiamas  http://dougiamas.com
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+    $starttime = microtime();
 
+/// The following is a hack necessary to allow this script to work well 
+/// from the command line.
 
-if (defined('STDIN')) {
-    fwrite(STDERR, "ERROR: This script no longer supports CLI, please use admin/cli/cron.php instead\n");
-    exit(1);
-}
+    define('FULLME', 'cron');
+    
+/// The current directory in PHP version 4.3.0 and above isn't necessarily the
+/// directory of the script when run from the command line. The require_once()
+/// would fail, so we'll have to chdir()
 
-// This is a fake CLI script, it is a really ugly hack which emulates
-// CLI via web interface, please do not use this hack elsewhere
-define('CLI_SCRIPT', true);
-define('WEB_CRON_EMULATED_CLI', 'defined'); // ugly ugly hack, do not use elsewhere please
-define('NO_OUTPUT_BUFFERING', true);
-
-require('../config.php');
-require_once($CFG->libdir.'/clilib.php');
-require_once($CFG->libdir.'/cronlib.php');
-
-// extra safety
-session_get_instance()->write_close();
-
-// check if execution allowed
-if (!empty($CFG->cronclionly)) {
-    // This script can only be run via the cli.
-    print_error('cronerrorclionly', 'admin');
-    exit;
-}
-// This script is being called via the web, so check the password if there is one.
-if (!empty($CFG->cronremotepassword)) {
-    $pass = optional_param('password', '', PARAM_RAW);
-    if ($pass != $CFG->cronremotepassword) {
-        // wrong password.
-        print_error('cronerrorpassword', 'admin');
-        exit;
+    if (!isset($_SERVER['REMOTE_ADDR']) && isset($_SERVER['argv'][0])) {
+        chdir(dirname($_SERVER['argv'][0]));
     }
-}
 
-// send mime type and encoding
-if (check_browser_version('MSIE')) {
-    //ugly IE hack to work around downloading instead of viewing
-    @header('Content-Type: text/html; charset=utf-8');
-    echo "<xmp>"; //<pre> is not good enough for us here
-} else {
-    //send proper plaintext header
-    @header('Content-Type: text/plain; charset=utf-8');
-}
+    require_once(dirname(__FILE__) . '/../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
 
-// we do not want html markup in emulated CLI
-@ini_set('html_errors', 'off');
+    if (!$alreadyadmin = has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+        unset($_SESSION['USER']);
+        unset($USER);
+        unset($_SESSION['SESSION']);
+        unset($SESSION);
+        $USER = get_admin();      /// Temporarily, to provide environment for this script
+        // we need to override the admin timezone to the moodle timezone!
+        $USER->timezone = $CFG->timezone;
+    }
 
-// execute the cron
-cron_run();
+    //unset test cookie, user must login again anyway
+    setcookie('MoodleSessionTest'.$CFG->sessioncookie, '', time() - 3600, '/');
 
-// finish the IE hack
-if (check_browser_version('MSIE')) {
-    echo "</xmp>";
-}
+/// switch to site language and locale
+    if (!empty($CFG->courselang)) {
+        unset ($CFG->courselang);
+    }
+    if (!empty($SESSION->lang)) {
+        unset ($SESSION->lang);
+    }
+    $USER->lang = '';
+    moodle_setlocale();
+
+/// send mime type and encoding
+    if (check_browser_version('MSIE')) {
+        //ugly IE hack to work around downloading instead of viewing
+        @header('Content-Type: text/html; charset='.current_charset());
+        echo "<xmp>"; //<pre> is not good enough for us here
+    } else {
+        //send proper plaintext header
+        @header('Content-Type: text/plain; charset='.current_charset());
+    }
+
+/// increase memory limit (PHP 5.2 does different calculation, we need more memory now)
+    @raise_memory_limit('128M');
+
+/// Start output log
+
+    $timenow  = time();
+
+    mtrace("Server Time: ".date('r',$timenow)."\n\n");
+
+/// Run all cron jobs for each module
+
+    mtrace("Starting activity modules");
+    if ($mods = get_records_select("modules", "cron > 0 AND (($timenow - lastcron) > cron)")) {
+        foreach ($mods as $mod) {
+            $libfile = "$CFG->dirroot/mod/$mod->name/lib.php";
+            if (file_exists($libfile)) {
+                include_once($libfile);
+                $cron_function = $mod->name."_cron";
+                if (function_exists($cron_function)) {
+                    mtrace("Processing module function $cron_function ...", '');
+                    if ($cron_function()) {
+                        if (! set_field("modules", "lastcron", $timenow, "id", $mod->id)) {
+                            mtrace("Error: could not update timestamp for $mod->fullname");
+                        }
+                    }
+                    mtrace("done.");
+                }
+            }
+        }
+    }
+    mtrace("Finished activity modules");
+
+    mtrace("Starting blocks");
+    if ($blocks = get_records_select("block", "cron > 0 AND (($timenow - lastcron) > cron)")) {
+        // we will need the base class.
+        require_once($CFG->dirroot.'/blocks/moodleblock.class.php');
+        foreach ($blocks as $block) {
+            $blockfile = $CFG->dirroot.'/blocks/'.$block->name.'/block_'.$block->name.'.php';
+            if (file_exists($blockfile)) {
+                require_once($blockfile);
+                $classname = 'block_'.$block->name;
+                $blockobj = new $classname; 
+                if (method_exists($blockobj,'cron')) {
+                    mtrace("Processing cron function for ".$block->name.'....','');
+                    if ($blockobj->cron()) {
+                        if (!set_field('block','lastcron',$timenow,'id',$block->id)) {
+                            mtrace('Error: could not update timestamp for '.$block->name);
+                        }
+                    }
+                    mtrace('done.');
+                }
+            }
+
+        }
+    }
+    mtrace('Finished blocks');
+
+    if (!empty($CFG->langcache)) {
+        mtrace('Updating languages cache');
+        get_list_of_languages();
+    }
+
+    mtrace('Removing expired enrolments ...', '');     // See MDL-8785
+    $timenow = time();
+    if ($oldenrolments = get_records_select('role_assignments', "timeend > 0 AND timeend < '$timenow'")) {
+        mtrace(count($oldenrolments).' to delete');
+        foreach ($oldenrolments as $oldenrolment) {
+            if (role_unassign($oldenrolment->roleid, $oldenrolment->userid, 0, $oldenrolment->contextid)) {
+                mtrace("Deleted expired role assignment $oldenrolment->roleid for user $oldenrolment->userid from context $oldenrolment->contextid");
+            }
+        }
+        mtrace('Done');
+    } else {
+        mtrace('none found');
+    }
 
 
+/// Run all core cron jobs, but not every time since they aren't too important.
+/// These don't have a timer to reduce load, so we'll use a random number 
+/// to randomly choose the percentage of times we should run these jobs.
+
+    srand ((double) microtime() * 10000000);
+    $random100 = rand(0,100);
+
+    if ($random100 < 20) {     // Approximately 20% of the time.
+        mtrace("Running clean-up tasks...");
+
+        /// Unenrol users who haven't logged in for $CFG->longtimenosee
+
+        if ($CFG->longtimenosee) { // value in days
+            $longtime = $timenow - ($CFG->longtimenosee * 3600 * 24);
+            if ($assigns = get_users_longtimenosee($longtime)) {
+                foreach ($assigns as $assign) {
+                    if ($context = get_context_instance(CONTEXT_COURSE, $assign->courseid)) {
+                        if (role_unassign(0, $assign->id, 0, $context->id)) {
+                            mtrace("Deleted student enrolment for user $assign->id from course $assign->courseid");
+                        }
+                    }
+                }
+            }
+        }
+    
+    
+        /// Delete users who haven't confirmed within required period
+
+        if (!empty($CFG->deleteunconfirmed)) {
+            $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
+            if ($users = get_users_unconfirmed($oneweek)) {
+                foreach ($users as $user) {
+                    if (delete_records('user', 'id', $user->id)) {
+                        mtrace("Deleted unconfirmed user for ".fullname($user, true)." ($user->id)");
+                    }
+                }
+            }
+        }
+        flush();
+
+
+
+        /// Delete users who haven't completed profile within required period
+
+        if (!empty($CFG->deleteunconfirmed)) {
+            $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
+            if ($users = get_users_not_fully_set_up($oneweek)) {
+                foreach ($users as $user) {
+                    if (delete_records('user', 'id', $user->id)) {
+                        mtrace("Deleted not fully setup user $user->username ($user->id)");
+                    }
+                }
+            }
+        }
+        flush();
+
+
+    
+        /// Delete old logs to save space (this might need a timer to slow it down...)
+    
+        if (!empty($CFG->loglifetime)) {  // value in days
+            $loglifetime = $timenow - ($CFG->loglifetime * 3600 * 24);
+            delete_records_select("log", "time < '$loglifetime'");
+        }
+        flush();
+
+        /// Delete old cached texts
+
+        if (!empty($CFG->cachetext)) {   // Defined in config.php
+            $cachelifetime = time() - $CFG->cachetext - 60;  // Add an extra minute to allow for really heavy sites
+            delete_records_select('cache_text', "timemodified < '$cachelifetime'");
+        }
+        flush();
+
+        if (!empty($CFG->notifyloginfailures)) {
+            notify_login_failures();
+        }
+        flush();
+
+        sync_metacourses();
+
+        //
+        // generate new password emails for users 
+        //
+        mtrace('checking for create_password');
+        if (count_records('user_preferences', 'name', 'create_password', 'value', '1')) {
+            mtrace('creating passwords for new users');
+            $newusers = get_records_sql("SELECT  u.id as id, u.email, u.firstname, 
+                                                u.lastname, u.username,
+                                                p.id as prefid 
+                                        FROM {$CFG->prefix}user u 
+                                             JOIN {$CFG->prefix}user_preferences p ON u.id=p.userid
+                                        WHERE p.name='create_password' AND p.value=1 AND u.email !='' ");
+
+            foreach ($newusers as $newuserid => $newuser) {
+                $newuser->emailstop = 0; // send email regardless
+                // email user                               
+                if (setnew_password_and_mail($newuser)) {
+                    // remove user pref
+                    delete_records('user_preferences', 'id', $newuser->prefid);
+                } else {
+                    trigger_error("Could not create and mail new user password!");
+                }
+            }
+        }
+
+    } // End of occasional clean-up tasks
+
+
+    if (empty($CFG->disablescheduledbackups)) {   // Defined in config.php
+        //Execute backup's cron
+        //Perhaps a long time and memory could help in large sites
+        @set_time_limit(0);
+        @raise_memory_limit("192M");
+        if (function_exists('apache_child_terminate')) {
+            // if we are running from Apache, give httpd a hint that 
+            // it can recycle the process after it's done. Apache's 
+            // memory management is truly awful but we can help it.
+            @apache_child_terminate();
+        }
+        if (file_exists("$CFG->dirroot/backup/backup_scheduled.php") and
+            file_exists("$CFG->dirroot/backup/backuplib.php") and
+            file_exists("$CFG->dirroot/backup/lib.php") and
+            file_exists("$CFG->libdir/blocklib.php")) {
+            include_once("$CFG->dirroot/backup/backup_scheduled.php");
+            include_once("$CFG->dirroot/backup/backuplib.php");
+            include_once("$CFG->dirroot/backup/lib.php");
+            require_once ("$CFG->libdir/blocklib.php");
+            mtrace("Running backups if required...");
+    
+            if (! schedule_backup_cron()) {
+                mtrace("ERROR: Something went wrong while performing backup tasks!!!");
+            } else {
+                mtrace("Backup tasks finished.");
+            }
+        }
+    }
+
+    if (!empty($CFG->enablerssfeeds)) {  //Defined in admin/variables page
+        include_once("$CFG->libdir/rsslib.php");
+        mtrace("Running rssfeeds if required...");
+
+        if ( ! cron_rss_feeds()) {
+            mtrace("Something went wrong while generating rssfeeds!!!");
+        } else {
+            mtrace("Rssfeeds finished");
+        }
+    }
+
+/// Run the enrolment cron, if any
+    if (!($plugins = explode(',', $CFG->enrol_plugins_enabled))) {
+        $plugins = array($CFG->enrol);
+    }
+    require_once($CFG->dirroot .'/enrol/enrol.class.php');
+    foreach ($plugins as $p) {
+        $enrol = enrolment_factory::factory($p);
+        if (method_exists($enrol, 'cron')) {
+            $enrol->cron();
+        }
+        if (!empty($enrol->log)) {
+            mtrace($enrol->log);
+        }
+        unset($enrol);
+    }
+
+    if (!empty($CFG->enablestats) and empty($CFG->disablestatsprocessing)) {
+
+        // check we're not before our runtime
+        $timetocheck = strtotime("$CFG->statsruntimestarthour:$CFG->statsruntimestartminute today");
+
+        if (time() > $timetocheck) {
+            $time = 60*60*20; // set it to 20 here for first run... (overridden by $CFG)
+            $clobber = true;
+            if (!empty($CFG->statsmaxruntime)) {
+                $time = $CFG->statsmaxruntime+(60*30); // add on half an hour just to make sure (it could take that long to break out of the loop)
+            }
+            if (!get_field_sql('SELECT id FROM '.$CFG->prefix.'stats_daily')) {
+                // first run, set another lock. we'll check for this in subsequent runs to set the timeout to later for the normal lock.
+                set_cron_lock('statsfirstrunlock',true,$time,true);
+                $firsttime = true;
+            }
+            $time = 60*60*2; // this time set to 2.. (overridden by $CFG)
+            if (!empty($CFG->statsmaxruntime)) {
+                $time = $CFG->statsmaxruntime+(60*30); // add on half an hour to make sure (it could take that long to break out of the loop)
+            }
+            if ($config = get_record('config','name','statsfirstrunlock')) {
+                if (!empty($config->value)) {
+                    $clobber = false; // if we're on the first run, just don't clobber it.
+                }
+            }
+            if (set_cron_lock('statsrunning',true,$time, $clobber)) {
+                require_once($CFG->dirroot.'/lib/statslib.php');
+                $return = stats_cron_daily();
+                if (stats_check_runtime() && $return == STATS_RUN_COMPLETE) {
+                    stats_cron_weekly();
+                }
+                if (stats_check_runtime() && $return == STATS_RUN_COMPLETE) {
+                    $return = $return && stats_cron_monthly();
+                }
+                if (stats_check_runtime() && $return == STATS_RUN_COMPLETE) {
+                    stats_clean_old();
+                }
+                set_cron_lock('statsrunning',false);
+                if (!empty($firsttime)) {
+                    set_cron_lock('statsfirstrunlock',false);
+                }
+            }
+        }
+    }
+
+    //Unset session variables and destroy it
+    @session_unset();
+    @session_destroy();
+
+    mtrace("Cron script completed correctly");
+
+    $difftime = microtime_diff($starttime, microtime());
+    mtrace("Execution took ".$difftime." seconds"); 
+
+/// finishe the IE hack
+    if (check_browser_version('MSIE')) {
+        echo "</xmp>";
+    }
+
+?>

admin/dbperformance.php

@@ -0,0 +1,41 @@
+<?PHP  // $Id$
+       // dbperformance.php - shows latest ADOdb stats for the current server
+
+    require_once('../config.php');
+
+    // disable moodle specific debug messages that would be breaking the frames
+    disable_debugging();
+
+    $topframe    = optional_param('topframe', 0, PARAM_BOOL);
+    $bottomframe = optional_param('bottomframe', 0, PARAM_BOOL);
+    $do          = optional_param('do', '', PARAM_ALPHA);
+
+    require_login();
+
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+
+    $strdatabaseperformance = get_string("databaseperformance");
+    $stradministration = get_string("administration");
+    $site = get_site();
+
+    if (!empty($topframe)) {
+        print_header("$site->shortname: $strdatabaseperformance", "$site->fullname", 
+                     "<a target=\"$CFG->framename\" href=\"index.php\">$stradministration</a> -> Database performance");
+        exit;
+    }
+
+    if (!empty($bottomframe) or !empty($do)) {
+        $perf =&NewPerfMonitor($db);
+        $perf->UI($pollsecs=5);
+        exit;
+    }
+
+?>
+<head>
+<title><?php echo "$site->shortname: $strdatabaseperformance" ?></title>
+</head>
+
+<frameset rows="80,*">
+   <frame src="dbperformance.php?topframe=true">
+   <frame src="dbperformance.php?bottomframe=true">
+</frameset>

admin/delete.php

@@ -0,0 +1,81 @@
+<?PHP //$Id$
+
+// Deletes the moodledata directory, COMPLETELY!!
+// BE VERY CAREFUL USING THIS!
+
+    require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('purgemoodledata', $adminroot);
+
+    require_login();
+
+    $sure       = optional_param('sure', 0, PARAM_BOOL);
+    $reallysure = optional_param('reallysure', 0, PARAM_BOOL);
+
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+
+    $deletedir = $CFG->dataroot;   // The directory to delete!
+
+    admin_externalpage_print_header($adminroot);
+    print_heading('Purge moodledata');
+
+    if (empty($sure)) {
+        $optionsyes = array('sure'=>'yes', 'sesskey'=>sesskey());
+        notice_yesno ('Are you completely sure you want to delete everything inside the directory '. $deletedir .' ?',
+            'delete.php', 'index.php', $optionsyes, NULL, 'post', 'get');
+        admin_externalpage_print_footer($adminroot);
+        exit;
+    }
+
+    if (!data_submitted() or empty($reallysure)) {
+        $optionsyes = array('sure'=>'yes', 'sesskey'=>sesskey(), 'reallysure'=>'yes');
+        notice_yesno ('Are you REALLY REALLY completely sure you want to delete everything inside the directory '. $deletedir .' (this includes all user images, and any other course files that have been created) ?',
+            'delete.php', 'index.php', $optionsyes, NULL, 'post', 'get');
+        admin_externalpage_print_footer($adminroot);
+        exit;
+    }
+
+    if (!confirm_sesskey()) {
+        error('This script was called wrongly');
+    }
+
+    /// OK, here goes ...
+
+    delete_subdirectories($deletedir);
+
+    echo '<h1 align="center">Done!</h1>';
+    print_continue($CFG->wwwroot);
+    admin_externalpage_print_footer($adminroot);
+    exit;
+
+
+function delete_subdirectories($rootdir) {
+
+    $dir = opendir($rootdir);
+
+    while ($file = readdir($dir)) {
+        if ($file != '.' and $file != '..') {
+            $fullfile = $rootdir .'/'. $file;
+            if (filetype($fullfile) == 'dir') {
+                delete_subdirectories($fullfile);
+                echo 'Deleting '. $fullfile .' ... ';
+                if (rmdir($fullfile)) {
+                    echo 'Done.<br />';
+                } else {
+                    echo 'FAILED.<br />';
+                }
+            } else {
+                echo 'Deleting '. $fullfile .' ... ';
+                if (unlink($fullfile)) {
+                    echo 'Done.<br />';
+                } else {
+                    echo 'FAILED.<br />';
+                }
+            }
+        }
+    }
+    closedir($dir);
+}
+
+?>

admin/editors.php

@@ -1,94 +0,0 @@
-<?php
-
-/**
- * Allows admin to configure editors.
- */
-
-require_once('../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->libdir.'/tablelib.php');
-
-require_login();
-require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
-
-$returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageeditors";
-
-$action = optional_param('action', '', PARAM_ACTION);
-$editor = optional_param('editor', '', PARAM_PLUGIN);
-
-// get currently installed and enabled auth plugins
-$available_editors = editors_get_available();
-if (!empty($editor) and empty($available_editors[$editor])) {
-    redirect ($returnurl);
-}
-
-$active_editors = explode(',', $CFG->texteditors);
-foreach ($active_editors as $key=>$active) {
-    if (empty($available_editors[$active])) {
-        unset($active_editors[$key]);
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// process actions
-
-if (!confirm_sesskey()) {
-    redirect($returnurl);
-}
-
-
-$return = true;
-switch ($action) {
-    case 'disable':
-        // remove from enabled list
-        $key = array_search($editor, $active_editors);
-        unset($active_editors[$key]);
-        break;
-
-    case 'enable':
-        // add to enabled list
-        if (!in_array($editor, $active_editors)) {
-            $active_editors[] = $editor;
-            $active_editors = array_unique($active_editors);
-        }
-        break;
-
-    case 'down':
-        $key = array_search($editor, $active_editors);
-        // check auth plugin is valid
-        if ($key !== false) {
-            // move down the list
-            if ($key < (count($active_editors) - 1)) {
-                $fsave = $active_editors[$key];
-                $active_editors[$key] = $active_editors[$key + 1];
-                $active_editors[$key + 1] = $fsave;
-            }
-        }
-        break;
-
-    case 'up':
-        $key = array_search($editor, $active_editors);
-        // check auth is valid
-        if ($key !== false) {
-            // move up the list
-            if ($key >= 1) {
-                $fsave = $active_editors[$key];
-                $active_editors[$key] = $active_editors[$key - 1];
-                $active_editors[$key - 1] = $fsave;
-            }
-        }
-        break;
-    default:
-        break;
-}
-
-// at least one editor must be active
-if (empty($active_editors)) {
-    $active_editors = array('textarea');
-}
-
-set_config('texteditors', implode(',', $active_editors));
-
-if ($return) {
-    redirect ($returnurl);
-}

admin/enrol.php

@@ -1,127 +1,104 @@
-<?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/>.
+<?PHP  // $Id$
+       // enrol.php - allows admin to edit all enrollment variables
+       //             Yes, enrol is correct English spelling.
 
-/**
- * Enrol config manipulation script.
- *
- * @package    core
- * @subpackage enrol
- * @copyright  2010 Petr Skoda {@link http://skodak.org}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+    require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
 
-require_once('../config.php');
-require_once($CFG->libdir.'/adminlib.php');
+    $enrol = optional_param('enrol', $CFG->enrol, PARAM_SAFEDIR);
+    $CFG->pagepath = 'enrol';
 
-$action  = required_param('action', PARAM_ACTION);
-$enrol   = required_param('enrol', PARAM_PLUGIN);
-$confirm = optional_param('confirm', 0, PARAM_BOOL);
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('enrolment', $adminroot);
 
-$PAGE->set_url('/admin/enrol.php');
-$PAGE->set_context(context_system::instance());
 
-require_login();
-require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
-require_sesskey();
 
-$enabled = enrol_get_plugins(true);
-$all     = enrol_get_plugins(false);
+    require_once("$CFG->dirroot/enrol/enrol.class.php");   /// Open the factory class
 
-$return = new moodle_url('/admin/settings.php', array('section'=>'manageenrols'));
+/// Save settings
 
-$syscontext = context_system::instance();
-
-switch ($action) {
-    case 'disable':
-        unset($enabled[$enrol]);
-        set_config('enrol_plugins_enabled', implode(',', array_keys($enabled)));
-        $syscontext->mark_dirty(); // resets all enrol caches
-        break;
-
-    case 'enable':
-        if (!isset($all[$enrol])) {
-            break;
+    if ($frm = data_submitted()) {
+        if (!confirm_sesskey()) {
+            error(get_string('confirmsesskeybad', 'error'));
         }
-        $enabled = array_keys($enabled);
-        $enabled[] = $enrol;
-        set_config('enrol_plugins_enabled', implode(',', $enabled));
-        $syscontext->mark_dirty(); // resets all enrol caches
-        break;
-
-    case 'up':
-        if (!isset($enabled[$enrol])) {
-            break;
+        if (empty($frm->enable)) {
+            $frm->enable = array();
         }
-        $enabled = array_keys($enabled);
-        $enabled = array_flip($enabled);
-        $current = $enabled[$enrol];
-        if ($current == 0) {
-            break; //already at the top
+        if (empty($frm->default)) {
+            $frm->default = '';
         }
-        $enabled = array_flip($enabled);
-        $enabled[$current] = $enabled[$current - 1];
-        $enabled[$current - 1] = $enrol;
-        set_config('enrol_plugins_enabled', implode(',', $enabled));
-        break;
-
-    case 'down':
-        if (!isset($enabled[$enrol])) {
-            break;
+        if ($frm->default && $frm->default != 'manual' && !in_array($frm->default, $frm->enable)) {
+            $frm->enable[] = $frm->default;
         }
-        $enabled = array_keys($enabled);
-        $enabled = array_flip($enabled);
-        $current = $enabled[$enrol];
-        if ($current == count($enabled) - 1) {
-            break; //already at the end
+        asort($frm->enable);
+        $frm->enable = array_merge(array('manual'), $frm->enable); // make sure manual plugin is called first
+        set_config('enrol_plugins_enabled', implode(',', $frm->enable));
+        set_config('enrol', $frm->default);
+        redirect("enrol.php", get_string("changessaved"), 1);
+    }
+
+/// Print the form
+
+    $str = get_strings(array('enrolmentplugins', 'users', 'administration', 'settings', 'edit'));
+
+    admin_externalpage_print_header($adminroot);
+
+    $modules = get_list_of_plugins("enrol");
+    $options = array();
+    foreach ($modules as $module) {
+        $options[$module] = get_string("enrolname", "enrol_$module");
+    }
+    asort($options);
+
+    print_simple_box(get_string('configenrolmentplugins', 'admin'), 'center', '700');
+
+    echo "<form target=\"{$CFG->framename}\" name=\"enrolmenu\" method=\"post\" action=\"enrol.php\">";
+    echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\">";
+
+    $table = new stdClass();
+    $table->head = array(get_string('name'), get_string('enable'), get_string('default'), $str->settings);
+    $table->align = array('left', 'center', 'center', 'center');
+    $table->size = array('60%', '', '', '15%');
+    $table->width = '700';
+    $table->data = array();
+
+    $modules = get_list_of_plugins("enrol");
+    foreach ($modules as $module) {
+
+        // skip if directory is empty
+        if (!file_exists("$CFG->dirroot/enrol/$module/enrol.php")) {
+            continue;
         }
-        $enabled = array_flip($enabled);
-        $enabled[$current] = $enabled[$current + 1];
-        $enabled[$current + 1] = $enrol;
-        set_config('enrol_plugins_enabled', implode(',', $enabled));
-        break;
 
-    case 'uninstall':
-        echo $OUTPUT->header();
-        echo $OUTPUT->heading(get_string('enrolments', 'enrol'));
-
-        if (get_string_manager()->string_exists('pluginname', 'enrol_'.$enrol)) {
-            $strplugin = get_string('pluginname', 'enrol_'.$enrol);
+        $name = get_string("enrolname", "enrol_$module");
+        $plugin = enrolment_factory::factory($module);
+        $enable = '<input type="checkbox" name="enable[]" value="'.$module.'"';
+        if (stristr($CFG->enrol_plugins_enabled, $module) !== false) {
+            $enable .= ' checked="checked"';
+        }
+        if ($module == 'manual') {
+            $enable .= ' disabled="disabled"';
+        }
+        $enable .= ' />';
+        if (method_exists($plugin, 'print_entry')) {
+            $default = '<input type="radio" name="default" value="'.$module.'"';
+            if ($CFG->enrol == $module) {
+                $default .= ' checked="checked"';
+            }
+            $default .= ' />';
         } else {
-            $strplugin = $enrol;
+            $default = '';
         }
+        $table->data[$name] = array($name, $enable, $default,
+                                '<a href="enrol_config.php?enrol='.$module.'">'.$str->edit.'</a>');
+    }
+    asort($table->data);
 
-        if (!$confirm) {
-            $uurl = new moodle_url('/admin/enrol.php', array('action'=>'uninstall', 'enrol'=>$enrol, 'sesskey'=>sesskey(), 'confirm'=>1));
-            echo $OUTPUT->confirm(get_string('uninstallconfirm', 'enrol', $strplugin), $uurl, $return);
-            echo $OUTPUT->footer();
-            exit;
+    print_table($table);
 
-        } else {  // Delete everything!!
-            uninstall_plugin('enrol', $enrol);
-            $syscontext->mark_dirty(); // resets all enrol caches
+    echo "<center><input type=\"submit\" value=\"".get_string("savechanges")."\"></center>\n";
+    echo "</form>";
 
-            $a = new stdClass();
-            $a->plugin = $strplugin;
-            $a->directory = "$CFG->dirroot/enrol/$enrol";
-            echo $OUTPUT->notification(get_string('uninstalldeletefiles', 'enrol', $a), 'notifysuccess');
-            echo $OUTPUT->continue_button($return);
-            echo $OUTPUT->footer();
-            exit;
-        }
-}
+    admin_externalpage_print_footer($adminroot);
 
-
-redirect($return);
+?>

admin/enrol_config.php

@@ -0,0 +1,79 @@
+<?PHP  // $Id$
+       // enrol_config.php - allows admin to edit all enrollment variables
+       //                    Yes, enrol is correct English spelling.
+
+    require_once("../config.php");
+    require_once($CFG->libdir.'/adminlib.php');
+
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('enrolment', $adminroot);
+
+    $enrol = required_param('enrol', PARAM_ALPHA);
+    $CFG->pagepath = 'enrol/' . $enrol;
+
+
+    require_once("$CFG->dirroot/enrol/enrol.class.php");   /// Open the factory class
+
+    $enrolment = enrolment_factory::factory($enrol);
+
+/// If data submitted, then process and store.
+
+    if ($frm = data_submitted()) {
+        if (!confirm_sesskey()) {
+            error(get_string('confirmsesskeybad', 'error'));
+        }
+        if ($enrolment->process_config($frm)) {
+            redirect("enrol.php?sesskey=$USER->sesskey", get_string("changessaved"), 1);
+        }
+    } else {
+        $frm = $CFG;
+    }
+
+/// Otherwise fill and print the form.
+
+    /// get language strings
+    $str = get_strings(array('enrolmentplugins', 'configuration', 'users', 'administration'));
+
+    unset($options);
+
+    $modules = get_list_of_plugins("enrol");
+    foreach ($modules as $module) {
+        $options[$module] = get_string("enrolname", "enrol_$module");
+    }
+    asort($options);
+
+    admin_externalpage_print_header($adminroot);
+
+    echo "<form target=\"{$CFG->framename}\" name=\"enrolmenu\" method=\"post\" action=\"enrol_config.php\">";
+    echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\">";
+    echo "<div align=\"center\"><p><b>";
+
+
+/// Choose an enrolment method
+    echo get_string('chooseenrolmethod').': ';
+    choose_from_menu ($options, "enrol", $enrol, "",
+                      "document.location='enrol_config.php?enrol='+document.enrolmenu.enrol.options[document.enrolmenu.enrol.selectedIndex].value", "");
+
+    echo "</b></p></div>";
+
+/// Print current enrolment type description
+    print_simple_box_start("center", "80%");
+    print_heading($options[$enrol]);
+
+    print_simple_box_start("center", "60%", '', 5, 'informationbox');
+    print_string("description", "enrol_$enrol");
+    print_simple_box_end();
+
+    echo "<hr />";
+
+    $enrolment->config_form($frm);
+
+    echo "<center><p><input type=\"submit\" value=\"".get_string("savechanges")."\"></p></center>\n";
+    echo "</form>";
+
+    print_simple_box_end();
+
+    admin_externalpage_print_footer($adminroot);
+
+    exit;
+?>

admin/environment.php

@@ -1,109 +1,137 @@
-<?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/>.
+<?php  //$Id$
 
-/**
- * This file is the admin frontend to execute all the checks available
- * in the environment.xml file. It includes database, php and
- * php_extensions. Also, it's possible to update the xml file
- * from moodle.org be able to check more and more versions.
- *
- * @package    core
- * @subpackage admin
- * @copyright  2006 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.com                                            //
+//                                                                       //
+// Copyright (C) 2001-3001 Martin Dougiamas        http://dougiamas.com  //
+//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
+//                                                                       //
+// This program is free software; you can redistribute it and/or modify  //
+// it under the terms of the GNU General Public License as published by  //
+// the Free Software Foundation; either version 2 of the License, or     //
+// (at your option) any later version.                                   //
+//                                                                       //
+// This program is distributed in the hope that it will be useful,       //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
+// GNU General Public License for more details:                          //
+//                                                                       //
+//          http://www.gnu.org/copyleft/gpl.html                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+// This file is the admin frontend to execute all the checks available
+// in the environment.xml file. It includes database, php and
+// php_extensions. Also, it's possible to update the xml file
+// from moodle.org be able to check more and more versions.
+
+    require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    require_once($CFG->libdir.'/environmentlib.php');
+    require_once($CFG->libdir.'/componentlib.class.php');
+
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('environment', $adminroot);
+
+/// Parameters
+    $action  = optional_param('action', '', PARAM_ACTION);
+    $version = optional_param('version', '', PARAM_FILE); //
 
 
-require_once('../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->libdir.'/environmentlib.php');
-require_once($CFG->libdir.'/componentlib.class.php');
+/// Get some strings
+    $stradmin = get_string('administration');
+    $stradminhelpenvironment = get_string("adminhelpenvironment");
+    $strenvironment = get_string('environment', 'admin');
+    $strerror = get_string('error');
+    $strmoodleversion = get_string('moodleversion');
+    $strupdate = get_string('updatecomponent', 'admin');
+    $strupwards = get_string('upwards', 'admin');
+    $strmisc = get_string('miscellaneous');
 
-// Parameters
-$action  = optional_param('action', '', PARAM_ACTION);
-$version = optional_param('version', '', PARAM_FILE); //
+/// Print the header stuff
+    admin_externalpage_print_header($adminroot);
 
-$extraurlparams = array();
-if ($version) {
-    $extraurlparams['version'] = $version;
-}
-admin_externalpage_setup('environment', '', $extraurlparams);
+/// Print the component download link
+    echo '<div class="reportlink"><a href="environment.php?action=updatecomponent&amp;sesskey='.$USER->sesskey.'">'.$strupdate.'</a></div>';
 
-// Handle the 'updatecomponent' action
-if ($action == 'updatecomponent' && confirm_sesskey()) {
-    // Create component installer and execute it
-    if ($cd = new component_installer('http://download.moodle.org',
-                                      'environment',
-                                      'environment.zip')) {
-        $status = $cd->install(); //returns COMPONENT_(ERROR | UPTODATE | INSTALLED)
-        switch ($status) {
-            case COMPONENT_ERROR:
-                if ($cd->get_error() == 'remotedownloaderror') {
-                    $a = new stdClass();
-                    $a->url  = 'http://download.moodle.org/environment/environment.zip';
-                    $a->dest = $CFG->dataroot . '/';
-                    print_error($cd->get_error(), 'error', $PAGE->url, $a);
-                    die();
+    print_heading($strenvironment);
 
-                } else {
-                    print_error($cd->get_error(), 'error', $PAGE->url);
-                    die();
-                }
-
-            case COMPONENT_UPTODATE:
-                redirect($PAGE->url, get_string($cd->get_error(), 'error'));
-                die;
-
-            case COMPONENT_INSTALLED:
-                redirect($PAGE->url, get_string('componentinstalled', 'admin'));
-                die;
-        }
-    }
-}
-
-// Get current Moodle version
-$current_version = $CFG->release;
-
-// Calculate list of versions
-$versions = array();
-if ($contents = load_environment_xml()) {
-    if ($env_versions = get_list_of_environment_versions($contents)) {
-        // Set the current version at the beginning
-        $env_version = normalize_version($current_version); //We need this later (for the upwards)
-        $versions[$env_version] = $current_version;
-        // If no version has been previously selected, default to $current_version
-        if (empty($version)) {
-            $version =  $env_version;
-        }
-        //Iterate over each version, adding bigger than current
-        foreach ($env_versions as $env_version) {
-            if (version_compare(normalize_version($current_version), $env_version, '<')) {
-                $versions[$env_version] = $env_version;
+/// Handle the 'updatecomponent' action
+    if ($action == 'updatecomponent' && confirm_sesskey()) {
+    /// Create component installer and execute it
+        if ($cd = new component_installer('http://download.moodle.org', 
+                                          'environment', 
+                                          'environment.zip')) {
+            $status = $cd->install(); //returns ERROR | UPTODATE | INSTALLED
+            switch ($status) {
+                case ERROR:
+                    if ($cd->get_error() == 'remotedownloadnotallowed') {
+                        $a = new stdClass();
+                        $a->url = 'http://download.moodle.org/environment/environment.zip';
+                        $a->dest= $CFG->dataroot.'/';
+                        print_simple_box(get_string($cd->get_error(), 'error', $a), 'center', '', '', 5, 'errorbox');
+                    } else {
+                        print_simple_box(get_string($cd->get_error(), 'error'), 'center', '', '', 5, 'errorbox');
+                    }
+                    break;
+                case UPTODATE:
+                    print_simple_box(get_string($cd->get_error(), 'error'), 'center');
+                    break;
+                case INSTALLED:
+                    print_simple_box(get_string('componentinstalled', 'admin'), 'center');
+                    break;
             }
         }
-        // Add 'upwards' to the last element
-        $versions[$env_version] = $env_version.' '.get_string('upwards', 'admin');
-    } else {
-        $versions = array('error' => get_string('error'));
     }
-}
 
-// Get the results of the environment check.
-list($envstatus, $environment_results) = check_moodle_environment($version);
+/// Start of main box
+    print_simple_box_start('center');
 
-// Display the page.
-$output = $PAGE->get_renderer('core', 'admin');
-echo $output->environment_check_page($versions, $version, $envstatus, $environment_results);
+    echo "<center>".$stradminhelpenvironment."</center><br />";
+
+/// Get current Moodle version
+    $current_version = $CFG->release;
+
+/// Calculate list of versions
+    $versions = array();
+    if ($contents = load_environment_xml()) {
+        if ($env_versions = get_list_of_environment_versions($contents)) {
+        /// Set the current version at the beginning
+            $env_version = normalize_version($current_version); //We need this later (for the upwards)
+            $versions[$env_version] = $current_version;
+        /// If no version has been previously selected, default to $current_version
+            if (empty($version)) {
+                $version =  $env_version;
+            }
+        ///Iterate over each version, adding bigged than current
+            foreach ($env_versions as $env_version) {
+                if (version_compare(normalize_version($current_version), $env_version, '<')) {
+                    $versions[$env_version] = $env_version;
+                }
+            }
+        /// Add 'upwards' to the last element
+            $versions[$env_version] = $env_version.' '.$strupwards;
+        } else {
+            $versions = array('error' => $strerror);
+        }
+    }
+
+/// Print form and popup menu
+    echo '<center><form method="post" action="environment.php">';
+    echo $strmoodleversion.' ';
+    choose_from_menu ($versions, 'version', $version, null, 'this.form.submit();' );
+    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+    echo '</form></center>';
+/// End of main box
+    print_simple_box_end();
+
+/// Gather and show results
+    $status = check_moodle_environment($version, $environment_results);
+
+/// Print footer
+    admin_externalpage_print_footer($adminroot);
+?>

admin/environment.xml

@@ -80,6 +80,7 @@
         <FEEDBACK>
           <ON_ERROR message="mysql416required" />
         </FEEDBACK>
+        <BYPASS function="bypass_mysql416_reqs" message="mysql416bypassed" />
       </VENDOR>
       <VENDOR name="postgres" version="7.4" />
       <VENDOR name="mssql" version="9.0" />
@@ -101,679 +102,6 @@
           <ON_CHECK message="mbstringrecommended" />
         </FEEDBACK>
       </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="curlrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opensslrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="ctyperecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
     </PHP_EXTENSIONS>
   </MOODLE>
-  <MOODLE version="1.9">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mysql" version="4.1.16">
-        <FEEDBACK>
-          <ON_ERROR message="mysql416required" />
-        </FEEDBACK>
-      </VENDOR>
-      <VENDOR name="postgres" version="8.0" />
-      <VENDOR name="mssql" version="9.0" />
-      <VENDOR name="odbc_mssql" version="9.0" />
-      <VENDOR name="mssql_n" version="9.0" />
-      <VENDOR name="oracle" version="9.0" />
-    </DATABASE>
-    <PHP version="4.3.0" level="required">
-      <RESTRICT function="restrict_php50_version" message="php50restricted" />
-    </PHP>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="iconvrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="mbstringrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="curlrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opensslrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="ctyperecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-    </PHP_EXTENSIONS>
-    <CUSTOM_CHECKS>
-      <CUSTOM_CHECK file="question/upgrade.php" function="question_check_no_rqp_questions" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="qtyperqpwillberemovedanyway" />
-          <ON_OK message="qtyperqpwillberemoved" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="question/upgrade.php" function="question_random_check" level="optional">
-        <FEEDBACK>
-          <ON_OK message="questioncwqpfsok" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/customcheckslib.php" function="php_check_register_globals" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="globalswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-    </CUSTOM_CHECKS>
-  </MOODLE>
-  <MOODLE version="2.0" requires="1.9">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mysql" version="5.0.25" />
-      <VENDOR name="postgres" version="8.3" />
-      <VENDOR name="mssql" version="9.0" />
-      <VENDOR name="odbc_mssql" version="9.0" />
-      <VENDOR name="mssql_n" version="9.0" />
-      <VENDOR name="oracle" version="10.2" />
-      <VENDOR name="sqlite" version="2.0" />
-    </DATABASE>
-    <PHP version="5.2.8" level="required">
-    </PHP>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="mbstringrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opensslrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="gdrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="intlrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-    </PHP_EXTENSIONS>
-    <PHP_SETTINGS>
-      <PHP_SETTING name="memory_limit" value="40M" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="settingmemorylimit" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="safe_mode" value="0" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingsafemode" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="file_uploads" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingfileuploads" />
-        </FEEDBACK>
-      </PHP_SETTING>
-    </PHP_SETTINGS>
-    <CUSTOM_CHECKS>
-      <CUSTOM_CHECK file="lib/customcheckslib.php" function="php_check_php533" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="php533warning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-    </CUSTOM_CHECKS>
-  </MOODLE>
-  <MOODLE version="2.1" requires="1.9">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mysql" version="5.0.25" />
-      <VENDOR name="postgres" version="8.3" />
-      <VENDOR name="mssql" version="9.0" />
-      <VENDOR name="odbc_mssql" version="9.0" />
-      <VENDOR name="mssql_n" version="9.0" />
-      <VENDOR name="oracle" version="10.2" />
-      <VENDOR name="sqlite" version="2.0" />
-    </DATABASE>
-    <PHP version="5.3.2" level="required">
-    </PHP>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="mbstringrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opensslrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="gdrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="intlrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-    </PHP_EXTENSIONS>
-    <PHP_SETTINGS>
-      <PHP_SETTING name="memory_limit" value="40M" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="settingmemorylimit" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="safe_mode" value="0" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingsafemode" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="file_uploads" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingfileuploads" />
-        </FEEDBACK>
-      </PHP_SETTING>
-    </PHP_SETTINGS>
-  </MOODLE>
-  <MOODLE version="2.2" requires="1.9">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mysql" version="5.0.25" />
-      <VENDOR name="postgres" version="8.3" />
-      <VENDOR name="mssql" version="9.0" />
-      <VENDOR name="odbc_mssql" version="9.0" />
-      <VENDOR name="mssql_n" version="9.0" />
-      <VENDOR name="oracle" version="10.2" />
-      <VENDOR name="sqlite" version="2.0" />
-    </DATABASE>
-    <PHP version="5.3.2" level="required">
-    </PHP>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="mbstringrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opensslrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="gdrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="intlrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-    </PHP_EXTENSIONS>
-    <PHP_SETTINGS>
-      <PHP_SETTING name="memory_limit" value="40M" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="settingmemorylimit" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="safe_mode" value="0" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingsafemode" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="file_uploads" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingfileuploads" />
-        </FEEDBACK>
-      </PHP_SETTING>
-    </PHP_SETTINGS>
-  </MOODLE>
-  <MOODLE version="2.3" requires="2.2">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mysql" version="5.1.33" />
-      <VENDOR name="postgres" version="8.3" />
-      <VENDOR name="mssql" version="9.0" />
-      <VENDOR name="odbc_mssql" version="9.0" />
-      <VENDOR name="mssql_n" version="9.0" />
-      <VENDOR name="oracle" version="10.2" />
-      <VENDOR name="sqlite" version="2.0" />
-    </DATABASE>
-    <PHP version="5.3.2" level="required">
-    </PHP>
-    <PCREUNICODE level="optional">
-      <FEEDBACK>
-        <ON_CHECK message="pcreunicodewarning" />
-      </FEEDBACK>
-    </PCREUNICODE>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="mbstringrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opensslrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="gdrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="intlrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="hash" level="required"/>
-    </PHP_EXTENSIONS>
-    <PHP_SETTINGS>
-      <PHP_SETTING name="memory_limit" value="40M" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="settingmemorylimit" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="safe_mode" value="0" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingsafemode" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="file_uploads" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingfileuploads" />
-        </FEEDBACK>
-      </PHP_SETTING>
-    </PHP_SETTINGS>
-  </MOODLE>
-  <MOODLE version="2.4" requires="2.2">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mysql" version="5.1.33" />
-      <VENDOR name="postgres" version="8.3" />
-      <VENDOR name="mssql" version="9.0" />
-      <VENDOR name="odbc_mssql" version="9.0" />
-      <VENDOR name="mssql_n" version="9.0" />
-      <VENDOR name="oracle" version="10.2" />
-      <VENDOR name="sqlite" version="2.0" />
-    </DATABASE>
-    <PHP version="5.3.2" level="required">
-    </PHP>
-    <PCREUNICODE level="optional">
-      <FEEDBACK>
-        <ON_CHECK message="pcreunicodewarning" />
-      </FEEDBACK>
-    </PCREUNICODE>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="mbstringrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opensslrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="gdrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="intlrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="hash" level="required"/>
-    </PHP_EXTENSIONS>
-    <PHP_SETTINGS>
-      <PHP_SETTING name="memory_limit" value="40M" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="settingmemorylimit" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="safe_mode" value="0" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingsafemode" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="file_uploads" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingfileuploads" />
-        </FEEDBACK>
-      </PHP_SETTING>
-    </PHP_SETTINGS>
-  </MOODLE>
 </COMPATIBILITY_MATRIX>

admin/filter.php

@@ -0,0 +1,98 @@
+<?php // $Id$
+    // filter.php
+    // Edit text filter settings
+
+    require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    require_once($CFG->libdir.'/tablelib.php');
+
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('managefilters', $adminroot);
+
+    // get parameters
+    $param = new Object;
+
+    $param->filter = required_param('filter', PARAM_PATH);
+    $param->submit = optional_param('submit', 0, PARAM_BOOL);
+    $param->reset  = optional_param('reset', 0, PARAM_BOOL);
+
+    $filtername =  substr($param->filter, strpos( $param->filter, '/' )+1 ) ;
+
+    // $CFG->pagepath is used to generate the body and id attributes for the body tag
+    // of the page. It is also used to generate the link to the Moodle Docs for this view.
+    $CFG->pagepath = 'filter/' . $filtername . '/config';
+
+    // get translated strings for use on page
+    $txt = new Object;
+    $txt->managefilters = get_string( 'managefilters' );
+    $txt->administration = get_string( 'administration' );
+    $txt->configuration = get_string( 'configuration' );
+
+    //======================
+    // Process Actions
+    //======================
+
+    // if reset pressed let filter config page handle it
+    $forcereset = false;
+    if (!empty($param->reset)) {
+        $forcereset = true;
+    }
+    else
+    if ($config = data_submitted()) {
+
+        // check session key
+        if (!confirm_sesskey()) {
+             error( get_string('confirmsesskeybad', 'error' ) );
+        }
+
+        $configpath = $CFG->dirroot.'/filter/'.$filtername.'/filterconfig.php';
+        if (file_exists($configpath)) {
+            require_once($configpath);
+            $functionname = $filtername.'_process_config';
+            if (function_exists($functionname)) {
+                $functionname($config);
+                $saved = true;
+            }
+        }
+
+        if (empty($saved)) {
+            // run through submitted data
+            // reject if does not start with filter_
+            foreach ($config as $name => $value) {
+                set_config($name, stripslashes($value));
+            }
+        }
+        redirect("$CFG->wwwroot/$CFG->admin/filters.php");
+        exit;
+    }
+
+    //==============================
+    // Display logic
+    //==============================
+
+    $filtername = ucfirst($filtername);
+    admin_externalpage_print_header($adminroot);
+    print_heading( $filtername );
+
+    print_simple_box("<center>".get_string("configwarning", "admin")."</center>", "center", "50%");
+    echo "<br />";
+
+    print_simple_box_start("center",'');
+
+    ?>
+    <form action="filter.php?filter=<?php echo urlencode($param->filter); ?>" method="post">
+    <input type="hidden" name="sesskey" value="<?php echo sesskey(); ?>" />
+
+    <?php include "$CFG->dirroot/$param->filter/filterconfig.html"; ?>
+
+    <center>
+        <input type="submit" name="submit" value="<?php print_string('savechanges'); ?>" />
+        <input type="submit" name="reset" value="<?php echo print_string('resettodefaults'); ?>" />
+    </center>
+    </form>
+
+    <?php
+    print_simple_box_end();
+
+    admin_externalpage_print_footer($adminroot);
+?>

admin/filters.php

@@ -1,287 +1,282 @@
-<?php
+<?php // $Id$
+    // filters.php
+    // Edit list of available text filters
 
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards Martin Dougiamas  http://dougiamas.com     //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
+    require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    require_once($CFG->libdir.'/tablelib.php');
 
-/**
- * Processes actions from the admin_setting_managefilters object (defined in
- * adminlib.php).
- *
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package administration
- *//** */
+    // defines
+    define('FILTER_TABLE','filter_administration_table');
 
-    require_once(dirname(__FILE__) . '/../config.php');
-    require_once($CFG->libdir . '/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('managefilters', $adminroot);
 
-    $action = optional_param('action', '', PARAM_ACTION);
-    $filterpath = optional_param('filterpath', '', PARAM_PATH);
+    // get values from page
+    $params = new object();
+    $params->action     = optional_param('action', '', PARAM_ACTION);
+    $params->filterpath = optional_param('filterpath', '', PARAM_PATH);
+    $params->cachetext  = optional_param('cachetext', 0, PARAM_INT);
+    $params->filterall  = optional_param('filterall', 0, PARAM_BOOL);
+    $params->filteruploadedfiles   = optional_param('filteruploadedfiles', 0, PARAM_INT);
+    $params->filtermatchoneperpage = optional_param('filtermatchoneperpage', 0, PARAM_BOOL);
+    $params->filtermatchonepertext = optional_param('filtermatchonepertext', 0, PARAM_BOOL);
 
-    require_login();
-    $systemcontext = get_context_instance(CONTEXT_SYSTEM);
-    require_capability('moodle/site:config', $systemcontext);
+    // some basic information
+    $url = 'filters.php';
+    $myurl = "$url?sesskey=" . sesskey();
+    $img = "$CFG->pixpath/t";
 
-    $returnurl = "$CFG->wwwroot/$CFG->admin/filters.php";
-    admin_externalpage_setup('managefilters');
+    // get translated strings for use on page
+    $txt = new object();
+    $txt->managefilters = get_string('managefilters');
+    $txt->administration = get_string('administration');
+    $txt->configuration = get_string('configuration');
+    $txt->name = get_string('name');
+    $txt->hide = get_string('hide');
+    $txt->show = get_string('show');
+    $txt->hideshow = "$txt->hide/$txt->show";
+    $txt->settings = get_string('settings');
+    $txt->up = get_string('up');
+    $txt->down = get_string('down');
+    $txt->updown = "$txt->up/$txt->down";
+    $txt->cachetext = get_string('cachetext', 'admin');
+    $txt->configcachetext = get_string('configcachetext', 'admin');
+    $txt->filteruploadedfiles = get_string('filteruploadedfiles','admin');
+    $txt->configfilteruploadedfiles = get_string('configfilteruploadedfiles','admin');
+    $txt->filterall = get_string('filterall','admin');
+    $txt->filtermatchoneperpage = get_string('filtermatchoneperpage','admin');
+    $txt->filtermatchonepertext = get_string('filtermatchonepertext','admin');
+    $txt->configfilterall = get_string('configfilterall','admin');
+    $txt->configfiltermatchoneperpage = get_string('configfiltermatchoneperpage','admin');
+    $txt->configfiltermatchonepertext = get_string('configfiltermatchonepertext','admin');
+    $txt->cachecontrols = get_string('cachecontrols');
+    $txt->yes = get_string('yes');
+    $txt->no = get_string('no');
+    $txt->none = get_string('none');
+    $txt->allfiles = get_string('allfiles');
+    $txt->htmlfilesonly = get_string('htmlfilesonly');
 
-    $filters = filter_get_global_states();
-
-    // In case any new filters have been installed, but not put in the table yet.
-    $fitlernames = filter_get_all_installed();
-    $newfilters = $fitlernames;
-    foreach ($filters as $filter => $notused) {
-        unset($newfilters[$filter]);
-    }
-
-/// Process actions ============================================================
-
-    if ($action) {
-        if (!isset($filters[$filterpath]) && !isset($newfilters[$filterpath])) {
-            throw new moodle_exception('filternotinstalled', 'error', $returnurl, $filterpath);
-        }
-
-        if (!confirm_sesskey()) {
-            redirect($returnurl);
+    // get a list of possible filters (and translate name if possible)
+    // note filters can be in the dedicated filters area OR in their
+    // associated modules
+    $installedfilters = array();
+    $filtersettings = array();
+    $filterlocations = array('mod','filter');
+    foreach ($filterlocations as $filterlocation) {
+        $plugins = get_list_of_plugins($filterlocation);
+        foreach ($plugins as $plugin) {
+            $pluginpath = "$CFG->dirroot/$filterlocation/$plugin/filter.php";
+            $settingspath = "$CFG->dirroot/$filterlocation/$plugin/filterconfig.html";
+            if (is_readable($pluginpath)) {
+                $name = trim(get_string("filtername", $plugin));
+                if (empty($name) or ($name == '[[filtername]]')) {
+                    $name = ucfirst($plugin);
+                }
+                $installedfilters["$filterlocation/$plugin"] = $name;
+                if (is_readable($settingspath)) {
+                    $filtersettings[] = "$filterlocation/$plugin";
+                }
+            }
         }
     }
 
-    switch ($action) {
+    // get all the currently selected filters
+    if (!empty($CFG->textfilters)) {
+        $oldactivefilters = explode(',', $CFG->textfilters);
+        $oldactivefilters = array_unique($oldactivefilters);
+    } else {
+        $oldactivefilters = array();
+    }
 
-    case 'setstate':
-        if ($newstate = optional_param('newstate', '', PARAM_INTEGER)) {
-            filter_set_global_state($filterpath, $newstate);
-            if ($newstate == TEXTFILTER_DISABLED) {
-                filter_set_applies_to_strings($filterpath, false);
-            }
-            unset($newfilters[$filterpath]);
+    // take this opportunity to clean up filters
+    $activefilters = array();
+    foreach ($oldactivefilters as $oldactivefilter) {
+        if (!empty($oldactivefilter) and array_key_exists($oldactivefilter, $installedfilters)) {
+            $activefilters[] = $oldactivefilter;
         }
-        break;
+    }
 
-    case 'setapplyto':
-        $applytostrings = optional_param('stringstoo', false, PARAM_BOOL);
-        filter_set_applies_to_strings($filterpath, $applytostrings);
-        break;
+    //======================
+    // Process Actions
+    //======================
 
-    case 'down':
-        if (isset($filters[$filterpath])) {
-            $oldpos = $filters[$filterpath]->sortorder;
-            if ($oldpos <= count($filters)) {
-                filter_set_global_state($filterpath, $filters[$filterpath]->active, $oldpos + 1);
-            }
-        }
-        break;
-
-    case 'up':
-        if (isset($filters[$filterpath])) {
-            $oldpos = $filters[$filterpath]->sortorder;
-            if ($oldpos >= 1) {
-                filter_set_global_state($filterpath, $filters[$filterpath]->active, $oldpos - 1);
-            }
-        }
-        break;
-
-    case 'delete':
-        if (!empty($filternames[$filterpath])) {
-            $filtername = $filternames[$filterpath];
+    if ($params->action=="") {
+        // store cleaned active filers in db
+        set_config('textfilters', implode(',', $activefilters));
+    } elseif (($params->action=="hide") and confirm_sesskey()) {
+        $key=array_search($params->filterpath, $activefilters);
+        // check filterpath is valid
+        if ($key===false) {
+            // ignore it - doubleclick??
         } else {
-            $filtername = $filterpath;
+            // just delete it
+            unset($activefilters[$key]);
+            set_config('textfilters', implode(',', $activefilters));
         }
-
-        if (substr($filterpath, 0, 4) == 'mod/') {
-            $mod = basename($filterpath);
-            $a = new stdClass;
-            $a->filter = $filtername;
-            $a->module = get_string('modulename', $mod);
-            print_error('cannotdeletemodfilter', 'admin', $returnurl, $a);
+    } elseif (($params->action=="show") and confirm_sesskey()) {
+        // check filterpath is valid
+        if (!array_key_exists($params->filterpath, $installedfilters)) {
+            error("Filter $params->filterpath is not currently installed", $url);
+        } elseif (array_search($params->filterpath,$activefilters)) {
+            // filterpath is already active - doubleclick??
+        } else {
+            // add it to installed filters
+            $activefilters[] = $params->filterpath;
+            $activefilters = array_unique($activefilters);
+            set_config('textfilters', implode(',', $activefilters));
         }
-
-        // If not yet confirmed, display a confirmation message.
-        if (!optional_param('confirm', '', PARAM_BOOL)) {
-            $title = get_string('deletefilterareyousure', 'admin', $filtername);
-            echo $OUTPUT->header();
-            echo $OUTPUT->heading($title);
-
-            $linkcontinue = new moodle_url($returnurl, array('action' => 'delete', 'filterpath' => $filterpath, 'confirm' => 1));
-            $formcancel = new single_button(new moodle_url($returnurl), get_string('no'), 'get');
-            echo $OUTPUT->confirm(get_string('deletefilterareyousuremessage', 'admin', $filtername), $linkcontinue, $formcancel);
-            echo $OUTPUT->footer();
-            exit;
+    } elseif (($params->action=="down") and confirm_sesskey()) {
+        $key=array_search($params->filterpath, $activefilters);
+        // check filterpath is valid
+        if ($key===false) {
+            error("Filter $params->filterpath is not currently active", $url);
+        } elseif ($key>=(count($activefilters)-1)) {
+            // cannot be moved any further down - doubleclick??
+        } else {
+            // swap with $key+1
+            $fsave = $activefilters[$key];
+            $activefilters[$key] = $activefilters[$key+1];
+            $activefilters[$key+1] = $fsave;
+            set_config('textfilters', implode(',', $activefilters));
         }
-
-        // Do the deletion.
-        $title = get_string('deletingfilter', 'admin', $filtername);
-        echo $OUTPUT->header();
-        echo $OUTPUT->heading($title);
-
-        // Delete all data for this plugin.
-        filter_delete_all_for_filter($filterpath);
-
-        $a = new stdClass;
-        $a->filter = $filtername;
-        $a->directory = $filterpath;
-        echo $OUTPUT->box(get_string('deletefilterfiles', 'admin', $a), 'generalbox', 'notice');
-        echo $OUTPUT->continue_button($returnurl);
-        echo $OUTPUT->footer();
-        exit;
+    } elseif (($params->action=="up") and confirm_sesskey()) {
+        $key=array_search($params->filterpath, $activefilters);
+        // check filterpath is valid
+        if ($key===false) {
+            error("Filter $params->filterpath is not currently active", $url);
+        } elseif ($key<1) {
+            //cannot be moved any further up - doubleclick??
+        } else {
+            // swap with $key-1
+            $fsave = $activefilters[$key];
+            $activefilters[$key] = $activefilters[$key-1];
+            $activefilters[$key-1] = $fsave;
+            set_config('textfilters', implode(',', $activefilters));
+        }
+    } elseif (($params->action=="config") and confirm_sesskey()) {
+        set_config('cachetext', $params->cachetext);
+        set_config('filteruploadedfiles', $params->filteruploadedfiles);
+        set_config('filterall', $params->filterall);
+        set_config('filtermatchoneperpage', $params->filtermatchoneperpage);
+        set_config('filtermatchonepertext', $params->filtermatchonepertext);
     }
 
-    // Add any missing filters to the DB table.
-    foreach ($newfilters as $filter => $notused) {
-        filter_set_global_state($filter, TEXTFILTER_DISABLED);
+    //======================
+    // Build Display Objects
+    //======================
+
+    // construct the display array with installed filters
+    // at the top in the right order
+    $displayfilters = array();
+    foreach ($activefilters as $activefilter) {
+        $name = $installedfilters[$activefilter];
+        $displayfilters[$activefilter] = $name;
     }
-
-    // Reset caches and return
-    if ($action) {
-        reset_text_filters_cache();
-        redirect($returnurl);
-    }
-
-/// End of process actions =====================================================
-
-/// Print the page heading.
-    echo $OUTPUT->header();
-    echo $OUTPUT->heading(get_string('filtersettings', 'admin'));
-
-    $activechoices = array(
-        TEXTFILTER_DISABLED => get_string('disabled', 'filters'),
-        TEXTFILTER_OFF => get_string('offbutavailable', 'filters'),
-        TEXTFILTER_ON => get_string('on', 'filters'),
-    );
-    $applytochoices = array(
-        0 => get_string('content', 'filters'),
-        1 => get_string('contentandheadings', 'filters'),
-    );
-
-    $filters = filter_get_global_states();
-
-    // In case any new filters have been installed, but not put in the table yet.
-    $filternames = filter_get_all_installed();
-    $newfilters = $filternames;
-    foreach ($filters as $filter => $notused) {
-        unset($newfilters[$filter]);
-    }
-    $stringfilters = filter_get_string_filters();
-
-    $table = new html_table();
-    $table->head  = array(get_string('filter'), get_string('isactive', 'filters'),
-            get_string('order'), get_string('applyto', 'filters'), get_string('settings'), get_string('delete'));
-    $table->align = array('left', 'left', 'center', 'left', 'left');
-    $table->width = '100%';
-    $table->data  = array();
-
-    $lastactive = null;
-    foreach ($filters as $filter => $filterinfo) {
-        if ($filterinfo->active != TEXTFILTER_DISABLED) {
-            $lastactive = $filter;
+    foreach ($installedfilters as $key => $filter) {
+        if (!array_key_exists($key, $displayfilters)) {
+            $displayfilters[$key] = $filter;
         }
     }
 
+    // construct the flexible table ready to display
+    $table = new flexible_table(FILTER_TABLE);
+    $table->define_columns(array('name', 'hideshow', 'order', 'settings'));
+    $table->column_style('hideshow', 'text-align', 'center');
+    $table->column_style('order', 'text-align', 'center');
+    $table->column_style('settings', 'text-align', 'center');
+    $table->define_headers(array($txt->name, $txt->hideshow, $txt->updown, $txt->settings));
+    $table->define_baseurl("$CFG->wwwroot/$CFG->admin/filters.php");
+    $table->set_attribute('id', 'blocks');
+    $table->set_attribute('class', 'flexible generaltable generalbox');
+    $table->set_attribute('style', 'margin:auto;');
+    $table->set_attribute('cellpadding', '5');
+    $table->setup();
+
     // iterate through filters adding to display table
-    $firstrow = true;
-    foreach ($filters as $filter => $filterinfo) {
-        $applytostrings = isset($stringfilters[$filter]) && $filterinfo->active != TEXTFILTER_DISABLED;
-        $row = get_table_row($filterinfo, $firstrow, $filter == $lastactive, $applytostrings);
-        $table->data[] = $row;
-        if ($filterinfo->active == TEXTFILTER_DISABLED) {
-            $table->rowclasses[] = 'dimmed_text';
-        } else {
-            $table->rowclasses[] = '';
+    $updowncount = 1;
+    $activefilterscount = count($activefilters);
+    foreach ($displayfilters as $path => $name) {
+        $upath = urlencode($path);
+        // get hide/show link
+        if (in_array($path, $activefilters)) {
+            $hideshow = "<a href=\"$myurl&amp;action=hide&amp;filterpath=$upath\">";
+            $hideshow .= "<img src=\"{$CFG->pixpath}/i/hide.gif\" height=\"16\" width=\"16\" alt=\"hide\" /></a>";
+            $hidden = false;
+            $displayname = "<span>$name</span>";
         }
-        $firstrow = false;
-    }
-    foreach ($newfilters as $filter => $filtername) {
-        $filterinfo = new stdClass;
-        $filterinfo->filter = $filter;
-        $filterinfo->active = TEXTFILTER_DISABLED;
-        $row = get_table_row($filterinfo, false, false, false);
-        $table->data[] = $row;
-        $table->rowclasses[] = 'dimmed_text';
-    }
-
-    echo html_writer::table($table);
-    echo '<p class="filtersettingnote">' . get_string('filterallwarning', 'filters') . '</p>';
-    echo $OUTPUT->footer();
-
-/// Display helper functions ===================================================
-
-function filters_action_url($filterpath, $action) {
-    return new moodle_url('/admin/filters.php', array('sesskey'=>sesskey(), 'filterpath'=>$filterpath, 'action'=>$action));
-}
-
-function get_table_row($filterinfo, $isfirstrow, $islastactive, $applytostrings) {
-    global $CFG, $OUTPUT, $activechoices, $applytochoices, $filternames; //TODO: this is sloppy coding style!!
-    $row = array();
-    $filter = $filterinfo->filter;
-
-    // Filter name
-    if (!empty($filternames[$filter])) {
-        $row[] = $filternames[$filter];
-    } else {
-        $row[] = '<span class="error">' . get_string('filemissing', '', $filter) . '</span>';
-    }
-
-    // Disable/off/on
-    $select = new single_select(filters_action_url($filter, 'setstate'), 'newstate', $activechoices, $filterinfo->active, null, 'active' . basename($filter));
-    $select->set_label(get_string('isactive', 'filters'), array('class' => 'accesshide'));
-    $row[] = $OUTPUT->render($select);
-
-    // Re-order
-    $updown = '';
-    $spacer = '<img src="' . $OUTPUT->pix_url('spacer') . '" class="iconsmall" alt="" /> ';
-    if ($filterinfo->active != TEXTFILTER_DISABLED) {
-        if (!$isfirstrow) {
-            $updown .= $OUTPUT->action_icon(filters_action_url($filter, 'up'), new pix_icon('t/up', get_string('up')));
-        } else {
-            $updown .= $spacer;
+        else {
+            $hideshow = "<a href=\"$myurl&amp;action=show&amp;filterpath=$upath\">";
+            $hideshow .= "<img src=\"{$CFG->pixpath}/i/show.gif\" height=\"16\" width=\"16\" alt=\"show\" /></a>";
+            $hidden = true;
+            $displayname = "<span class=\"dimmed_text\">$name</span>";
         }
-        if (!$islastactive) {
-            $updown .= $OUTPUT->action_icon(filters_action_url($filter, 'down'), new pix_icon('t/down', get_string('down')));
-        } else {
-            $updown .= $spacer;
+
+        // get up/down link (only if not hidden)
+        $updown = '';
+        if (!$hidden) {
+            if ($updowncount>1) {
+                $updown .= "<a href=\"$myurl&amp;action=up&amp;filterpath=$upath\">";
+                $updown .= "<img src=\"$img/up.gif\" alt=\"up\" /></a>&nbsp;";
+            }
+            else {
+                $updown .= "<img src=\"$CFG->pixpath/spacer.gif\" height=\"16\" width=\"16\" alt=\"\" />&nbsp;";
+            }
+            if ($updowncount<$activefilterscount) {
+                $updown .= "<a href=\"$myurl&amp;action=down&amp;filterpath=$upath\">";
+                $updown .= "<img src=\"$img/down.gif\" alt=\"down\" /></a>";
+            }
+            else {
+                $updown .= "<img src=\"$CFG->pixpath/spacer.gif\" height=\"16\" width=\"16\" alt=\"\" />";
+            }
+            ++$updowncount;
+        }
+
+        // settings link (if defined)
+        $settings = '';
+        if (in_array($path, $filtersettings)) {
+            $settings = "<a href=\"filter.php?filter=" . urlencode($path) . "\">";
+            $settings .= "{$txt->settings}</a>";
+        }
+
+        // write data into the table object
+        $table->add_data(array($displayname, $hideshow, $updown, $settings));
+    }
+
+    // build options list for cache lifetime
+    $seconds = array(604800,86400,43200,10800,7200,3600,2700,1800,900,600,540,480,420,360,300,240,180,120,60,30,0);
+    unset($lifetimeoptions);
+    foreach ($seconds as $second) {
+        if ($second>=86400) {
+            $options[$second] = get_string('numdays','',$second/86400);
+        }
+        elseif ($second>=3600) {
+            $options[$second] = get_string('numhours','',$second/3600);
+        }
+        elseif ($second>=60) {
+            $options[$second] = get_string('numminutes','',$second/60);
+        }
+        elseif ($second>=1) {
+            $options[$second] = get_string('numseconds','',$second);
+        }
+        else {
+            $options[$second] = get_string('no');
         }
     }
-    $row[] = $updown;
 
-    // Apply to strings.
-    $select = new single_select(filters_action_url($filter, 'setapplyto'), 'stringstoo', $applytochoices, $applytostrings, null, 'applyto' . basename($filter));
-    $select->set_label(get_string('applyto', 'filters'), array('class' => 'accesshide'));
-    $select->disabled = $filterinfo->active == TEXTFILTER_DISABLED;
-    $row[] = $OUTPUT->render($select);
+    //==============================
+    // Display logic
+    //==============================
 
-    // Settings link, if required
-    if (filter_has_global_settings($filter)) {
-        $row[] = '<a href="' . $CFG->wwwroot . '/' . $CFG->admin . '/settings.php?section=filtersetting' .
-                str_replace('/', '',$filter) . '">' . get_string('settings') . '</a>';
-    } else {
-        $row[] = '';
-    }
+    admin_externalpage_print_header($adminroot);
 
-    // Delete
-    if (substr($filter, 0, 4) != 'mod/') {
-        $row[] = '<a href="' . filters_action_url($filter, 'delete') . '">' . get_string('delete') . '</a>';
-    } else {
-        $row[] = '';
-    }
+    print_heading_with_help($txt->managefilters, 'filters');
 
-    return $row;
-}
+    // print the table of all the filters
+    $table->print_html();
+
+    // cache control table has been removed
+
+    admin_externalpage_print_footer($adminroot);
+
+?>

admin/handlevirus.php

@@ -1,20 +1,19 @@
-<?php
+<?php // $Id$
 /** This expects the output from a command like
- * clamscan -r --infected --no-summary <files> 2>&1 | php -d error_log=/path/to/log thisfile.php
+ * clamscan -r --infected --no-summary <files> 2>&1 | php -d error_log=/path/to/log thisfile.php 
  * also it's important that the output of clamscan prints the FULL PATH to each infected file, so use absolute paths for area to scan
  * also it should be run as root, or whatever the webserver runs as so that it has the right permissions in the quarantine dir etc.
  * php -d error_log=/path/to/log thisfile.php will override the default error log for php cli, which is stderr, so if you want this script to just print stuff out, use php thisfile.php instead.
  */
 
-die('TODO: MDL-19380');
 
 $fd = fopen('php://stdin','r');
 if (!$fd) {
     exit();
 }
 
+$FULLME='cron';
 require_once(dirname(dirname(__FILE__)).'/config.php');
-require_once($CFG->libdir.'/eventslib.php');
 require_once($CFG->dirroot.'/lib/uploadlib.php'); // contains virus handling stuff.
 
 $site = get_site();
@@ -30,7 +29,7 @@ while(!feof($fd)) {
     $bits = explode('/',$file);
     $a->filename = $bits[count($bits)-1];
 
-    if (!$log = $DB->get_record("log", array("module"=>"upload", "info"=>$file, "action"=>"upload"))) {
+    if (!$log = get_record("log","module","upload","info",$file,"action","upload")) {
         $a->action = clam_handle_infected_file($file,0,false);
         clam_replace_infected_file($file);
         notify_admins_unknown($file,$a);
@@ -38,18 +37,14 @@ while(!feof($fd)) {
     }
     $action = clam_handle_infected_file($file,$log->userid,true);
     clam_replace_infected_file($file);
-
-    list($ctxselect, $ctxjoin) = context_instance_preload_sql('c.id', CONTEXT_COURSE, 'ctx');
-    $sql = "SELECT c.id, c.fullname $ctxselect FROM {course} c $ctxjoin WHERE c.id = :courseid";
-    $course = $DB->get_record_sql($sql, array('courseid' => $log->course));
-    context_instance_preload($course);
-
-    $user = $DB->get_record("user", array("id"=>$log->userid));
-    $subject = get_string('virusfoundsubject','moodle',format_string($site->fullname));
+    
+    $user = get_record("user","id",$log->userid);
+    $course = get_record("course","id",$log->course);
+    $subject = get_string('virusfoundsubject','moodle',$site->fullname);
     $a->date = userdate($log->time);
 
     $a->action = $action;
-    $a->course = format_string($course->fullname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id)));
+    $a->course = $course->fullname;
     $a->user = fullname($user);
 
     notify_user($user,$subject,$a);
@@ -64,17 +59,7 @@ function notify_user($user,$subject,$a) {
         return false;
     }
     $body = get_string('virusfoundlater','moodle',$a);
-
-    $eventdata = new stdClass();
-    $eventdata->modulename        = 'moodle';
-    $eventdata->userfrom          = get_admin();
-    $eventdata->userto            = $user;
-    $eventdata->subject           = $subject;
-    $eventdata->fullmessage       = $body;
-    $eventdata->fullmessageformat = FORMAT_PLAIN;
-    $eventdata->fullmessagehtml   = '';
-    $eventdata->smallmessage      = '';
-    message_send($eventdata);
+    email_to_user($user,get_admin(),$subject,$body);
 }
 
 
@@ -84,37 +69,19 @@ function notify_admins($user,$subject,$a) {
 
     $body = get_string('virusfoundlateradmin','moodle',$a);
     foreach ($admins as $admin) {
-        $eventdata = new stdClass();
-        $eventdata->modulename        = 'moodle';
-        $eventdata->userfrom          = $admin;
-        $eventdata->userto            = $admin;
-        $eventdata->subject           = $subject;
-        $eventdata->fullmessage       = $body;
-        $eventdata->fullmessageformat = FORMAT_PLAIN;
-        $eventdata->fullmessagehtml   = '';
-        $eventdata->smallmessage      = '';
-        message_send($eventdata);
+        email_to_user($admin,$admin,$subject,$body);
     }
 }
 
 function notify_admins_unknown($file,$a) {
-
+    
     global $site;
 
     $admins = get_admins();
-    $subject = get_string('virusfoundsubject','moodle',format_string($site->fullname));
+    $subject = get_string('virusfoundsubject','moodle',$site->fullname);
     $body = get_string('virusfoundlateradminnolog','moodle',$a);
     foreach ($admins as $admin) {
-        $eventdata = new stdClass();
-        $eventdata->modulename        = 'moodle';
-        $eventdata->userfrom          = $admin;
-        $eventdata->userto            = $admin;
-        $eventdata->subject           = $subject;
-        $eventdata->fullmessage       = $body;
-        $eventdata->fullmessageformat = FORMAT_PLAIN;
-        $eventdata->fullmessagehtml   = '';
-        $eventdata->smallmessage      = '';
-        message_send($eventdata);
+        email_to_user($admin,$admin,$subject,$body);
     }
 }
 
@@ -147,4 +114,4 @@ function validate_line($line) {
     return $file;
 }
 
-
+?>

admin/health.php

@@ -0,0 +1,562 @@
+<?php  // $Id$
+
+    ob_start(); //for whitespace test
+    require_once('../config.php');
+
+    // extra whitespace test - intentionally breaks cookieless mode
+    $extraws = '';
+    while (true) {
+        $extraws .= ob_get_contents();
+        if (!@ob_end_clean()) {
+            break;
+        }
+    }
+
+    require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('healthcenter', $adminroot);
+
+    define('SEVERITY_NOTICE',      'notice');
+    define('SEVERITY_ANNOYANCE',   'annoyance');
+    define('SEVERITY_SIGNIFICANT', 'significant');
+    define('SEVERITY_CRITICAL',    'critical');
+
+    $solution = optional_param('solution', 0, PARAM_SAFEDIR); //in fact it is class name alhanumeric and _
+
+    require_login();
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+
+    $site = get_site();
+
+    admin_externalpage_print_header($adminroot);
+
+echo <<<STYLES
+<style type="text/css">
+div#healthnoproblemsfound {
+    width: 60%;
+    margin: auto;
+    padding: 1em;
+    border: 1px black solid;
+    -moz-border-radius: 6px;
+}
+dl.healthissues {
+    width: 60%;
+    margin: auto;
+}
+dl.critical dt, dl.critical dd {
+    background-color: #a71501;
+}
+dl.significant dt, dl.significant dd {
+    background-color: #d36707;
+}
+dl.annoyance dt, dl.annoyance dd {
+    background-color: #dba707;
+}
+dl.notice dt, dl.notice dd {
+    background-color: #e5db36;
+}
+dt.solution, dd.solution, div#healthnoproblemsfound {
+    background-color: #5BB83E !important;
+}
+dl.healthissues dt, dl.healthissues dd {
+    margin: 0px;
+    padding: 1em;
+    border: 1px black solid;
+}
+dl.healthissues dt {
+    font-weight: bold;
+    border-bottom: none;
+    padding-bottom: 0.5em;
+}
+dl.healthissues dd {
+    border-top: none;
+    padding-top: 0.5em;
+    margin-bottom: 10px;
+}
+dl.healthissues dd form {
+    margin-top: 0.5em;
+    text-align: right;
+}
+form#healthformreturn {
+    text-align: center;
+    margin: 2em;
+}
+dd.solution p {
+    padding: 0px;
+    margin: 1em 0px;
+}
+dd.solution li {
+    margin-top: 1em;
+}
+
+</style>
+STYLES;
+
+    if(strpos($solution, 'problem_') === 0 && class_exists($solution)) {
+        health_print_solution($solution);
+    }
+    else {
+        health_find_problems();
+    }
+
+
+    admin_externalpage_print_footer($adminroot);
+
+
+function health_find_problems() {
+
+    print_heading(get_string('healthcenter'));
+
+    $issues   = array(
+        SEVERITY_CRITICAL    => array(),
+        SEVERITY_SIGNIFICANT => array(),
+        SEVERITY_ANNOYANCE   => array(),
+        SEVERITY_NOTICE      => array(),
+    );
+    $problems = 0;
+
+    for($i = 1; $i < 1000000; ++$i) {
+        $classname = sprintf('problem_%06d', $i);
+        if(!class_exists($classname)) {
+            break;
+        }
+        $problem = new $classname;
+        if($problem->exists()) {
+            $severity = $problem->severity();
+            $issues[$severity][$classname] = array(
+                'severity'    => $severity,
+                'description' => $problem->description(),
+                'title'       => $problem->title()
+            );
+            ++$problems;
+        }
+        unset($problem);
+    }
+
+    if($problems == 0) {
+        echo '<div id="healthnoproblemsfound">';
+        echo get_string('healthnoproblemsfound');
+        echo '</div>';
+    }
+    else {
+        print_heading(get_string('healthproblemsdetected'));
+        $severities = array(SEVERITY_CRITICAL, SEVERITY_SIGNIFICANT, SEVERITY_ANNOYANCE, SEVERITY_NOTICE);
+        foreach($severities as $severity) {
+            if(!empty($issues[$severity])) {
+                echo '<dl class="healthissues '.$severity.'">';
+                foreach($issues[$severity] as $classname => $data) {
+                    echo '<dt id="'.$classname.'">'.$data['title'].'</dt>';
+                    echo '<dd>'.$data['description'];
+                    echo '<form action="health.php#solution" method="get">';
+                    echo '<input type="hidden" name="solution" value="'.$classname.'" /><input type="submit" value="'.get_string('viewsolution').'" />';
+                    echo '</form></dd>';
+                }
+                echo '</dl>';
+            }
+        }
+    }
+}
+
+function health_print_solution($classname) {
+    $problem = new $classname;
+    $data = array(
+        'title'       => $problem->title(),
+        'severity'    => $problem->severity(),
+        'description' => $problem->description(),
+        'solution'    => $problem->solution()
+    );
+
+    print_heading(get_string('healthcenter'));
+    print_heading(get_string('healthproblemsolution'));
+    echo '<dl class="healthissues '.$data['severity'].'">';
+    echo '<dt>'.$data['title'].'</dt>';
+    echo '<dd>'.$data['description'].'</dd>';
+    echo '<dt id="solution" class="solution">'.get_string('healthsolution').'</dt>';
+    echo '<dd class="solution">'.$data['solution'].'</dd></dl>';
+    echo '<form id="healthformreturn" action="health.php#'.$classname.'" method="get">';
+    echo '<input type="submit" value="'.get_string('healthreturntomain').'" />';
+    echo '</form>';
+}
+
+class problem_base {
+    function exists() {
+        return false;
+    }
+    function title() {
+        return '???';
+    }
+    function severity() {
+        return SEVERITY_NOTICE;
+    }
+    function description() {
+        return '';
+    }
+    function solution() {
+        return '';
+    }
+}
+
+class problem_000001 extends problem_base {
+    function title() {
+        return 'Invalid value for $CFG->dirroot';
+    }
+    function exists() {
+        global $CFG;
+        $dirroot = dirname(realpath('../index.php'));
+        if (!empty($dirroot) && $dirroot != $CFG->dirroot) {
+            return true;
+        }
+        return false;
+    }
+    function severity() {
+        return SEVERITY_CRITICAL;
+    }
+    function description() {
+        global $CFG;
+        return 'Your <strong>config.php</strong> file contains the setting <strong>$CFG-&gt;dirroot = "'.$CFG->dirroot.'"</strong>, which is incorrect. Unless you correct this problem, Moodle will not function correctly, if at all.';
+    }
+    function solution() {
+        global $CFG;
+        $dirroot = dirname(realpath('../index.php'));
+        return 'You need to edit your <strong>config.php</strong> file. Find the line which reads <pre>$CFG->dirroot = \''.$CFG->dirroot.'\';</pre> and change it to read <pre>$CFG->dirroot = \''.$dirroot.'\'</pre>';
+    }
+}
+
+class problem_000002 extends problem_base {
+    function title() {
+        return 'Extra characters at the end of config.php or other library function';
+    }
+    function exists() {
+        global $extraws;
+
+        if($extraws === '') {
+            return false;
+        }
+        return true;
+    }
+    function severity() {
+        return SEVERITY_SIGNIFICANT;
+    }
+    function description() {
+        return 'Your Moodle configuration file config.php or another library file, contains some characters after the closing PHP tag (?>). This causes Moodle to exhibit several kinds of problems (such as broken downloaded files) and must be fixed.';
+    }
+    function solution() {
+        global $CFG;
+        return 'You need to edit <strong>'.$CFG->dirroot.'/config.php</strong> and remove all characters (including spaces and returns) after the ending ?> tag. These two characters should be the very last in that file. The extra trailing whitespace may be also present in other PHP files that are included from lib/setup.php.';
+    }
+}
+
+class problem_000003 extends problem_base {
+    function title() {
+        return '$CFG->dataroot does not exist or does not have write permissions';
+    }
+    function exists() {
+        global $CFG;
+        if(!is_dir($CFG->dataroot) || !is_writable($CFG->dataroot)) {
+            return true;
+        }
+        return false;
+    }
+    function severity() {
+        return SEVERITY_SIGNIFICANT;
+    }
+    function description() {
+        global $CFG;
+        return 'Your <strong>config.php</strong> says that your "data root" directory is <strong>'.$CFG->dataroot.'</strong>. However, this directory either does not exist or cannot be written to by Moodle. This means that a variety of problems will be present, such as users not being able to log in and not being able to upload any files. It is imperative that you address this problem for Moodle to work correctly.';
+    }
+    function solution() {
+        global $CFG;
+        return 'First of all, make sure that the directory <strong>'.$CFG->dataroot.'</strong> exists. If the directory does exist, then you must make sure that Moodle is able to write to it. Contact your web server administrator and request that he gives write permissions for that directory to the user that the web server process is running as.';
+    }
+}
+
+class problem_000004 extends problem_base {
+    function title() {
+        return 'cron.php is not set up to run automatically';
+    }
+    function exists() {
+        global $CFG;
+        $lastcron = get_field_sql('SELECT max(lastcron) FROM '.$CFG->prefix.'modules');
+        return (time() - $lastcron > 3600 * 24);
+    }
+    function severity() {
+        return SEVERITY_SIGNIFICANT;
+    }
+    function description() {
+        return 'The cron.php mainenance script has not been run in the past 24 hours. This probably means that your server is not configured to automatically run this script in regular time intervals. If this is the case, then Moodle will mostly work as it should but some operations (notably sending email to users) will not be carried out at all.';
+    }
+    function solution() {
+        global $CFG;
+        return 'For detailed instructions on how to enable cron, see <a href="'.$CFG->wwwroot.'/doc/?file=install.html#cron">this section</a> of the installation manual.';
+    }
+}
+
+class problem_000005 extends problem_base {
+    function title() {
+        return 'PHP: session.auto_start is enabled';
+    }
+    function exists() {
+        return ini_get_bool('session.auto_start');
+    }
+    function severity() {
+        return SEVERITY_CRITICAL;
+    }
+    function description() {
+        return 'Your PHP configuration includes an enabled setting, session.auto_start, that <strong>must be disabled</strong> in order for Moodle to work correctly. Notable symptoms arising from this misconfiguration include fatal errors and/or blank pages when trying to log in.';
+    }
+    function solution() {
+        global $CFG;
+        return '<p>There are two ways you can solve this problem:</p><ol><li>If you have access to your main <strong>php.ini</strong> file, then find the line that looks like this: <pre>session.auto_start = 1</pre> and change it to <pre>session.auto_start = 0</pre> and then restart your web server. Be warned that this, as any other PHP setting change, might affect other web applications running on the server.</li><li>Finally, you may be able to change this setting just for your site by creating or editing the file <strong>'.$CFG->dirroot.'/.htaccess</strong> to contain this line: <pre>php_value session.auto_start "0"</pre></li></ol>';
+    }
+}
+
+class problem_000006 extends problem_base {
+    function title() {
+        return 'PHP: magic_quotes_runtime is enabled';
+    }
+    function exists() {
+        return (ini_get_bool('magic_quotes_runtime'));
+    }
+    function severity() {
+        return SEVERITY_SIGNIFICANT;
+    }
+    function description() {
+        return 'Your PHP configuration includes an enabled setting, magic_quotes_runtime, that <strong>must be disabled</strong> in order for Moodle to work correctly. Notable symptoms arising from this misconfiguration include strange display errors whenever a text field that includes single or double quotes is processed.';
+    }
+    function solution() {
+        global $CFG;
+        return '<p>There are two ways you can solve this problem:</p><ol><li>If you have access to your main <strong>php.ini</strong> file, then find the line that looks like this: <pre>magic_quotes_runtime = On</pre> and change it to <pre>magic_quotes_runtime = Off</pre> and then restart your web server. Be warned that this, as any other PHP setting change, might affect other web applications running on the server.</li><li>Finally, you may be able to change this setting just for your site by creating or editing the file <strong>'.$CFG->dirroot.'/.htaccess</strong> to contain this line: <pre>php_value magic_quotes_runtime "Off"</pre></li></ol>';
+    }
+}
+
+class problem_000007 extends problem_base {
+    function title() {
+        return 'PHP: file_uploads is disabled';
+    }
+    function exists() {
+        return !ini_get_bool('file_uploads');
+    }
+    function severity() {
+        return SEVERITY_SIGNIFICANT;
+    }
+    function description() {
+        return 'Your PHP configuration includes a disabled setting, file_uploads, that <strong>must be enabled</strong> to let Moodle offer its full functionality. Until this setting is enabled, it will not be possible to upload any files into Moodle. This includes, for example, course content and user pictures.';
+    }
+    function solution() {
+        global $CFG;
+        return '<p>There are two ways you can solve this problem:</p><ol><li>If you have access to your main <strong>php.ini</strong> file, then find the line that looks like this: <pre>file_uploads = Off</pre> and change it to <pre>file_uploads = On</pre> and then restart your web server. Be warned that this, as any other PHP setting change, might affect other web applications running on the server.</li><li>Finally, you may be able to change this setting just for your site by creating or editing the file <strong>'.$CFG->dirroot.'/.htaccess</strong> to contain this line: <pre>php_value file_uploads "On"</pre></li></ol>';
+    }
+}
+
+class problem_000008 extends problem_base {
+    function title() {
+        return 'PHP: memory_limit cannot be controlled by Moodle';
+    }
+    function exists() {
+        $oldmemlimit = @ini_get('memory_limit');
+        if(empty($oldmemlimit)) {
+            // PHP not compiled with memory limits, this means that it's
+            // probably limited to 8M or in case of Windows not at all.
+            // We can ignore it for now - there is not much to test anyway
+            // TODO: add manual test that fills memory??
+            return false;
+        }
+        $oldmemlimit = get_real_size($oldmemlimit);
+        //now lets change the memory limit to something unique below 128M==134217728
+        @ini_set('memory_limit', 134217720);
+        $testmemlimit = get_real_size(@ini_get('memory_limit'));
+        //verify the change had any effect at all
+        if ($oldmemlimit == $testmemlimit) {
+            //memory limit can not be changed - is it big enough then?
+            if ($oldmemlimit < get_real_size('128M')) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+        @ini_set('memory_limit', $oldmemlimit);
+        return false;
+    }
+    function severity() {
+        return SEVERITY_NOTICE;
+    }
+    function description() {
+        return 'The settings for PHP on your server do not allow a script to request more memory during its execution. '.
+               'This means that there is a hard limit of '.@ini_get('memory_limit').' for each script. '.
+               'It is possible that certain operations within Moodle will require more than this amount in order '.
+               'to complete successfully, especially if there are lots of data to be processed.';
+    }
+    function solution() {
+        return 'It is recommended that you contact your web server administrator to address this issue.';
+    }
+}
+
+class problem_000009 extends problem_base {
+    function title() {
+        return 'SQL: using account without password';
+    }
+    function exists() {
+        global $CFG;
+        return empty($CFG->dbpass);
+    }
+    function severity() {
+        return SEVERITY_CRITICAL;
+    }
+    function description() {
+        global $CFG;
+        return 'The user account your are connecting to the database server with is set up without a password. This is a very big security risk and is only somewhat lessened if your database is configured to not accept connections from any hosts other than the server Moodle is running on. Unless you use a strong password to connect to the database, you risk unauthorized access to and manipulation of your data.'.($CFG->dbuser != 'root'?'':' <strong>This is especially alarming because such access to the database would be as the superuser (root)!</strong>');
+    }
+    function solution() {
+        global $CFG;
+        return 'You should change the password of the user <strong>'.$CFG->dbuser.'</strong> both in your database and in your Moodle <strong>config.php</strong> immediately!'.($CFG->dbuser != 'root'?'':' It would also be a good idea to change the user account from root to something else, because this would lessen the impact in the event that your database is compromised anyway.');
+    }
+}
+
+class problem_000010 extends problem_base {
+    function title() {
+        return 'Uploaded files: slasharguments disabled or not working';
+    }
+    function exists() {
+        if (!$this->is_enabled()) {
+            return true;
+        }
+        if ($this->status() < 1) {
+            return true;
+        }
+        return false;
+    }
+    function severity() {
+        if ($this->is_enabled() and $this->status() == 0) {
+            return SEVERITY_SIGNIFICANT;
+        } else {
+            return SEVERITY_ANNOYANCE;
+        }
+    }
+    function description() {
+        global $CFG;
+        $desc = 'Slasharguments are needed for relative linking in uploaded resources:<ul>';
+        if (!$this->is_enabled()) {
+            $desc .= '<li>slasharguments are <strong>disabled</strong> in Moodle configuration</li>';
+        } else {
+            $desc .= '<li>slasharguments are enabled in Moodle configuration</li>';
+        }
+        if ($this->status() == -1) {
+            $desc .= '<li>can not run automatic test, you can verify it <a href="'.$CFG->wwwroot.'/file.php/testslasharguments" target="_blank">here</a> manually</li>';
+        } else if ($this->status() == 0) {
+            $desc .= '<li>slashargument test <strong>failed</strong>, please check server configuration</li>';
+        } else {
+            $desc .= '<li>slashargument test passed</li>';
+        }
+        $desc .= '</ul>';
+        return $desc;
+    }
+    function solution() {
+        global $CFG;
+        $enabled = $this->is_enabled();
+        $status = $this->status();
+        $solution = '';
+        if ($enabled and ($status == 0)) {
+            $solution .= 'Slasharguments are enabled, but the test failed. Please disable slasharguments in Moodle configuration or fix the server configuration.<hr />';
+        } else if ((!$enabled) and ($status == 0)) {
+            $solution .= 'Slasharguments are disabled and the test failed. You may try to fix the server configuration.<hr />';
+        } else if ($enabled and ($status == -1)) {
+            $solution .= 'Slasharguments are enabled, <a href="'.$CFG->wwwroot.'/file.php/testslasharguments">automatic testing</a> not possible.<hr />';
+        } else if ((!$enabled) and ($status == -1)) {
+            $solution .= 'Slasharguments are disabled, <a href="'.$CFG->wwwroot.'/file.php/testslasharguments">automatic testing</a> not possible.<hr />';
+        } else if ((!$enabled) and ($status > 0)) {
+            $solution .= 'Slasharguments are disabled though the iternal test is OK. You should enable slasharguments in Moodle configuration.';
+        } else if ($enabled and ($status > 0)) {
+            $solution .= 'Congratulations - everything seems OK now :-D';
+        }
+        if ($status < 1) {
+            $solution .= '<p>IIS:<ul><li>try to add <code>cgi.fix_pathinfo=1</code> to php.ini</li><li>do NOT enable AllowPathInfoForScriptMappings !!!</li><li>slasharguments may not work when using ISAPI and PHP 4.3.10 and older</li></ul></p>';
+            $solution .= '<p>Apache 1:<ul><li>try to add <code>cgi.fix_pathinfo=1</code> to php.ini</li></ul></p>';
+            $solution .= '<p>Apache 2:<ul><li>you must add <code>AcceptPathInfo on</code> to php.ini or .htaccess</li><li>try to add <code>cgi.fix_pathinfo=1</code> to php.ini</li></ul></p>';
+        }
+        return $solution;
+    }
+    function is_enabled() {
+        global $CFG;
+        return !empty($CFG->slasharguments);
+    }
+    function status() {
+        global $CFG;
+        $handle = @fopen($CFG->wwwroot.'/file.php?file=/testslasharguments', "r");
+        $contents = @trim(fread($handle, 10));
+        @fclose($handle);
+        if ($contents != 'test -1') {
+            return -1;
+        }
+        $handle = @fopen($CFG->wwwroot.'/file.php/testslasharguments', "r");
+        $contents = trim(@fread($handle, 10));
+        @fclose($handle);
+        switch ($contents) {
+            case 'test 1': return 1;
+            case 'test 2': return 2;
+            default:  return 0;
+        }
+    }
+}
+
+class problem_000011 extends problem_base {
+    function title() {
+        return 'Session errors detected';
+    }
+    function exists() {
+        global $CFG;
+        return isset($CFG->session_error_counter);
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        global $CFG;
+        if (isset($CFG->session_error_counter)) {
+            return 'Session problems were detected. Total count: '.$CFG->session_error_counter;
+        } else {
+            return 'No session errors detected.';
+        }
+    }
+    function solution() {
+        global $CFG;
+        if (optional_param('resetsesserrorcounter', 0, PARAM_BOOL)) {
+            if (get_field('config', 'name', 'name', 'session_error_counter')) {
+                delete_records('config', 'name', 'session_error_counter');
+            }
+            return 'Error counter was cleared.';
+        } else {
+            return '<p>Session errors can be caused by:<ul><li>unresolved problem in server software (aka random switching of users),</li><li>blocked or modified cookies,</li><li>deleting of active session files.</li></ul></p><p><a href="'.me().'&resetsesserrorcounter=1">Reset counter.</a></p>';
+        }
+    }
+}
+
+
+class problem_00000x extends problem_base {
+    function title() {
+        return '';
+    }
+    function exists() {
+        return false;
+    }
+    function severity() {
+        return SEVERITY_SIGNIFICANT;
+    }
+    function description() {
+        return '';
+    }
+    function solution() {
+        global $CFG;
+        return '';
+    }
+}
+
+/*
+
+TODO:
+
+    session.save_path -- it doesn't really matter because we are already IN a session, right?
+    detect unsupported characters in $CFG->wwwroot - see bug Bug #6091 - relative vs absolute path during backup/restore process
+
+*/
+
+?>

admin/index.php

@@ -1,447 +1,555 @@
-<?php
+<?php // $Id$
 
-// 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/>.
-
-/**
- * Main administration script.
- *
- * @package    core
- * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-// Check that config.php exists, if not then call the install script
-if (!file_exists('../config.php')) {
-    header('Location: ../install.php');
-    die();
-}
-
-// Check that PHP is of a sufficient version as soon as possible
-if (version_compare(phpversion(), '5.3.2') < 0) {
-    $phpversion = phpversion();
-    // do NOT localise - lang strings would not work here and we CAN NOT move it to later place
-    echo "Moodle 2.1 or later requires at least PHP 5.3.2 (currently using version $phpversion).<br />";
-    echo "Please upgrade your server software or install older Moodle version.";
-    die();
-}
-
-// make sure iconv is available and actually works
-if (!function_exists('iconv')) {
-    // this should not happen, this must be very borked install
-    echo 'Moodle requires the iconv PHP extension. Please install or enable the iconv extension.';
-    die();
-}
-
-define('NO_OUTPUT_BUFFERING', 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
-require_once($CFG->libdir.'/pluginlib.php');   // available updates notifications
-
-$id             = optional_param('id', '', PARAM_TEXT);
-$confirmupgrade = optional_param('confirmupgrade', 0, PARAM_BOOL);
-$confirmrelease = optional_param('confirmrelease', 0, PARAM_BOOL);
-$confirmplugins = optional_param('confirmplugincheck', 0, PARAM_BOOL);
-$showallplugins = optional_param('showallplugins', 0, PARAM_BOOL);
-$agreelicense   = optional_param('agreelicense', 0, PARAM_BOOL);
-$fetchupdates   = optional_param('fetchupdates', 0, PARAM_BOOL);
-
-// Check some PHP server settings
-
-$PAGE->set_url('/admin/index.php');
-$PAGE->set_pagelayout('admin'); // Set a default pagelayout
-
-$documentationlink = '<a href="http://docs.moodle.org/en/Installation">Installation docs</a>';
-
-if (ini_get_bool('session.auto_start')) {
-    print_error('phpvaroff', 'debug', '', (object)array('name'=>'session.auto_start', 'link'=>$documentationlink));
-}
-
-if (ini_get_bool('magic_quotes_runtime')) {
-    print_error('phpvaroff', 'debug', '', (object)array('name'=>'magic_quotes_runtime', 'link'=>$documentationlink));
-}
-
-if (!ini_get_bool('file_uploads')) {
-    print_error('phpvaron', 'debug', '', (object)array('name'=>'file_uploads', 'link'=>$documentationlink));
-}
-
-if (is_float_problem()) {
-    print_error('phpfloatproblem', 'admin', '', $documentationlink);
-}
-
-// Set some necessary variables during set-up to avoid PHP warnings later on this page
-if (!isset($CFG->release)) {
-    $CFG->release = '';
-}
-if (!isset($CFG->version)) {
-    $CFG->version = '';
-}
-if (!isset($CFG->branch)) {
-    $CFG->branch = '';
-}
-
-$version = null;
-$release = null;
-$branch = null;
-require("$CFG->dirroot/version.php");       // defines $version, $release, $branch and $maturity
-$CFG->target_release = $release;            // used during installation and upgrades
-
-if (!$version or !$release) {
-    print_error('withoutversion', 'debug'); // without version, stop
-}
-
-// Turn off xmlstrictheaders during upgrade.
-$origxmlstrictheaders = !empty($CFG->xmlstrictheaders);
-$CFG->xmlstrictheaders = false;
-
-if (!core_tables_exist()) {
-    $PAGE->set_pagelayout('maintenance');
-    $PAGE->set_popup_notification_allowed(false);
-
-    // fake some settings
-    $CFG->docroot = 'http://docs.moodle.org';
-
-    $strinstallation = get_string('installation', 'install');
-
-    // remove current session content completely
-    session_get_instance()->terminate_current();
-
-    if (empty($agreelicense)) {
-        $strlicense = get_string('license');
-
-        $PAGE->navbar->add($strlicense);
-        $PAGE->set_title($strinstallation.' - Moodle '.$CFG->target_release);
-        $PAGE->set_heading($strinstallation);
-        $PAGE->set_cacheable(false);
-
-        $output = $PAGE->get_renderer('core', 'admin');
-        echo $output->install_licence_page();
-        die();
-    }
-    if (empty($confirmrelease)) {
-        require_once($CFG->libdir.'/environmentlib.php');
-        list($envstatus, $environment_results) = check_moodle_environment(normalize_version($release), ENV_SELECT_RELEASE);
-        $strcurrentrelease = get_string('currentrelease');
-
-        $PAGE->navbar->add($strcurrentrelease);
-        $PAGE->set_title($strinstallation);
-        $PAGE->set_heading($strinstallation . ' - Moodle ' . $CFG->target_release);
-        $PAGE->set_cacheable(false);
-
-        $output = $PAGE->get_renderer('core', 'admin');
-        echo $output->install_environment_page($maturity, $envstatus, $environment_results, $release);
-        die();
+/// Check that config.php exists, if not then call the install script
+    if (!file_exists('../config.php')) {
+        header('Location: ../install.php');
+        die;
     }
 
-    // check plugin dependencies
-    $failed = array();
-    if (!plugin_manager::instance()->all_plugins_ok($version, $failed)) {
-        $PAGE->navbar->add(get_string('pluginscheck', 'admin'));
-        $PAGE->set_title($strinstallation);
-        $PAGE->set_heading($strinstallation . ' - Moodle ' . $CFG->target_release);
-
-        $output = $PAGE->get_renderer('core', 'admin');
-        $url = new moodle_url('/admin/index.php', array('agreelicense' => 1, 'confirmrelease' => 1, 'lang' => $CFG->lang));
-        echo $output->unsatisfied_dependencies_page($version, $failed, $url);
-        die();
-    }
-    unset($failed);
-
-    //TODO: add a page with list of non-standard plugins here
-
-    $strdatabasesetup = get_string('databasesetup');
-    upgrade_init_javascript();
-
-    $PAGE->navbar->add($strdatabasesetup);
-    $PAGE->set_title($strinstallation.' - Moodle '.$CFG->target_release);
-    $PAGE->set_heading($strinstallation);
-    $PAGE->set_cacheable(false);
-
-    $output = $PAGE->get_renderer('core', 'admin');
-    echo $output->header();
-
-    if (!$DB->setup_is_unicodedb()) {
-        if (!$DB->change_db_encoding()) {
-            // If could not convert successfully, throw error, and prevent installation
-            print_error('unicoderequired', 'admin');
-        }
+/// Check that PHP is of a sufficient version
+/// Moved here because older versions do not allow while(@ob_end_clean());
+    if (version_compare(phpversion(), "4.3.0") < 0) {
+        $phpversion = phpversion();
+        echo "Sorry, Moodle requires PHP 4.3.0 or later (currently using version $phpversion)";
+        die;
     }
 
-    install_core($version, true);
-}
+/// Turn off time limits and try to flush everything all the time, sometimes upgrades can be slow.
+
+    @set_time_limit(0);
+    @ob_implicit_flush(true);
+    while(@ob_end_clean()); // ob_end_flush prevents sending of headers
 
 
-// Check version of Moodle code on disk compared with database
-// and upgrade if possible.
+    require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');  // Contains various admin-only functions
+    require_once($CFG->libdir.'/ddllib.php'); // Install/upgrade related db functions
 
-$stradministration = get_string('administration');
-$PAGE->set_context(get_context_instance(CONTEXT_SYSTEM));
+    $id             = optional_param('id', '', PARAM_ALPHANUM);
+    $confirmupgrade = optional_param('confirmupgrade', 0, PARAM_BOOL);
+    $confirmrelease = optional_param('confirmrelease', 0, PARAM_BOOL);
+    $agreelicence = optional_param('agreelicence',0, PARAM_BOOL);
+    $ignoreupgradewarning = optional_param('ignoreupgradewarning', 0, PARAM_BOOL);
 
-if (empty($CFG->version)) {
-    print_error('missingconfigversion', 'debug');
-}
+/// check upgrade status first
+    if ($ignoreupgradewarning and !empty($_SESSION['upgraderunning'])) {
+        $_SESSION['upgraderunning'] = 0;
+    }
+    upgrade_check_running("Upgrade already running in this session, please wait!<br />Click on the exclamation marks to ignore this warning (<a href=\"index.php?ignoreupgradewarning=1\">!!!</a>).", 10);
 
-if ($version > $CFG->version) {  // upgrade
-    purge_all_caches();
-    $PAGE->set_pagelayout('maintenance');
-    $PAGE->set_popup_notification_allowed(false);
+/// Check some PHP server settings
 
-    if (upgrade_stale_php_files_present()) {
-        $PAGE->set_title($stradministration);
-        $PAGE->set_cacheable(false);
+    $documentationlink = '<a href="http://docs.moodle.org/en/Installation">Installation docs</a>';
 
-        $output = $PAGE->get_renderer('core', 'admin');
-        echo $output->upgrade_stale_php_files_page();
-        die();
+    if (ini_get_bool('session.auto_start')) {
+        error("The PHP server variable 'session.auto_start' should be Off - $documentationlink");
     }
 
-    if (empty($confirmupgrade)) {
-        $a = new stdClass();
-        $a->oldversion = "$CFG->release ($CFG->version)";
-        $a->newversion = "$release ($version)";
-        $strdatabasechecking = get_string('databasechecking', '', $a);
+    if (ini_get_bool('magic_quotes_runtime')) {
+        error("The PHP server variable 'magic_quotes_runtime' should be Off - $documentationlink");
+    }
 
-        $PAGE->set_title($stradministration);
-        $PAGE->set_heading($strdatabasechecking);
-        $PAGE->set_cacheable(false);
+    if (!ini_get_bool('file_uploads')) {
+        error("The PHP server variable 'file_uploads' is not turned On - $documentationlink");
+    }
 
-        $output = $PAGE->get_renderer('core', 'admin');
-        echo $output->upgrade_confirm_page($a->newversion, $maturity);
-        die();
+    if (empty($CFG->prefix) && $CFG->dbtype != 'mysql') {  //Enforce prefixes for everybody but mysql
+        error('$CFG->prefix can\'t be empty for your target DB (' . $CFG->dbtype . ')');
+    }
 
-    } else if (empty($confirmrelease)){
-        require_once($CFG->libdir.'/environmentlib.php');
-        list($envstatus, $environment_results) = check_moodle_environment($release, ENV_SELECT_RELEASE);
-        $strcurrentrelease = get_string('currentrelease');
+    if ($CFG->dbtype == 'oci8po' && strlen($CFG->prefix) > 2) { //Max prefix length for Oracle is 2cc
+        error('$CFG->prefix maximum allowed length for Oracle DBs is 2cc.');
+    }
 
-        $PAGE->navbar->add($strcurrentrelease);
-        $PAGE->set_title($strcurrentrelease);
-        $PAGE->set_heading($strcurrentrelease);
-        $PAGE->set_cacheable(false);
+/// Check that config.php has been edited
 
-        $output = $PAGE->get_renderer('core', 'admin');
-        echo $output->upgrade_environment_page($release, $envstatus, $environment_results);
-        die();
+    if ($CFG->wwwroot == "http://example.com/moodle") {
+        error("Moodle has not been configured yet.  You need to edit config.php first.");
+    }
 
-    } else if (empty($confirmplugins)) {
-        $strplugincheck = get_string('plugincheck');
 
-        $PAGE->navbar->add($strplugincheck);
-        $PAGE->set_title($strplugincheck);
-        $PAGE->set_heading($strplugincheck);
-        $PAGE->set_cacheable(false);
+/// Check settings in config.php
 
-        $reloadurl = new moodle_url('/admin/index.php', array('confirmupgrade' => 1, 'confirmrelease' => 1));
+    $dirroot = dirname(realpath("../index.php"));
+    if (!empty($dirroot) and $dirroot != $CFG->dirroot) {
+        error("Please fix your settings in config.php:
+              <p>You have:
+              <p>\$CFG->dirroot = \"".addslashes($CFG->dirroot)."\";
+              <p>but it should be:
+              <p>\$CFG->dirroot = \"".addslashes($dirroot)."\";",
+              "./");
+    }
 
-        // check plugin dependencies first
-        $failed = array();
-        if (!plugin_manager::instance()->all_plugins_ok($version, $failed)) {
-            $output = $PAGE->get_renderer('core', 'admin');
-            echo $output->unsatisfied_dependencies_page($version, $failed, $reloadurl);
-            die();
-        }
-        unset($failed);
+/// Set some necessary variables during set-up to avoid PHP warnings later on this page
+    if (!isset($CFG->framename)) {
+        $CFG->framename = "_top";
+    }
+    if (!isset($CFG->release)) {
+        $CFG->release = "";
+    }
+    if (!isset($CFG->version)) {
+        $CFG->version = "";
+    }
 
-        if ($fetchupdates) {
-            // no sesskey support guaranteed here
-            if (empty($CFG->disableupdatenotifications)) {
-                available_update_checker::instance()->fetch();
+/// Check if the main tables have been installed yet or not.
+
+    if (! $tables = $db->Metatables() ) {    // No tables yet at all.
+        $maintables = false;
+
+    } else {                                 // Check for missing main tables
+        $maintables = true;
+        $mtables = array("config", "course", "course_categories", "course_modules",
+                         "course_sections", "log", "log_display", "modules",
+                         "user");
+        foreach ($mtables as $mtable) {
+            if (!in_array($CFG->prefix.$mtable, $tables)) {
+                $maintables = false;
+                break;
             }
-            redirect($reloadurl);
-        }
-
-        $output = $PAGE->get_renderer('core', 'admin');
-        echo $output->upgrade_plugin_check_page(plugin_manager::instance(), available_update_checker::instance(),
-                $version, $showallplugins, $reloadurl,
-                new moodle_url('/admin/index.php', array('confirmupgrade'=>1, 'confirmrelease'=>1, 'confirmplugincheck'=>1)));
-        die();
-
-    } else {
-        // Launch main upgrade
-        upgrade_core($version, true);
-    }
-} else if ($version < $CFG->version) {
-    // better stop here, we can not continue with plugin upgrades or anything else
-    throw new moodle_exception('downgradedcore', 'error', new moodle_url('/admin/'));
-}
-
-// Updated human-readable release version if necessary
-if ($release <> $CFG->release) {  // Update the release version
-    set_config('release', $release);
-}
-
-if ($branch <> $CFG->branch) {  // Update the branch
-    set_config('branch', $branch);
-}
-
-if (moodle_needs_upgrading()) {
-    if (!$PAGE->headerprinted) {
-        // means core upgrade or installation was not already done
-        if (!$confirmplugins) {
-            $strplugincheck = get_string('plugincheck');
-
-            $PAGE->set_pagelayout('maintenance');
-            $PAGE->set_popup_notification_allowed(false);
-            $PAGE->navbar->add($strplugincheck);
-            $PAGE->set_title($strplugincheck);
-            $PAGE->set_heading($strplugincheck);
-            $PAGE->set_cacheable(false);
-
-            if ($fetchupdates) {
-                // no sesskey support guaranteed here
-                available_update_checker::instance()->fetch();
-                redirect($PAGE->url);
-            }
-
-            $output = $PAGE->get_renderer('core', 'admin');
-
-            // check plugin dependencies first
-            $failed = array();
-            if (!plugin_manager::instance()->all_plugins_ok($version, $failed)) {
-                echo $output->unsatisfied_dependencies_page($version, $failed, $PAGE->url);
-                die();
-            }
-            unset($failed);
-
-            // dependencies check passed, let's rock!
-            echo $output->upgrade_plugin_check_page(plugin_manager::instance(), available_update_checker::instance(),
-                    $version, $showallplugins,
-                    new moodle_url($PAGE->url),
-                    new moodle_url('/admin/index.php', array('confirmplugincheck'=>1)));
-            die();
         }
     }
-    // install/upgrade all plugins and other parts
-    upgrade_noncore(true);
-}
 
-// If this is the first install, indicate that this site is fully configured
-// except the admin password
-if (during_initial_install()) {
-    set_config('rolesactive', 1); // after this, during_initial_install will return false.
-    set_config('adminsetuppending', 1);
-    // we need this redirect to setup proper session
-    upgrade_finished("index.php?sessionstarted=1&amp;lang=$CFG->lang");
-}
+    $linktoscrolltoerrors = '<script type="text/javascript" src="' . $CFG->wwwroot . '/lib/scroll_to_errors.js"></script>';
+    if (! $maintables) {
+    /// hide errors from headers in case debug enabled in config.php
+        $origdebug = $CFG->debug;
+        $CFG->debug = DEBUG_MINIMAL;
+        error_reporting($CFG->debug);
+        if (empty($agreelicence)) {
+            $strlicense = get_string("license");
+            print_header($strlicense, $strlicense, $strlicense, "", "", false, "&nbsp;", "&nbsp;");
+            print_heading("<a href=\"http://moodle.org\">Moodle</a> - Modular Object-Oriented Dynamic Learning Environment");
+            print_heading(get_string("copyrightnotice"));
+            print_simple_box_start('center');
+            echo text_to_html(get_string("gpl"));
+            print_simple_box_end();
+            echo "<br />";
+            notice_yesno(get_string("doyouagree"), "index.php?agreelicence=true",
+                                                   "http://docs.moodle.org/en/License");
+            exit;
+        }
 
-// make sure admin user is created - this is the last step because we need
-// session to be working properly in order to edit admin account
- if (!empty($CFG->adminsetuppending)) {
-    $sessionstarted = optional_param('sessionstarted', 0, PARAM_BOOL);
-    if (!$sessionstarted) {
-        redirect("index.php?sessionstarted=1&lang=$CFG->lang");
-    } else {
-        $sessionverify = optional_param('sessionverify', 0, PARAM_BOOL);
-        if (!$sessionverify) {
-            $SESSION->sessionverify = 1;
-            redirect("index.php?sessionstarted=1&sessionverify=1&lang=$CFG->lang");
+        $strdatabasesetup    = get_string("databasesetup");
+        $strdatabasesuccess  = get_string("databasesuccess");
+        print_header($strdatabasesetup, $strdatabasesetup, $strdatabasesetup,
+                        "", $linktoscrolltoerrors, false, "&nbsp;", "&nbsp;");
+    /// return to original debugging level
+        $CFG->debug = $origdebug;
+        error_reporting($CFG->debug);
+        upgrade_log_start();
+        $db->debug = true;
+
+    /// Both old .sql files and new install.xml are supported
+    /// But we prioritise install.xml (XMLDB) if present
+    
+        change_db_encoding(); // first try to change db encoding to utf8
+        $status = false;
+        if (file_exists("$CFG->libdir/db/install.xml")) {
+            $status = install_from_xmldb_file("$CFG->libdir/db/install.xml"); //New method
+        } else if (file_exists("$CFG->libdir/db/$CFG->dbtype.sql")) {
+            $status = modify_database("$CFG->libdir/db/$CFG->dbtype.sql"); //Old method
         } else {
-            if (empty($SESSION->sessionverify)) {
-                print_error('installsessionerror', 'admin', "index.php?sessionstarted=1&lang=$CFG->lang");
+            error("Error: Your database ($CFG->dbtype) is not yet fully supported by Moodle or install.xml is not present.  See the lib/db directory.");
+        }
+
+    /// Continue with the instalation
+        $db->debug = false;
+        if ($status) {
+            // Install the roles system.
+            moodle_install_roles();
+            set_config('statsrolesupgraded',time());
+
+            // Write default settings unconditionally (i.e. even if a setting is already set, overwrite it)
+            // (this should only have any effect during initial install).
+            $adminroot = admin_get_root();
+            $adminroot->prune('backups'); // backup settings table not created yet
+            apply_default_settings($adminroot);
+
+            /// This is used to handle any settings that must exist in $CFG but which do not exist in
+            /// admin_get_root()/$ADMIN as admin_setting objects (there are some exceptions).
+            apply_default_exception_settings(array('alternateloginurl' => '',
+                                                   'auth' => 'email',
+                                                   'auth_pop3mailbox' => 'INBOX',
+                                                   'changepassword' => '',
+                                                   'enrol' => 'manual',
+                                                   'enrol_plugins_enabled' => 'manual',
+                                                   'guestloginbutton' => 1,
+                                                   'style' => 'default',
+                                                   'template' => 'default',
+                                                   'theme' => 'standardwhite'));
+
+            notify($strdatabasesuccess, "green");
+        } else {
+            error("Error: Main databases NOT set up successfully");
+        }
+        print_continue('index.php');
+        die;
+    }
+
+
+/// Check version of Moodle code on disk compared with database
+/// and upgrade if possible.
+
+    if ( is_readable("$CFG->dirroot/version.php")) {
+        include_once("$CFG->dirroot/version.php");              # defines $version
+    }
+    if (!$version) {
+        error('Main version.php was not readable or specified');# without version, stop
+    }
+
+    if (file_exists("$CFG->dirroot/lib/db/$CFG->dbtype.php")) {
+        include_once("$CFG->dirroot/lib/db/$CFG->dbtype.php");  # defines old upgrades
+    }
+    if (file_exists("$CFG->dirroot/lib/db/upgrade.php")) {
+        include_once("$CFG->dirroot/lib/db/upgrade.php");  # defines new upgrades
+    }
+
+    $stradministration = get_string("administration");
+
+    if ($CFG->version) {
+        if ($version > $CFG->version) {  // upgrade
+
+            $a->oldversion = "$CFG->release ($CFG->version)";
+            $a->newversion = "$release ($version)";
+            $strdatabasechecking = get_string("databasechecking", "", $a);
+
+            // hide errors from headers in case debug is enabled
+            $origdebug = $CFG->debug;
+            $CFG->debug = DEBUG_MINIMAL;
+            error_reporting($CFG->debug);
+
+            // logout in case we are upgrading from pre 1.7 version - prevention of weird session problems
+            if ($CFG->version < 2006050600) {
+                require_logout();
             }
-            unset($SESSION->sessionverify);
+
+            if (empty($confirmupgrade)) {
+
+                print_header($strdatabasechecking, $stradministration, $strdatabasechecking,
+                        "", "", false, "&nbsp;", "&nbsp;");
+
+                notice_yesno(get_string('upgradesure', 'admin', $a->newversion), 'index.php?confirmupgrade=yes', 'index.php');
+                exit;
+
+            } else if (empty($confirmrelease)) {
+                $strcurrentrelease = get_string("currentrelease");
+                print_header($strcurrentrelease, $strcurrentrelease, $strcurrentrelease, "", "", false, "&nbsp;", "&nbsp;");
+                print_heading("Moodle $release");
+                print_simple_box(get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes'), 'center');
+
+                require_once($CFG->libdir.'/environmentlib.php');
+                print_heading(get_string('environment', 'admin'));
+                if (check_moodle_environment($release, $environment_results, true)) {
+                    notice_yesno(get_string('environmenterrorupgrade', 'admin'), 
+                                 'index.php?confirmupgrade=1&confirmrelease=1', 'index.php');
+                } else {
+                    notify(get_string('environmentok', 'admin'), 'notifysuccess');
+
+                    echo '<form action="index.php">';
+                    echo '<input type="hidden" name="confirmupgrade" value="1" />';
+                    echo '<input type="hidden" name="confirmrelease" value="1" />';
+                    echo '<div class="continuebutton"><input type="submit" value="'.get_string('continue').'" /></div>';
+                    echo '</form>';
+                }
+
+                print_footer('none');
+                exit;
+
+            } else {
+                $strdatabasesuccess  = get_string("databasesuccess");
+                print_header($strdatabasechecking, $stradministration, $strdatabasechecking,
+                        "", $linktoscrolltoerrors, false, "&nbsp;", "&nbsp;");
+
+            /// return to original debugging level
+                $CFG->debug = $origdebug;
+                error_reporting($CFG->debug);
+                upgrade_log_start();
+
+            /// Upgrade current language pack if we can
+                upgrade_language_pack();   
+
+                print_heading($strdatabasechecking);
+                $db->debug=true;
+            /// Launch the old main upgrade (if exists)
+                $status = true;
+                if (function_exists('main_upgrade')) {
+                    $status = main_upgrade($CFG->version);
+                }
+            /// If succesful and exists launch the new main upgrade (XMLDB), called xmldb_main_upgrade
+                if ($status && function_exists('xmldb_main_upgrade')) {
+                    $status = xmldb_main_upgrade($CFG->version);
+                }
+                $db->debug=false;
+            /// If successful, continue upgrading roles and setting everything properly
+                if ($status) {
+                    if (empty($CFG->rolesactive)) {
+                        // Upgrade to the roles system.
+                        moodle_install_roles();
+                        set_config('rolesactive', 1);
+                    } else if (!update_capabilities()) {
+                        error('Had trouble upgrading the core capabilities for the Roles System');
+                    }
+                    require_once($CFG->libdir.'/statslib.php');
+                    if (!stats_upgrade_for_roles_wrapper()) {
+                        notify('Couldn\'t upgrade the stats tables to use the new roles system');
+                    }
+                    if (set_config("version", $version)) {
+                        remove_dir($CFG->dataroot . '/cache', true); // flush cache
+                        notify($strdatabasesuccess, "green");
+                        print_continue("upgradesettings.php");
+                        exit;
+                    } else {
+                        notify("Upgrade failed!  (Could not update version in config table)");
+                    }
+            /// Main upgrade not success
+                } else {
+                    notify("Upgrade failed!  See /version.php");
+                }
+                upgrade_log_finish();
+            }
+        } else if ($version < $CFG->version) {
+            upgrade_log_start();
+            notify("WARNING!!!  The code you are using is OLDER than the version that made these databases!");
+            upgrade_log_finish();
         }
-    }
-
-    // at this stage there can be only one admin unless more were added by install - users may change username, so do not rely on that
-    $adminids = explode(',', $CFG->siteadmins);
-    $adminuser = get_complete_user_data('id', reset($adminids));
-
-    if ($adminuser->password === 'adminsetuppending') {
-        // prevent installation hijacking
-        if ($adminuser->lastip !== getremoteaddr()) {
-            print_error('installhijacked', 'admin');
-        }
-        // login user and let him set password and admin details
-        $adminuser->newadminuser = 1;
-        complete_user_login($adminuser);
-        redirect("$CFG->wwwroot/user/editadvanced.php?id=$adminuser->id"); // Edit thyself
-
     } else {
-        unset_config('adminsetuppending');
+        if (!set_config("version", $version)) {
+            error("A problem occurred inserting current version into databases");
+        }
     }
 
-} else {
-    // just make sure upgrade logging is properly terminated
-    upgrade_finished('upgradesettings.php');
-}
+/// Updated human-readable release version if necessary
 
-// Turn xmlstrictheaders back on now.
-$CFG->xmlstrictheaders = $origxmlstrictheaders;
-unset($origxmlstrictheaders);
+    if ($release <> $CFG->release) {  // Update the release version
+        if (!set_config("release", $release)) {
+            error("ERROR: Could not update release version in database!!");
+        }
+    }
 
-// Check for valid admin user - no guest autologin
-require_login(0, false);
-$context = get_context_instance(CONTEXT_SYSTEM);
-require_capability('moodle/site:config', $context);
+/// Find and check all main modules and load them up or upgrade them if necessary
+/// first old *.php update and then the new upgrade.php script
+    upgrade_activity_modules("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
-// check that site is properly customized
-$site = get_site();
-if (empty($site->shortname)) {
-    // probably new installation - lets return to frontpage after this step
-    // remove settings that we want uninitialised
-    unset_config('registerauth');
-    redirect('upgradesettings.php?return=site');
-}
+/// Check all questiontype plugins and upgrade if necessary
+/// first old *.php update and then the new upgrade.php script
+/// It is important that this is done AFTER the quiz module has been upgraded
+    upgrade_plugins('qtype', 'question/type', "$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
-// Check if we are returning from moodle.org registration and if so, we mark that fact to remove reminders
-if (!empty($id) and $id == $CFG->siteidentifier) {
-    set_config('registered', time());
-}
+/// Upgrade backup/restore system if necessary
+/// first old *.php update and then the new upgrade.php script
+    require_once("$CFG->dirroot/backup/lib.php");
+    upgrade_backup_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
-// setup critical warnings before printing admin tree block
-$insecuredataroot = is_dataroot_insecure(true);
-$SESSION->admin_critical_warning = ($insecuredataroot==INSECURE_DATAROOT_ERROR);
+/// Upgrade blocks system if necessary
+/// first old *.php update and then the new upgrade.php script
+    require_once("$CFG->dirroot/lib/blocklib.php");
+    upgrade_blocks_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
-$adminroot = admin_get_root();
+/// Check all blocks and load (or upgrade them if necessary)
+/// first old *.php update and then the new upgrade.php script
+    upgrade_blocks_plugins("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
-// Check if there are any new admin settings which have still yet to be set
-if (any_new_admin_settings($adminroot)){
-    redirect('upgradesettings.php');
-}
+/// Check all enrolment plugins and upgrade if necessary
+/// first old *.php update and then the new upgrade.php script
+    upgrade_plugins('enrol', 'enrol', "$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
-// Everything should now be set up, and the user is an admin
+/// Check for local database customisations
+/// first old *.php update and then the new upgrade.php script
+    require_once("$CFG->dirroot/lib/locallib.php");
+    upgrade_local_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
-// Print default admin page with notifications.
-$errorsdisplayed = defined('WARN_DISPLAY_ERRORS_ENABLED');
+/// just make sure upgrade logging is properly terminated
+    upgrade_log_finish();
 
-$lastcron = $DB->get_field_sql('SELECT MAX(lastcron) FROM {modules}');
-$cronoverdue = ($lastcron < time() - 3600 * 24);
-$dbproblems = $DB->diagnose();
-$maintenancemode = !empty($CFG->maintenance_enabled);
+/// Set up the blank site - to be customized later at the end of install.
+    if (! $site = get_site()) {
+        // We are about to create the site "course"
+        require_once($CFG->libdir.'/blocklib.php');
 
-$updateschecker = available_update_checker::instance();
-$availableupdates = $updateschecker->get_update_info('core',
-    array('minmaturity' => $CFG->updateminmaturity, 'notifybuilds' => $CFG->updatenotifybuilds));
-$availableupdatesfetch = $updateschecker->get_last_timefetched();
+        $newsite = new Object();
+        $newsite->fullname = "";
+        $newsite->shortname = "";
+        $newsite->summary = "";
+        $newsite->newsitems = 3;
+        $newsite->numsections = 0;
+        $newsite->category = 0;
+        $newsite->format = 'site';  // Only for this course
+        $newsite->teacher = get_string("defaultcourseteacher");
+        $newsite->teachers = get_string("defaultcourseteachers");
+        $newsite->student = get_string("defaultcoursestudent");
+        $newsite->students = get_string("defaultcoursestudents");
+        $newsite->timemodified = time();
 
-$buggyiconvnomb = (!function_exists('mb_convert_encoding') and @iconv('UTF-8', 'UTF-8//IGNORE', '100'.chr(130).'€') !== '100€');
-//check if the site is registered on Moodle.org
-$registered = $DB->count_records('registration_hubs', array('huburl' => HUB_MOODLEORGHUBURL, 'confirmed' => 1));
+        if ($newid = insert_record('course', $newsite)) {
+            // Site created, add blocks for it
+            $page = page_create_object(PAGE_COURSE_VIEW, $newid);
+            blocks_repopulate_page($page); // Return value not checked because you can always edit later
 
-admin_externalpage_setup('adminnotifications');
+            $cat = new Object();
+            $cat->name = get_string('miscellaneous');
+            if (insert_record('course_categories', $cat)) {
+                  redirect('index.php');
+            } else {
+                 error("Serious Error! Could not set up a default course category!");
+            }
+        } else {
+            error("Serious Error! Could not set up the site!");
+        }
+    }
 
-if ($fetchupdates) {
-    require_sesskey();
-    $updateschecker->fetch();
-    redirect($PAGE->url);
-}
+    // initialise default blocks on admin and site page if needed
+    if (empty($CFG->adminblocks_initialised)) {
+        require_once("$CFG->dirroot/$CFG->admin/pagelib.php");
+        require_once($CFG->libdir.'/blocklib.php');
+        page_map_class(PAGE_ADMIN, 'page_admin');
+        $page = page_create_object(PAGE_ADMIN, 0); // there must be some id number
+        blocks_repopulate_page($page);
 
-$output = $PAGE->get_renderer('core', 'admin');
-echo $output->admin_notifications_page($maturity, $insecuredataroot, $errorsdisplayed,
-        $cronoverdue, $dbproblems, $maintenancemode, $availableupdates, $availableupdatesfetch, $buggyiconvnomb,
-        $registered);
+        //add admin_tree block to site if not already present
+        if ($admintree = get_record('block', 'name', 'admin_tree')) {
+            $page = page_create_object(PAGE_COURSE_VIEW, SITEID);
+            blocks_execute_action($page, blocks_get_by_page($page), 'add', (int)$admintree->id, false, false);
+            if ($admintreeinstance = get_record('block_instance', 'pagetype', $page->type, 'pageid', SITEID, 'blockid', $admintree->id)) {
+                blocks_execute_action($page, blocks_get_by_page($page), 'moveleft', $admintreeinstance, false, false);
+            }
+        }
+
+        set_config('adminblocks_initialised', 1);
+    }
+
+/// Define the unique site ID code if it isn't already
+    if (empty($CFG->siteidentifier)) {    // Unique site identification code
+        set_config('siteidentifier', random_string(32).$_SERVER['HTTP_HOST']);
+    }
+
+/// Check if the guest user exists.  If not, create one.
+    if (! record_exists("user", "username", "guest")) {
+        $guest->auth        = "manual";
+        $guest->username    = "guest";
+        $guest->password    = md5("guest");
+        $guest->firstname   = addslashes(get_string("guestuser"));
+        $guest->lastname    = " ";
+        $guest->email       = "root@localhost";
+        $guest->description = addslashes(get_string("guestuserinfo"));
+        $guest->confirmed   = 1;
+        $guest->lang        = $CFG->lang;
+        $guest->timemodified= time();
+
+        if (! $guest->id = insert_record("user", $guest)) {
+            notify("Could not create guest user record !!!");
+        }
+    }
+
+
+/// Set up the admin user
+    if (empty($CFG->rolesactive)) {
+        redirect('user.php');
+    }
+
+/// Check for valid admin user
+    require_login();
+
+    $context = get_context_instance(CONTEXT_SYSTEM, SITEID);
+
+    require_capability('moodle/site:config', $context);
+
+/// check that site is properly customized
+    if (empty($site->shortname) or empty($site->shortname)) {
+        redirect('settings.php?section=frontpage&amp;return=site');
+    }
+
+/// Check if we are returning from moodle.org registration and if so, we mark that fact to remove reminders
+
+    if (!empty($id)) {
+        if ($id == $CFG->siteidentifier) {
+            set_config('registered', time());
+        }
+    }
+
+/// Everything should now be set up, and the user is an admin
+
+/// Print default admin page with notifications.
+
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('adminnotifications', $adminroot);
+    admin_externalpage_print_header($adminroot);
+
+/// Deprecated database! Warning!!
+    if (!empty($CFG->migrated_to_new_db)) {
+        print_simple_box_start('center','60%');
+        print_string('dbmigrationdeprecateddb','admin');
+        print_simple_box_end();
+    }
+
+/// Check for any special upgrades that might need to be run
+    if (!empty($CFG->upgrade)) {
+        print_simple_box(get_string("upgrade$CFG->upgrade", "admin",
+                                    "$CFG->wwwroot/$CFG->admin/upgrade$CFG->upgrade.php"), "center", '60%');
+        print_spacer(10,10);
+    }
+
+    if (ini_get_bool('register_globals') && !ini_get_bool('magic_quotes_gpc')) {
+        print_simple_box(get_string('globalsquoteswarning', 'admin'), 'center', '60%');
+    }
+
+    if (is_dataroot_insecure()) {
+        print_simple_box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot), 'center', '60%');
+    }
+
+/// If no recently cron run
+    $lastcron = get_field_sql('SELECT max(lastcron) FROM ' . $CFG->prefix . 'modules');
+    if (time() - $lastcron > 3600 * 24) {
+        $strinstallation = get_string('installation', 'install');
+        $helpbutton = helpbutton('install', $strinstallation, 'moodle', true, false, '', true);
+        print_simple_box(get_string('cronwarning', 'admin')."&nbsp;".$helpbutton, 'center', '60%');
+    }
+
+/// Alert if we are currently in maintenance mode
+    if (file_exists($CFG->dataroot.'/1/maintenance.html')) {
+        print_simple_box(get_string('sitemaintenancewarning', 'admin') , 'center', '60%');
+    }
+
+/// Alert to display the utf-8 migration button (if !unicode yet and DB is MySQL or PG)
+    if (empty($CFG->unicodedb) && in_array($CFG->dbtype, array('mysql', 'postgres7'))) {
+        print_simple_box(get_string('unicodeupgradenotice', 'admin') , 'center', '60%');
+    }
+
+/// Print slightly annoying registration button every six months   ;-)
+/// You can set the "registered" variable to something far in the future
+/// if you really want to prevent this.   eg  9999999999
+    if (!isset($CFG->registered) || $CFG->registered < (time() - 3600*24*30*6)) {
+        $options = array();
+        $options['sesskey'] = $USER->sesskey;
+        print_simple_box_start('center','60%');
+        echo '<div align="center">';
+        print_string('pleaseregister', 'admin');
+        print_single_button('register.php', $options, get_string('registration'));
+        echo '</div>';
+        print_simple_box_end();
+        $registrationbuttonshown = true;
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    ////  IT IS ILLEGAL AND A VIOLATION OF THE GPL TO HIDE, REMOVE OR MODIFY THIS COPYRIGHT NOTICE ///
+    $copyrighttext = '<a href="http://moodle.org/">Moodle</a> '.
+                     '<a href="http://docs.moodle.org/en/Release">'.$CFG->release.'</a> ('.$CFG->version.')<br />'.
+                     'Copyright &copy; 1999 onwards, Martin Dougiamas<br />'.
+                     'and <a href="http://docs.moodle.org/en/Credits">many other contributors</a>.<br />'.
+                     '<a href="http://docs.moodle.org/en/License">GNU Public License</a>';
+    echo '<p class="copyright">'.$copyrighttext.'</p>';
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+    if (empty($registrationbuttonshown)) {
+        echo '<div align="center">';
+        $options = array();
+        $options['sesskey'] = $USER->sesskey;
+        print_single_button('register.php', $options, get_string('registration'));
+        echo '</div>';
+    }
+
+    admin_externalpage_print_footer($adminroot);
+
+
+
+?>

admin/innodb.php

@@ -0,0 +1,43 @@
+<?php
+
+   require_once('../config.php');
+   require_once($CFG->libdir.'/adminlib.php');
+   $adminroot = admin_get_root();
+   admin_externalpage_setup('toinodb', $adminroot);
+
+   $confirm = optional_param('confirm', 0, PARAM_BOOL);
+
+   require_login();
+
+   require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+
+   admin_externalpage_print_header($adminroot);
+   print_heading('Convert all MySQL tables from MYISAM to InnoDB');
+
+   if ($CFG->dbtype != 'mysql') {
+        notice('This function is for MySQL databases only!', 'index.php');
+   }
+
+   if (data_submitted() and $confirm and confirm_sesskey()) {
+
+       notify('Please be patient and wait for this to complete...', 'notifysuccess');
+
+       if ($tables = $db->MetaTables()) {
+           $db->debug = true;
+           foreach ($tables as $table) {
+               execute_sql("ALTER TABLE $table TYPE=INNODB; ");
+           }
+           $db->debug = false;
+       }
+       notify('... done.', 'notifysuccess');
+       print_continue('index.php');
+       admin_externalpage_print_footer($adminroot);
+
+   } else {
+       $optionsyes = array('confirm'=>'1', 'sesskey'=>sesskey());
+       notice_yesno('Are you sure you want convert all your tables to the InnoDB format?',
+                    'innodb.php', 'index.php', $optionsyes, NULL, 'post', 'get');
+       admin_externalpage_print_footer($adminroot);
+   }
+
+?>

admin/lang.php

@@ -0,0 +1,617 @@
+<?PHP // $Id$
+    /**
+    * Display the admin/language menu and process strings translation.
+    *
+    * CHANGES
+    *
+    * 2006/11/07 mudrd8mz
+    * Fixed bug MDL-7361. Thanks to Dan Poltawski for the patch proposal.
+    *
+    * 2006/06/08 mudrd8mz
+    * 1) Fixed bug 5745 reported by Harry Smith so now can edit en_utf8_local pack
+    * 2) More notification messages included
+    *
+    * 2006/05/30 mudrd8mz
+    * Merged with version by Mitsuhiro Yoshida - display icon links instead of text links
+    * (I have changed the position of arrow icons to not to be so close each other)
+    *
+    * 2006/05/19 mudrd8mz
+    * A lot of changes to support translation of *_utf8_local langugage packs. Needs testing
+    *
+    * 2006/05/16 mudrd8mz
+    * 1) LANG_DEFAULT_FILE can be now set. moodle.php used to be opened automatically.
+    *    As it was (and still is) one of the biggest files it usually took a long time to load the page
+    *    even if you just want to choose the file to translate.
+    * 2) added links from "missing" to "compare" mode page
+    * 3) english strings are now key-sorted in "missing" mode
+    * 4) list of files with missing strings is now displayed at the top of "missing" page
+    *
+    * 2006/05/14 mudrd8mz Improvements of lang.php,v 1.65 2006/04/10 22:15:57 stronk7 Exp 
+    *  1) "go to first missing string" link can be displayed (see LANG_DISPLAY_MISSING_LINKS)
+    *  2) "go to next missing" link can be displayed (see LANG_DISPLAY_MISSING_LINKS)
+    *  3) submit button may be repeated (see LANG_SUBMIT_REPEAT*)
+    *  4) added (empty) "summary" attribute for the <table>'s
+    *  5) added error_reporting(E_ALL ^ E_NOTICE); in "compare" mode (even in debug environment
+    *     we know that missing keys are missing strings here, not bugs ;-)
+    */
+
+    require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('langedit', $adminroot);    
+
+    define('LANG_SUBMIT_REPEAT', 1);            // repeat displaying submit button?
+    define('LANG_SUBMIT_REPEAT_EVERY', 20);     // if so, after how many lines?
+    define('LANG_DISPLAY_MISSING_LINKS', 1);    // display "go to first/next missing string" links?
+    define('LANG_DEFAULT_FILE', '');            // default file to translate. Empty allowed
+    define('LANG_LINK_MISSING_STRINGS', 1);     // create links from "missing" page to "compare" page?
+    define('LANG_DEFAULT_USELOCAL', 0);         // should *_utf8_local be used by default?
+
+    $mode        = optional_param('mode', '', PARAM_ALPHA);
+    $currentfile = optional_param('currentfile', LANG_DEFAULT_FILE, PARAM_FILE);
+    $uselocal    = optional_param('uselocal', -1, PARAM_INT);
+
+    if ($uselocal == -1) {
+        if (isset($SESSION->langtranslateintolocal)) {
+            $uselocal = $SESSION->langtranslateintolocal;
+        } else {
+            $uselocal = LANG_DEFAULT_USELOCAL;
+        }
+    } else {
+        $SESSION->langtranslateintolocal = $uselocal;
+    }
+
+    $strlanguage = get_string("language");
+    $strcurrentlanguage = get_string("currentlanguage");
+    $strmissingstrings = get_string("missingstrings");
+    $streditstrings = get_string("editstrings", 'admin');
+    $stredithelpdocs = get_string("edithelpdocs", 'admin');
+    $strthislanguage = get_string("thislanguage");
+    $strgotofirst = get_string('gotofirstmissing','admin');
+    $strfilestoredin = get_string('langstorein', 'admin');
+    $strfilestoredinhelp = get_string('langstoreinhelp', 'admin');
+    $strswitchlangdirbtn = get_string('langstoreswitch', 'admin');
+    $strchoosefiletoedit = get_string('langchoosefile', 'admin');
+    $streditennotallowed = get_string('langnoeditenglish', 'admin');
+    $strfilecreated = get_string('langfilecreated', 'admin');
+
+    // FIXME / TODO
+    // remove following lines after adding string into proper english lang pack
+    $strgotofirst = 'go to first missing string';
+    $strfilestoredin = 'Save file into folder :';
+    $strfilestoredinhelp = 'Where the file will be stored';
+    $strswitchlangdirbtn = 'switch';
+    $strchoosefiletoedit = 'Choose file to edit from the box above';
+    $streditennotallowed = 'Language en_utf8 cannot be edited with this page - switch to local';
+    $strfilecreated = 'New file created';
+
+    $currentlang = current_language();
+    
+    switch ($mode) {
+        case "missing":
+            // Missing array keys are not bugs here but missing strings
+            error_reporting(E_ALL ^ E_NOTICE);
+            $navigation = "<a href=\"lang.php\">$strlanguage</a> -> $strmissingstrings";
+            $title = $strmissingstrings;
+            $button = '<form target="'.$CFG->framename.'" method="get" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/lang.php">'.
+                      '<input type="hidden" name="mode" value="compare" />'.
+                      '<input type="submit" value="'.$streditstrings.'" /></form>';
+            break;
+        case "compare":
+            $navigation = "<a href=\"lang.php\">$strlanguage</a> -> $streditstrings";
+            $title = $streditstrings;
+            $button = '<form target="'.$CFG->framename.'" method="get" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/lang.php">'.
+                      '<input type="hidden" name="mode" value="missing" />'.
+                      '<input type="submit" value="'.$strmissingstrings.'" /></form>';
+            break;
+        default:
+            $title = $strlanguage;
+            $navigation = $strlanguage;
+            $button = '';
+            break;
+    }
+
+
+    admin_externalpage_print_header($adminroot);
+
+    if (!$mode) {
+        print_simple_box_start('center','80%');
+        echo '<div align="center">';
+        print_string('editlang','admin');
+        echo '<br />';
+        $currlang = current_language();
+        $langs = get_list_of_languages();
+        echo "<b>$strcurrentlanguage:</b>";
+        echo '<br />';
+        echo popup_form ("$CFG->wwwroot/$CFG->admin/lang.php?lang=", $langs, "chooselang", $currlang, "", "", "", true);
+        $options["lang"] = $currentlang;
+        print_heading("<a href=\"lang.php?mode=missing\">$strmissingstrings</a>");
+        print_heading("<a href=\"lang.php?mode=compare\">$streditstrings</a>");
+        print_heading("<a href=\"langdoc.php\">$stredithelpdocs</a>");
+        echo '</div>';
+        print_simple_box_end();
+        admin_externalpage_print_footer($adminroot);
+        exit;
+    }
+
+    // Get a list of all the root files in the English directory
+
+    $langbase = $CFG->dataroot . '/lang';
+    $enlangdir = "$CFG->dirroot/lang/en_utf8";
+    if ($currentlang == 'en_utf8') {
+        $langdir = $enlangdir;
+    } else {
+        $langdir = "$langbase/$currentlang";
+    }
+    $locallangdir = "$langbase/{$currentlang}_local";
+
+    if (! $stringfiles = get_directory_list($enlangdir, "", false)) {
+        error("Could not find English language pack!");
+    }
+
+    foreach ($stringfiles as $key => $file) {
+        if (substr($file, -4) != ".php") { //Avoid non php files to be showed
+            unset($stringfiles[$key]);
+        }
+        if ($file == "langconfig.php") { //Avoid langconfig.php to be showed
+            unset($stringfiles[$key]);
+        }
+    }
+
+    if ($mode == "missing") {
+        if (!file_exists($langdir)) {
+            error ('to edit this language pack, you need to put it in '.$CFG->dataroot.'/lang');
+        }
+
+        // Following variables store the HTML output to be echo-ed
+        $m = '';
+        $o = '';
+
+        // For each file, check that a counterpart exists, then check all the strings
+        foreach ($stringfiles as $file) {
+            unset($string);
+            include("$enlangdir/$file");
+            $enstring = $string;  
+
+            ksort($enstring);
+            
+            unset($string);
+
+            if (file_exists("$langdir/$file")) {
+                include("$langdir/$file");
+                $fileismissing = 0;
+            } else {
+                $fileismissing = 1;
+                // notify(get_string("filemissing", "", "$langdir/$file"));
+                $o .= '<div class="notifyproblem" align="center">'.get_string("filemissing", "", "$langdir/$file").'</div><br />';
+                $string = array();
+            }
+
+            $missingcounter = 0;
+    
+            $first = true;
+            foreach ($enstring as $key => $value) {
+                if (empty($string[$key]) and $string[$key] != "0") {    //bug fix 4735 mits
+                    $value = htmlspecialchars($value);
+                    $value = str_replace("$"."a", "\\$"."a", $value);
+                    $value = str_replace("%%","%",$value);
+                    if ($first) {
+                        $m .= "<a href=\"lang.php?mode=missing#$file\">$file";
+                        $m .= $fileismissing ? '*' : '';
+                        $m .= '</a> &nbsp; ';
+                        $o .= "<p><a name=\"$file\"></a><b>".get_string("stringsnotset","","$langdir/$file")."</b></p><pre>";
+                        $first = false;
+                        $somethingfound = true;
+                    }
+                    $missingcounter++;
+                    if (LANG_LINK_MISSING_STRINGS) {
+                        $missinglinkstart = "<a href=\"lang.php?mode=compare&amp;currentfile=$file#missing$missingcounter\">";
+                        $missinglinkend = '</a>';
+                    } else {
+                        $missinglinkstart = '';
+                        $missinglinkend = '';
+                    }
+                    $o .= "$"."string['".$missinglinkstart.$key.$missinglinkend."'] = \"$value\";<br />";
+                }
+            }
+            if (!$first) {
+                $o .= '</pre><hr />';
+            }
+        }
+  
+        if ($m <> '') {
+            echo '<br />';
+            print_simple_box_start("center", "80%");
+            echo '<center><font size="2">';
+            echo $m;
+            echo '</font></center>';
+            print_simple_box_end();
+        }
+        echo $o;
+
+        if (! $files = get_directory_list("$CFG->dirroot/lang/en_utf8/help", "CVS")) {
+            error("Could not find English language help files!");
+        }
+    
+        foreach ($files as $filekey => $file) {    // check all the help files.
+            if (!file_exists("$langdir/help/$file")) {
+                echo "<p><font color=\"red\">".get_string("filemissing", "", "$langdir/help/$file")."</font></p>";
+                $somethingfound = true;
+                continue;
+            }
+        }
+    
+        if (! $files = get_directory_list("$CFG->dirroot/lang/en_utf8/docs", "CVS")) {
+            error("Could not find English language docs files!");
+        }
+        foreach ($files as $filekey => $file) {    // check all the docs files.
+            if (!file_exists("$langdir/docs/$file")) {
+                echo "<p><font color=\"red\">".get_string("filemissing", "", "$langdir/docs/$file")."</font></p>";
+                $somethingfound = true;
+                continue;
+            }
+        }
+    
+        if (!empty($somethingfound)) {
+            print_continue("lang.php");
+        } else {
+            notice(get_string("languagegood"), "lang.php");
+        }
+
+    } else if ($mode == "compare") {
+   
+        if (!file_exists($langbase) ){
+            if (!lang_make_directory($langbase) ){
+                error('ERROR: Could not create base lang directory ' . $langbase);
+            } else {
+                echo '<div class="notifysuccess" align="center">Created directory '.
+                                                     $langbase .'</div>'."<br />\n";
+            }
+        } 
+        if (!$uselocal && !file_exists($langdir)) {
+            if (!lang_make_directory($langdir)) {
+                error('ERROR: Could not create directory '.$langdir);
+            } else {
+                echo '<div class="notifysuccess" align="center">Created directory '.
+                                                     $langdir .'</div>'."<br />\n";
+            }
+        }
+        if ($uselocal && !file_exists($locallangdir)) {
+            if (!lang_make_directory($locallangdir)) {
+                echo '<div class="notifyproblem" align="center">ERROR: Could not create directory '.
+                                     $locallangdir .'</div>'."<br />\n";
+                $uselocal = 0;
+            } else {
+                echo '<div class="notifysuccess" align="center">Created directory '.
+                                                     $locallangdir .'</div>'."<br />\n";
+            }
+        }
+        
+        if (isset($_POST['currentfile'])){   // Save a file
+            if (!confirm_sesskey()) {
+                error(get_string('confirmsesskeybad', 'error'));
+            }
+            
+            $newstrings = array();
+            
+            foreach ($_POST as $postkey => $postval) {
+                $stringkey = lang_file_string_key($postkey);
+                $newstrings[$stringkey] = $postval;
+            }
+            
+            unset($newstrings['currentfile']);
+
+            if ($uselocal) {
+                include("$langdir/$currentfile");
+                if (isset($string)) {
+                    $packstring = $string;
+                } else {
+                    $packstring = array();
+                }
+                unset($string);
+                $saveinto = $locallangdir;
+            } else {
+                $packstring = array();  
+                $saveinto = $langdir;
+            }
+            
+            if (lang_save_file($saveinto, $currentfile, $newstrings, $uselocal, $packstring)) {
+                notify(get_string("changessaved")." ($saveinto/$currentfile)", "green");
+            } else {
+                error("Could not save the file '$saveinto/$currentfile'!", "lang.php?mode=compare&amp;currentfile=$currentfile");
+            }
+            unset($packstring);
+        } 
+
+        print_heading_with_help($streditstrings, "langedit");
+
+        print_simple_box_start("center", "80%");
+        echo '<center><font size="2">';
+        foreach ($stringfiles as $file) {
+            if ($file == $currentfile) {
+                echo "<b>$file</b> &nbsp; ";
+            } else {
+                echo "<a href=\"lang.php?mode=compare&amp;currentfile=$file\">$file</a> &nbsp; ";
+            }
+        }
+        echo '</font></center>';
+        print_simple_box_end();
+
+
+        print_simple_box_start("center", "80%");
+        echo '<center>'.$strfilestoredin.' <strong>';
+        echo $uselocal ? "{$currentlang}_local" : $currentlang;
+        echo '</strong> ';
+        helpbutton('langswitchstorage', $strfilestoredinhelp, 'moodle');
+        
+        echo '<form target="'.$CFG->framename.'" method="get" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/lang.php">'.
+             '<input type="hidden" name="mode" value="compare" />'.
+             '<input type="hidden" name="currentfile" value="'.$currentfile.'" />'.
+             '<input type="hidden" name="uselocal" value="'.(1 - $uselocal % 2).'" />'.
+             '<input type="submit" value="'.$strswitchlangdirbtn.'" />'.
+             '</form></center>';
+        print_simple_box_end();
+       
+        if ($currentfile <> '') {
+            $saveto = $uselocal ? $locallangdir : $langdir;
+            error_reporting(0);
+            if (!file_exists("$saveto/$currentfile")) {
+                if (!@touch("$saveto/$currentfile")) {
+                    print_heading(get_string("filemissing", "", "$saveto/$currentfile"), "center", 4, "error");
+                } else {
+                    print_heading($strfilecreated, "center", 4, "notifysuccess");
+                }
+            }
+            if ($currentlang == "en_utf8" && !$uselocal) {
+                $editable = false;
+                print_heading($streditennotallowed, 'center', 4);
+            } elseif ($f = fopen("$saveto/$currentfile","r+")) {
+                $editable = true;
+                fclose($f);
+            } else {
+                $editable = false;
+                echo "<p><font size=\"1\">".get_string("makeeditable", "", "$saveto/$currentfile")."</font></p>";
+            }
+            error_reporting($CFG->debug);
+            
+            print_heading("$currentfile", "center", 4);
+            if (LANG_DISPLAY_MISSING_LINKS && $editable) {
+                print_heading('<a href="#missing1">'.$strgotofirst.'</a>', "center", 4);
+            }
+
+            unset($string);
+            include("$enlangdir/$currentfile");
+            $enstring = $string;  
+            if ($currentlang != 'en' and $currentfile == 'moodle.php') {
+                $enstring['thislanguage'] = "<< TRANSLATORS: Specify the name of your language here.  If possible use Unicode Numeric Character References >>";
+                $enstring['thischarset'] = "<< TRANSLATORS: Specify the character set of your language here. Note that all text created while this language is active will be stored using this character set, so don't change it once you have set it. Example: iso-8859-1 >>";
+                $enstring['thisdirection'] = "<< TRANSLATORS: This string specifies the direction of your text, either left-to-right or right-to-left.  Insert either 'ltr' or 'rtl' here. >>";
+                $enstring['parentlanguage'] = "<< TRANSLATORS: If your language has a Parent Language that Moodle should use when strings are missing from your language pack, then specify the code for it here.  If you leave this blank then English will be used.  Example: nl >>";
+            }
+            ksort($enstring);
+
+            unset($string);
+
+            @include("$locallangdir/$currentfile");
+            $localstring = isset($string) ? $string : array();
+            unset($string);
+            
+            @include("$langdir/$currentfile");
+
+            if ($editable) {
+                echo "<form name=\"$currentfile\" action=\"lang.php\" method=\"post\">";
+            }
+            echo "<table summary=\"\" width=\"100%\" cellpadding=\"2\" cellspacing=\"3\" border=\"0\" class=\"generalbox\">";
+            $linescounter = 0;
+            $missingcounter = 0;
+            foreach ($enstring as $key => $envalue) {
+                $linescounter++ ;
+                if (LANG_SUBMIT_REPEAT &&  $editable && $linescounter % LANG_SUBMIT_REPEAT_EVERY == 0) {
+                    echo '<tr><td colspan="2">&nbsp;<td><br />';
+                    echo '    <input type="submit" name="update" value="'.get_string('savechanges').': '.$currentfile.'" />';
+                    echo '<br />&nbsp;</td></tr>';
+                }
+                $envalue = nl2br(htmlspecialchars($envalue));
+                $envalue = preg_replace('/(\$a\-\&gt;[a-zA-Z0-9]*|\$a)/', '<b>$0</b>', $envalue);  // Make variables bold. 
+                $envalue = str_replace("%%","%",$envalue);
+                $envalue = str_replace("\\","",$envalue);              // Delete all slashes
+
+                echo "\n\n".'<tr>';
+                echo '<td dir="ltr" lang="en" width="20%" nowrap="nowrap" valign="top">'.$key.'</td>'."\n";
+                echo '<td dir="ltr" lang="en" width="40%" valign="top">'.$envalue.'</td>'."\n";
+
+                // Missing array keys are not bugs here but missing strings
+                error_reporting(E_ALL ^ E_NOTICE);
+                if ($uselocal) {
+                    $value = lang_fix_value_from_file($localstring[$key]);
+                    $value2 = lang_fix_value_from_file($string[$key]);
+                    if ($value == '') {
+                        $value = $value2;
+                    }
+                } else {
+                    $value = lang_fix_value_from_file($string[$key]);
+                    $value2 = lang_fix_value_from_file($localstring[$key]);
+                }
+                error_reporting($CFG->debug);
+
+                // Color highlighting:
+                // red #ef6868 - translation missing in both system and local pack
+                // yellow #feff7f - translation missing in system pack but is translated in local
+                // green #AAFFAA - translation present in both system and local but is different
+                if (!$value) {
+                    if (!$value2) {
+                        $cellcolour = 'style="background-color: #ef6868"'; // TODO: replace by CSS class
+                    } else {
+                        $cellcolour = 'style="background-color: #feff7f"'; // TODO: replace by CSS class
+                    }
+                    $missingcounter++;
+                    if (LANG_DISPLAY_MISSING_LINKS) {
+                        $missingtarget = '<a name="missing'.$missingcounter.'"></a>';
+                        $missingnext = '<a href="#missing'.($missingcounter+1).'">'.
+                        '<img src="' . $CFG->pixpath . '/t/down.gif" height="11" width="11" border="0" alt="" /></a>';
+                        $missingprev = '<a href="#missing'.($missingcounter-1).'">'.
+                        '<img src="' . $CFG->pixpath . '/t/up.gif" height="11" width="11" border="0" alt="" /></a>';
+                    } else {
+                        $missingtarget = '';
+                        $missingnext = '';
+                        $missingprev = '';
+                    }
+                } else {
+                    if ($value <> $value2 && $value2 <> '') {
+                        $cellcolour = 'style="background-color: #AAFFAA"'; // TODO: replace by CSS class
+                    } else {
+                        $cellcolour = '';
+                    }
+                    $missingtarget = '';
+                    $missingnext = '';
+                    $missingprev = '';
+                }
+
+                if ($editable) {
+                    echo '<td width="40%" '.$cellcolour.' valign="top">'. $missingprev . $missingtarget."\n";
+                    if (isset($string[$key])) {
+                        $valuelen = strlen($value);
+                    } else {
+                        $valuelen = strlen($envalue);
+                    }
+                    $cols=50;
+                    if (strstr($value, "\r") or strstr($value, "\n") or $valuelen > $cols) {
+                        $rows = ceil($valuelen / $cols);
+                        echo '<textarea name="stringXXX'.lang_form_string_key($key).'" cols="'.$cols.'" rows="'.$rows.'">'.$value.'</textarea>'."\n";
+                    } else {
+                        if ($valuelen) {
+                            $cols = $valuelen + 5;
+                        }
+                        echo '<input type="text" name="stringXXX'.lang_form_string_key($key).'" value="'.$value.'" size="'.$cols.'" />';
+                    }
+                    if ($value2 <> '' && $value <> $value2) {
+                        echo '<br /><span style="font-size:small">'.$value2.'</span>';
+                    }
+                    echo $missingnext . '</td>';
+
+                } else {
+                    echo '<td width="40%" bgcolor="'.$cellcolour.'" valign="top">'.$value.'</td>';
+                }
+            }
+            if ($editable) {
+                echo '<tr><td colspan="2">&nbsp;<td><br />';
+                echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+                echo '    <input type="hidden" name="currentfile" value="'.$currentfile.'" />';
+                echo '    <input type="hidden" name="mode" value="compare" />';
+                echo '    <input type="submit" name="update" value="'.get_string('savechanges').': '.$currentfile.'" />';
+                echo '</td></tr>';
+            }
+            echo '</table>';
+            echo '</form>'; 
+
+        } else {
+            // no $currentfile specified
+            print_heading($strchoosefiletoedit, "center", 4);
+        }
+    }
+
+    admin_externalpage_print_footer($adminroot);
+
+//////////////////////////////////////////////////////////////////////
+
+/**
+ * Save language translation file.
+ *
+ * Thanks to Petri Asikainen for the original version of code 
+ * used to save language files.
+ *
+ * @uses $CFG
+ * @uses $USER
+ * @param string $path Full pathname to the directory to use
+ * @param string $file File to overwrite
+ * @param array $strings Array of strings to write
+ * @param bool $local Should *_local version be saved?
+ * @param array $packstrings Array of default langpack strings (needed if $local)
+ * @return bool Created successfully?
+ */ 
+function lang_save_file($path, $file, $strings, $local, $packstrings) {
+    global $CFG, $USER;
+    if (!$f = @fopen("$path/$file","w")) {
+        return false;
+    }
+
+    fwrite($f, "<?PHP // \$Id\$ \n");
+    fwrite($f, "      // $file - created with Moodle $CFG->release ($CFG->version)\n");
+    if ($local) {
+        fwrite($f, "      // local modifications from $CFG->wwwroot\n");
+    }
+    fwrite($f, "\n\n");
+    ksort($strings);
+    foreach ($strings as $key => $value) {
+        @list($id, $stringname) = explode('XXX',$key);
+        if ($CFG->lang != "zh_hk" and $CFG->lang != "zh_tw") {  // Some MB languages include backslash bytes
+            $value = str_replace("\\","",$value);           // Delete all slashes
+        }
+        $value = str_replace("'", "\\'", $value);           // Add slashes for '
+        $value = str_replace('"', "\\\"", $value);          // Add slashes for "
+        $value = str_replace("%","%%",$value);              // Escape % characters
+        $value = str_replace("\r", "",$value);              // Remove linefeed characters
+        $value = trim($value);                              // Delete leading/trailing white space
+        if ($id == "string" and $value != ""){
+            if ((!$local) || (lang_fix_value_from_file($packstrings[$stringname]) <> lang_fix_value_from_file($value))) {
+                fwrite($f,"\$string['$stringname'] = '$value';\n");
+            }
+        }
+    }
+    fwrite($f,"\n?>\n");
+    fclose($f);
+    return true;
+}
+
+/**
+ * Fix value of string to translate.
+ *
+ * @param string $value Original string from the file
+ * @return string Fixed value
+ */
+function lang_fix_value_from_file($value='') {
+    $value = str_replace("\r","",$value);              // Bad character caused by Windows
+    $value = preg_replace("/\n{3,}/", "\n\n", $value); // Collapse runs of blank lines
+    $value = trim($value);                             // Delete leading/trailing white space
+    $value = str_replace("\\","",$value);              // Delete all slashes
+    $value = str_replace("%%","%",$value);
+    $value = str_replace("<","&lt;",$value);
+    $value = str_replace(">","&gt;",$value);
+    $value = str_replace('"',"&quot;",$value);
+    return $value;
+}
+
+/**
+ * Try and create a new language directory.
+ *
+ * @uses $CFG
+ * @param string $directory full path to the directory under $langbase
+ * @return string|false Returns full path to directory if successful, false if not
+ */
+function lang_make_directory($dir, $shownotices=true) {
+    global $CFG;
+    umask(0000);
+    if (! file_exists($dir)) {
+        if (! @mkdir($dir, $CFG->directorypermissions)) {
+            return false;
+        }
+        //@chmod($dir, $CFG->directorypermissions);  // Just in case mkdir didn't do it
+    }
+    return $dir;
+}
+
+
+
+/// Following functions are required because '.' in form input names
+/// get replaced by '_' by PHP.
+
+function lang_form_string_key($keyfromfile) {
+    return str_replace('.', '##46#', $keyfromfile);  /// Derived from &#46, the ascii value for a period.
+}
+
+function lang_file_string_key($keyfromform) {
+    return str_replace('##46#', '.', $keyfromform);
+}
+
+
+?>

admin/langdoc.php

@@ -0,0 +1,257 @@
+<?php // $Id$
+
+/**
+ * This script enables Moodle translators to edit /docs and /help language
+ * files directly via WWW interface.
+ *
+ * Author:     mudrd8mz@uxit.pedf.cuni.cz (http://moodle.cz)
+ * Based on:   lang.php in 1.4.3+ release
+ * Thanks:     Jaime Villate for important bug fixing, koen roggemans for his job and all moodlers
+ *             for intensive testing of this my first contribution
+ */
+    require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('langedit', $adminroot);
+
+    //
+    // Some local configuration
+    //
+    $fileeditorrows = 12;           // number of textareas' rows
+    $fileeditorcols = 100;          // dtto cols
+    $fileeditorinline = 1;          // shall be textareas put in one row?
+    $filemissingmark = ' (***)';    // mark to add to non-existing filenames in selection form
+    $fileoldmark = ' (old?)';       // mark to add to filenames in selection form id english version is newer
+                                    // or to filenames with filesize() == 0
+    $filetemplate = '';             // template for new files, i.e. '$Id$';
+
+    $currentfile = optional_param('currentfile', 'docs/README.txt', PARAM_PATH); 
+
+    $strlanguage = get_string("language");
+    $strcurrentlanguage = get_string("currentlanguage");
+    $strthislanguage = get_string("thislanguage");
+    $stredithelpdocs = get_string('edithelpdocs', 'admin');
+
+    admin_externalpage_print_header($adminroot);
+
+    $currentlang = current_language();
+    $langdir = "$CFG->dataroot/lang/$currentlang";
+    $enlangdir = "$CFG->dirroot/lang/en_utf8";
+
+
+    if (!file_exists($langdir)) {
+        error ('to edit this language pack, you need to put it in '.$CFG->dataroot.'/lang');
+    }
+    // Shall I save POSTed data?
+
+    if (isset($_POST['currentfile'])) {
+        if (confirm_sesskey()) {
+            if (langdoc_save_file($langdir, $currentfile, $_POST['filedata'])) {
+                notify(get_string("changessaved")." ($langdir/$currentfile)", "green");
+            } else {
+                error("Could not save the file '$currentfile'!", "langdoc.php?currentfile=$currentfile&sesskey=$USER->sesskey");
+            }
+        }
+    }
+
+    error_reporting(0); // Error reporting turned off due to non-existing files
+
+    // Generate selection for all help and documentation files
+
+    // Get all files from /docs directory
+
+    if (! $files = get_directory_list("$CFG->dirroot/lang/en_utf8/docs", "CVS")) {
+        error("Could not find English language docs files!");
+    }
+
+    $options = array();
+
+    foreach ($files as $filekey => $file) {    // check all the docs files.
+        $options["docs/$file"] = "docs/$file";
+        // add mark if file doesn't exist or is empty
+        if (( !file_exists("$langdir/docs/$file")) || (filesize("$langdir/docs/$file") == 0)) {
+            $options["docs/$file"] .= "$filemissingmark";
+        } else {       
+            if (filemtime("$langdir/docs/$file") < filemtime("$CFG->dirroot/lang/en_utf8/docs/$file")) {
+                $options["docs/$file"] .= "$fileoldmark";
+            }
+        }    
+    }
+
+    // Get all files from /help directory
+
+    if (! $files = get_directory_list("$CFG->dirroot/lang/en_utf8/help", "CVS")) {
+        error("Could not find English language help files!");
+    }
+
+    foreach ($files as $filekey => $file) {    // check all the help files.
+        $options["help/$file"] = "help/$file";
+        if (( !file_exists("$langdir/help/$file")) || (filesize("$CFG->dirroot/lang/en_utf8/help/$file") == 0)) {
+            $options["help/$file"] .= "$filemissingmark";
+        } else {
+            if (filemtime("$langdir/help/$file") < filemtime("$langdir/help/$file")) {
+                $options["help/$file"] .= "$fileoldmark";
+            }
+        }    
+    }
+
+    echo "<table align=\"center\"><tr><td align=\"center\">";
+    echo popup_form ("$CFG->wwwroot/$CFG->admin/langdoc.php?sesskey=$USER->sesskey&amp;currentfile=", $options, "choosefile", $currentfile, "", "", "", true);
+    echo "</td></tr></table>";
+
+    // Generate textareas
+
+    if (!empty($currentfile)) {
+
+        if (!file_exists("$langdir/$currentfile")) {
+            //check if directory exist
+            $pathparts = explode('/',$currentfile);
+            $checkpath = $langdir;
+            for ($a=0; $a < count($pathparts)-1 ; $a++) {
+                $checkpath .= "/".$pathparts[$a];
+                if(!file_exists($checkpath)){
+                     if(!mkdir($checkpath)){
+                         echo ("Cannot create directory: $checkpath");
+                     }    
+                }    
+            }
+            //
+            // file doesn't exist - let's check webserver's permission to create it
+            //
+            if (!touch("$langdir/$currentfile")) {
+                //
+                // webserver is unable to create new file
+                //
+                echo "<p align=\"center\"><font color=red>".get_string("filemissing", "", "
+$langdir/$currentfile")."</font></p>";
+                $editable = false;
+            } else {
+                //
+                // webserver can create new file - we can delete it now and let
+                // the langdoc_save_file() create it again if its filesize() > 0
+                //
+                $editable = true;
+                unlink("$langdir/$currentfile");
+            }
+        } elseif ($f = fopen("$langdir/$currentfile","r+")) {
+            //
+            // file exists and is writeable - good for you, translator ;-)
+            //
+            $editable = true;
+            fclose($f);
+        } else {
+            //
+            // file exists but it is not writeable by web server process :-(
+            //
+            $editable = false;
+            echo "<p><font size=1>".get_string("makeeditable", "", "$langdir/$currentfile")
+."</font></p>";
+        }
+
+        //en_utf8 in dataroot is not editable
+        if ($currentlang == 'en_utf8') {
+            $editable = false;
+        }
+
+        echo "<table align=\"center\"><tr valign=\"center\"><td align=\"center\">\n";
+        echo "<textarea rows=\"$fileeditorrows\" cols=\"$fileeditorcols\" name=\"\">\n";
+        echo htmlspecialchars(file_get_contents("$enlangdir/$currentfile"));
+        echo "</textarea>\n";
+        //link_to_popup_window("/lang/en_utf8/$currentfile", "popup", get_string("preview"));
+        $preview_url = langdoc_preview_url($currentfile);
+        if ($preview_url) {
+            link_to_popup_window($preview_url.'&amp;forcelang=en_utf8', 'popup', get_string('preview'));
+        }
+        echo "</td>\n";
+        if ($fileeditorinline == 1) {
+            echo "</tr>\n<tr valign=\"center\">\n";
+        }
+        echo "<td align=\"center\">\n";
+
+        if ($editable) {
+            echo "<form name=\"$currentfile\" action=\"langdoc.php\" method=\"post\">";
+            echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+            echo '<input type="hidden" name="currentfile" value="'.$currentfile.'" />';
+
+            echo "<textarea rows=\"$fileeditorrows\" cols=\"$fileeditorcols\" name=\"filedata\">\n";
+            if (file_exists("$langdir/$currentfile")) {
+                echo htmlspecialchars(file_get_contents("$langdir/$currentfile"));
+            } else {
+                echo ($filetemplate);
+            }
+            echo "</textarea>\n";
+            $preview_url = langdoc_preview_url($currentfile);
+            if ($preview_url) {
+                link_to_popup_window($preview_url, 'popup', get_string('preview'));
+            }
+            echo '<div align="center"><input type="submit" value="'.get_string('savechanges').': lang/'.$currentlang.'/'.$currentfile.'" /></div>';
+            echo '</form>';
+        }
+
+        echo "</td>\n</tr>\n</table>";
+
+
+        error_reporting($CFG->debug);
+    }
+
+    admin_externalpage_print_footer($adminroot);
+
+//////////////////////////////////////////////////////////////////////
+
+function langdoc_save_file($path, $file, $content) {
+
+// $path is a full pathname to the file
+// $file is the file to overwrite.
+// $content are data to write
+
+    global $CFG, $USER;
+
+    error_reporting(0);
+    
+    if (!$f = fopen("$path/$file","w")) {
+        error_reporting($CFG->debug);
+        return false;
+    }
+    
+    error_reporting($CFG->debug);
+
+    $content = str_replace("\r", "",$content);              // Remove linefeed characters
+    $content = preg_replace("/\n{3,}/", "\n\n", $content);  // Collapse runs of blank lines
+    $content = trim($content);                              // Delete leading/trailing whitespace
+        
+    fwrite($f, stripslashes($content));
+
+    fclose($f);
+
+    // Remove file if its empty
+
+    if (filesize("$path/$file") == 0) {
+        unlink("$path/$file");
+    }
+
+    return true;
+}
+
+/**
+ * Return a preview URL for the file, if available.
+ *
+ * Documentation will be moved into moodle.org wiki and current version 1.6 does not
+ * seem to be able to display local documentation. Thus, return empty URL for doc files.
+ * See lib/moodlelib.php document_file() - it still relies on old pre-UTF8 lang/ location.
+ */
+function langdoc_preview_url($currentfile) {
+    if (substr($currentfile, 0, 5) == 'help/') {
+        $currentfile = substr($currentfile, 5);
+        $currentpathexp = explode('/', $currentfile);
+        if (count($currentpathexp) > 1) {
+            $url = '/help.php?module='.$currentpathexp[0].'&amp;file='.$currentpathexp[1];
+        } else {
+            $url = '/help.php?module=moodle&amp;file='.$currentfile;
+        }
+    } else {
+        $url = '';
+    }
+    return $url;
+}
+
+?>

admin/langimport.php

@@ -0,0 +1,412 @@
+<?php //$Id$
+///This file only manages the installation of 1.6 lang packs.
+///in downloads.moodle.org, they are store in separate directory /lang16
+///in local server, they are stored in $CFG->dataroot/lang
+///This helps to avoid confusion.
+
+    require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('langimport', $adminroot);
+
+    $mode          = optional_param('mode', 0, PARAM_INT);     //phase
+    $pack          = optional_param('pack', '', PARAM_FILE);   //pack to install
+    $displaylang   = $pack;
+    $uninstalllang = optional_param('uninstalllang', '', PARAM_FILE);
+    $confirm       = optional_param('confirm', 0, PARAM_BOOL);
+    $sitelang      = optional_param('sitelangconfig', '', PARAM_FILE);
+
+    define('INSTALLATION_OF_SELECTED_LANG', 2);
+    define('CHANGE_SITE_LANG', 3);
+    define('DELETION_OF_SELECTED_LANG', 4);
+    define('UPDATE_ALL_LANG', 5);
+    
+    $strlang = get_string('langimport','admin');
+    
+    $strlanguage = get_string("language");
+    $strthislanguage = get_string("thislanguage");
+    $title = $strlang;
+        
+    admin_externalpage_print_header($adminroot);
+    
+
+    switch ($mode){
+    
+        case INSTALLATION_OF_SELECTED_LANG:    ///installation of selected language pack
+        
+            if (confirm_sesskey()) {
+                @mkdir ($CFG->dataroot.'/temp/');    //make it in case it's a fresh install, it might not be there
+                @mkdir ($CFG->dataroot.'/lang/');
+                
+                require_once($CFG->libdir.'/componentlib.class.php');
+                if ($cd = new component_installer('http://download.moodle.org', 'lang16',
+                                                    $pack.'.zip', 'languages.md5', 'lang')) {
+                    $status = $cd->install(); //returns ERROR | UPTODATE | INSTALLED
+                    switch ($status) {
+
+                        case ERROR:
+                            if ($cd->get_error() == 'remotedownloadnotallowed') {
+                                $a = new stdClass();
+                                $a->url = 'http://download.moodle.org/lang16/'.$pack.'zip';
+                                $a->dest= $CFG->dataroot.'/lang';
+                                error(get_string($cd->get_error(), 'error', $a));
+                            } else {
+                                error(get_string($cd->get_error(), 'error'));
+                            }
+                        break;
+
+                        case INSTALLED:
+                            @unlink($CFG->dataroot.'/cache/languages');
+                            redirect('langimport.php', get_string('langpackupdated','admin',$pack));
+                        break;
+
+                        case UPTODATE:
+                        break;
+
+                    }
+                } else {
+                    notify('Had an unspecified error with the component installer, sorry.');
+                }
+            }
+        break;
+
+        case CHANGE_SITE_LANG:    //change site language
+
+            if (confirm_sesskey()) {
+                $langconfig = get_record('config','name','lang');
+                $langconfig->value = $sitelang;
+                if (!empty($sitelang) && update_record('config',$langconfig)){
+                    redirect('langimport.php', get_string('sitelangchanged','admin'));
+                } else {
+                    error('Could not update the default site language!');
+                }
+            }
+
+        break;
+        case DELETION_OF_SELECTED_LANG:    //delete a directory(ies) containing a lang pack completely
+
+            if (!$confirm && confirm_sesskey()) {
+                notice_yesno(get_string('uninstallconfirm', 'admin', $uninstalllang), 
+                             'langimport.php?mode=4&amp;uninstalllang='.$uninstalllang.'&amp;confirm=1&amp;sesskey='.sesskey(),
+                             'langimport.php');
+            } else if (confirm_sesskey()) {
+                if ($uninstalllang == 'en_utf8') {
+                    error ('en_utf8 can not be uninstalled!');
+                }
+                $dest1 = $CFG->dataroot.'/lang/'.$uninstalllang;
+                $dest2 = $CFG->dirroot.'/lang/'.$uninstalllang;
+                $rm1 = false;
+                $rm2 = false;
+                if (file_exists($dest1)){
+                    $rm1 = remove_dir($dest1);
+                }
+                if (file_exists($dest2)){
+                    $rm2 = remove_dir($dest2);
+                }
+                //delete the direcotries
+                if ($rm1 or $rm2) {
+                    redirect('langimport.php', get_string('langpackremoved','admin'));
+                } else {    //nothing deleted, possibly due to permission error
+                    error('An error has occurred, language pack is not completely uninstalled, please check file permissions');
+                }
+            }
+            @unlink($CFG->dataroot.'/cache/languages');
+        break;
+        
+        case UPDATE_ALL_LANG:    //1 click update for all updatable language packs
+
+            //0th pull a list from download.moodle.org,
+            //key = langname, value = md5
+            $source = 'http://download.moodle.org/lang16/languages.md5';
+            $md5array = array();
+            $updated = 0;    //any packs updated?
+            unset($CFG->langlist);   // ignore admin's langlist
+            $alllangs = array_keys(get_list_of_languages());
+            $lang16 = array();   //all the Moodle 1.6 unicode lang packs (updated and not updated)
+            $packs = array();    //all the packs that needs updating
+
+
+            if (!$availablelangs = proxy_url($source)) {
+                error ('can not read from course');
+            }
+
+            //and build an associative array
+            foreach ($availablelangs as $alang) {
+                $md5array[$alang[0]] = $alang[1];
+            }
+
+            //filtering out non-16 packs
+            foreach ($alllangs as $clang) {
+                $dest1 = $CFG->dataroot.'/lang/'.$clang;
+                $dest2 = $CFG->dirroot.'/lang/'.$clang;
+
+                if (file_exists($dest1.'/langconfig.php') || file_exists($dest2.'/langconfig.php')){
+                    $lang16[] = $clang;
+                }
+            }
+
+            //then filter out packs that have the same md5 key
+            foreach ($lang16 as $clang) {
+                if (!is_installed_lang($clang, $md5array[$clang])){
+                    $packs[] = $clang;
+                }
+            }
+
+            @mkdir ($CFG->dataroot.'/temp/');
+            @mkdir ($CFG->dataroot.'/lang/');
+            foreach ($packs as $pack){    //for each of the remaining in the list, we
+                if ($pack == 'en_utf8') {    // no update for en_utf8
+                    continue;
+                }
+                //1. delete old director(ies)
+
+                $dest1 = $CFG->dataroot.'/lang/'.$pack;
+                $dest2 = $CFG->dirroot.'/lang/'.$pack;
+                $rm1 = false;
+                $rm2 = false;
+                if (file_exists($dest1)) {
+                    $rm1 = remove_dir($dest1);
+                }
+                if (file_exists($dest2)) {
+                    $rm2 = remove_dir($dest2);
+                }
+                if (!($rm1 || $rm2)) {
+                    error ('could not delete old directory, update failed');
+                }
+
+                //2. copy & unzip into new
+
+                require_once($CFG->libdir.'/componentlib.class.php');
+                if ($cd = new component_installer('http://download.moodle.org', 'lang16',
+                                       $pack.'.zip', 'languages.md5', 'lang')) {
+                $status = $cd->install(); //returns ERROR | UPTODATE | INSTALLED
+                switch ($status) {
+
+                    case ERROR:
+                        if ($cd->get_error() == 'remotedownloadnotallowed') {
+                            $a = new stdClass();
+                            $a->url = 'http://download.moodle.org/lang16/'.$pack.'zip';
+                            $a->dest= $CFG->dataroot.'/lang';
+                            error(get_string($cd->get_error(), 'error', $a));
+                        } else {
+                            error(get_string($cd->get_error(), 'error'));
+                        }
+                    break;
+                    case UPTODATE:
+                        //Print error string or whatever you want to do
+                    break;
+                    case INSTALLED:
+                        notify(get_string('langpackupdated','admin',$pack), 'notifysuccess');
+                        $updated = true;
+                        //Print/do whatever you want
+                    break;
+                    default:
+                    }
+                } else {
+
+                }
+            }
+
+            if ($updated) {
+                notice(get_string('langupdatecomplete','admin'), 'langimport.php');
+            } else {
+                notice(get_string('nolangupdateneeded','admin'), 'langimport.php');
+            }
+
+        break;
+        
+        default:    //display choice mode
+
+            $source = 'http://download.moodle.org/lang16/languages.md5';
+            $remote = 0;    //flag for reading from remote or local
+
+            if ($availablelangs = proxy_url($source)) {
+                $remote = 1;
+            } else {
+                $availablelangs = get_local_list_of_languages();
+            }
+/*
+            if ($fp = fopen($source, 'r')){    /// attempt to get the list from Moodle.org.
+                while(!feof ($fp)) {
+                    $availablelangs[] = split(',', fgets($fp,1024));
+                }
+                $remote = 1;    //can read from download.moodle.org
+            } else {    /// fopen failed, we find local copy of list.
+                $availablelangs = get_local_list_of_languages();
+            }
+*/
+            if (!$remote) {
+                print_simple_box_start('center','60%');
+                echo '<div align="center">';
+                print_string('remotelangnotavailable','admin',$CFG->dataroot.'/lang/');
+                echo '</div>';
+                print_simple_box_end();
+            }
+            
+            print_simple_box_start('center','60%');
+            echo '<table width="100%"><tr><td align="center">';
+            echo get_string('installedlangs','admin');
+            echo '</td><td align="center">';
+            echo get_string('availablelangs','admin');
+            echo '</td></tr>';
+            echo '<tr><td align="center" valign="top">';
+            echo '<form name="uninstallform" action="langimport.php?mode=4" method="POST">';
+            echo '<input name="sesskey" type="hidden" value="'.sesskey().'" />';
+            unset($CFG->langlist);   // ignore admin's langlist
+            $installedlangs = get_list_of_languages();
+
+            /// display installed langs here
+
+            echo '<select name="uninstalllang" size="15">';
+            foreach ($installedlangs as $clang =>$ilang){
+                echo '<option value="'.$clang.'">'.$ilang.'</option>';
+            }
+            echo '</select>';
+            echo '<br /><input type="submit" value="'.get_string('uninstall','admin').'" />';
+            echo '</form>';
+            echo '<form name="updateform" action="langimport.php?mode=5" method="POST">';
+            echo '<br /><input type="submit" value="'.get_string('updatelangs','admin').'" />';
+            echo '</form>';
+            echo '<p />';
+            
+            /// Display option to change site language
+ 
+ /// Erm... this doesn't seem to work. Plus it's redundant. -vinkmar
+            
+//            print_string('changesitelang','admin');
+//            $sitelanguage = get_record('config','name','lang');
+//            echo '<form name="changelangform" action="langimport.php?mode=3" method="POST">';
+//            echo '<select name="sitelangconfig">';
+//            
+//            foreach ($installedlangs as $clang =>$ilang) {
+//                if ($clang == $sitelanguage->value){
+//                    echo '<option value="'.$clang.'" selected="selected">'.$ilang.'</option>';
+//                } else {
+//                    echo '<option value="'.$clang.'">'.$ilang.'</option>';
+//                }
+//            }
+//            echo '</select>';
+//            echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
+//            echo '<input type="submit" value="'.get_string('change','admin').'" />';
+//            echo '</form>';
+
+            /// display to be installed langs here
+
+            echo '</td><td align="center" valign="top">';
+            echo '<table><tr><td valign="top" align="center">';    //availabe langs table
+            $empty = 1;    //something to pring
+
+            /// if this language pack is not already installed, then we allow installation
+
+            echo '<form name="installform" method="POST" action="langimport.php?mode=2">';
+            echo '<input name="sesskey" type="hidden" value="'.sesskey().'" />';
+            if ($remote) {
+                echo '<select name="pack" size="15">';
+            }
+
+            foreach ($availablelangs as $alang) {
+                if (trim($alang[0]) != "en_utf8") {
+                    if ($remote){
+                        if (substr($alang[0], -5) == '_utf8') {   //Remove the _utf8 suffix from the lang to show
+                            $shortlang = substr($alang[0], 0, -5);
+                        } else {
+                            $shortlang = $alang[0];
+                        }
+                        if (!is_installed_lang($alang[0], $alang[1])){    //if not already installed
+                            echo '<option value="'.$alang[0].'">'.$alang[2].' ('.$shortlang.')</option>';
+                        }
+                    } else {    //print list in local format, and instruction to install
+                        echo '<tr><td>'.$alang[2].'</td><td><a href="http://download.moodle.org/lang16/'.$alang[0].'.zip">'.get_string('download','admin').'</a>';
+                    }
+                    $empty = 0;
+                }
+            }
+            if ($remote) {
+                echo '</select>';
+                echo '<br/ ><input type="submit" value="<-- '.get_string('install','admin').'">';
+            }
+            echo '</form>';
+
+            if ($empty) {
+                echo '<tr><td align="center">';
+                print_string('nolanguagetodownload','admin');
+                echo '</td></tr>';
+            }
+
+            echo '</td><tr></table>';    //close available langs table
+            echo '<form>';
+            echo '</td></tr></table>';
+            print_simple_box_end();
+
+        break;
+
+    }    //close of main switch
+
+    admin_externalpage_print_footer($adminroot);
+    
+    /* returns a list of available language packs from a
+     * local copy shipped with standard moodle distro
+     * this is for site that can't perform fopen
+     * @return array
+     */
+    function get_local_list_of_languages() {
+        global $CFG;
+        $source = $CFG->wwwroot.'/lib/languages.md5';
+        $availablelangs = array();
+        if ($fp = fopen($source, 'r')){
+            while(!feof ($fp)) {
+                $availablelangs[] = split(',', fgets($fp,1024));
+            }
+        }
+        return $availablelangs;
+    }
+    
+    /* checks the md5 of the zip file, grabbed from download.moodle.org, 
+     * against the md5 of the local language file from last update
+     * @param string $lang
+     * @param string $md5check
+     * @return bool
+     */
+    function is_installed_lang($lang, $md5check) {
+        global $CFG;
+        $md5file = $CFG->dataroot.'/lang/'.$lang.'/'.$lang.'.md5';
+        if (file_exists($md5file)){
+            return (file_get_contents($md5file) == $md5check);
+        }
+        return false;
+    }
+    
+    //returns an array of languages, or false if can not read from source
+    //uses a socket if proxy is set as a config variable
+    function proxy_url($url) {
+        global $CFG;
+
+        if ($CFG->proxyhost && $CFG->proxyport) {
+
+            $proxy_fp = fsockopen($CFG->proxyhost, $CFG->proxyport);
+            if (!$proxy_fp) {
+                return false;    //failed
+            }
+            fputs($proxy_fp, "GET $url HTTP/1.0\r\nHost: $CFG->proxyhost\r\n\r\n");
+            $i = 0;
+                while(!feof($proxy_fp)) {
+                $string = fgets($proxy_fp, 1024);
+                if ($i > 11) {    //12 lines of info skipped
+                    $availablelangs[] = split(',', $string);
+                }
+                $i++;
+            }
+            fclose($proxy_fp);
+
+        } else {    //proxy not in use
+            if ($fp = fopen($url, 'r')){    /// attempt to get the list from Moodle.org.
+                while(!feof ($fp)) {
+                    $availablelangs[] = split(',', fgets($fp,1024));
+                }
+            } else {    /// fopen failed, return false.
+                return false;
+            }
+        }
+        return $availablelangs;
+    }
+?>

admin/lib.php

@@ -1,50 +0,0 @@
-<?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/>.
-
-/**
- * This file contains functions used by the admin pages
- *
- * @since 2.1
- * @package admin
- * @copyright 2011 Andrew Davis
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-/**
- * Return a list of page types
- * @param string $pagetype current page type
- * @param stdClass $parentcontext Block's parent context
- * @param stdClass $currentcontext Current context of block
- */
-function admin_page_type_list($pagetype, $parentcontext, $currentcontext) {
-    $array = array(
-        'admin-*' => get_string('page-admin-x', 'pagetype'),
-        $pagetype => get_string('page-admin-current', 'pagetype')
-    );
-    // Add the missing * (any page) option for them. MDL-30340
-    // TODO: These pages are really 'pagetype-varying' - MDL-30564 -
-    // and some day we should stop behaving that way, so proper pagetypes
-    // can be specified for it (like course-category-* or so).
-    // Luckly... the option we are introducing '*' is independent
-    // of that varying behavior, so will work.
-    if ($pagetype == 'admin-course-category') {
-        $array += array(
-            '*' => get_string('page-x', 'pagetype')
-        );
-    }
-    return $array;
-}

admin/licenses.php

@@ -1,57 +0,0 @@
-<?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/>.
-
-/**
- * Allows admin to configure licenses.
- */
-
-require_once('../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->libdir.'/licenselib.php');
-
-require_login();
-require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
-
-$returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=managelicenses";
-
-$action = optional_param('action', '', PARAM_ACTION);
-$license = optional_param('license', '', PARAM_SAFEDIR);
-
-////////////////////////////////////////////////////////////////////////////////
-// process actions
-
-if (!confirm_sesskey()) {
-    redirect($returnurl);
-}
-
-$return = true;
-switch ($action) {
-    case 'disable':
-        license_manager::disable($license);
-        break;
-
-    case 'enable':
-        license_manager::enable($license);
-        break;
-
-    default:
-        break;
-}
-
-if ($return) {
-    redirect ($returnurl);
-}

admin/localplugins.php

@@ -1,110 +0,0 @@
-<?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/>.
-
-/**
- * Provides an overview of installed local plugins
- *
- * Displays the list of found local plugins, their version (if found) and
- * a link to delete the local plugin.
- *
- * @see       http://docs.moodle.org/dev/Local_customisation
- * @package   admin
- * @copyright 2010 David Mudrak <david.mudrak@gmail.com>
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once(dirname(dirname(__FILE__)) . '/config.php');
-require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->libdir.'/tablelib.php');
-
-admin_externalpage_setup('managelocalplugins');
-
-$delete  = optional_param('delete', '', PARAM_PLUGIN);
-$confirm = optional_param('confirm', '', PARAM_BOOL);
-
-/// If data submitted, then process and store.
-
-if (!empty($delete) and confirm_sesskey()) {
-    echo $OUTPUT->header();
-    echo $OUTPUT->heading(get_string('localplugins'));
-
-    if (!$confirm) {
-        if (get_string_manager()->string_exists('pluginname', 'local_' . $delete)) {
-            $strpluginname = get_string('pluginname', 'local_' . $delete);
-        } else {
-            $strpluginname = $delete;
-        }
-        echo $OUTPUT->confirm(get_string('localplugindeleteconfirm', '', $strpluginname),
-                                new moodle_url($PAGE->url, array('delete' => $delete, 'confirm' => 1)),
-                                $PAGE->url);
-        echo $OUTPUT->footer();
-        die();
-
-    } else {
-        uninstall_plugin('local', $delete);
-        $a = new stdclass();
-        $a->name = $delete;
-        $pluginlocation = get_plugin_types();
-        $a->directory = $pluginlocation['local'] . '/' . $delete;
-        echo $OUTPUT->notification(get_string('plugindeletefiles', '', $a), 'notifysuccess');
-        echo $OUTPUT->continue_button($PAGE->url);
-        echo $OUTPUT->footer();
-        die();
-    }
-}
-
-echo $OUTPUT->header();
-echo $OUTPUT->heading(get_string('localplugins'));
-
-/// Print the table of all installed local plugins
-
-$table = new flexible_table('localplugins_administration_table');
-$table->define_columns(array('name', 'version', 'delete'));
-$table->define_headers(array(get_string('plugin'), get_string('version'), get_string('delete')));
-$table->define_baseurl($PAGE->url);
-$table->set_attribute('id', 'localplugins');
-$table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
-$table->setup();
-
-$plugins = array();
-foreach (get_plugin_list('local') as $plugin => $plugindir) {
-    if (get_string_manager()->string_exists('pluginname', 'local_' . $plugin)) {
-        $strpluginname = get_string('pluginname', 'local_' . $plugin);
-    } else {
-        $strpluginname = $plugin;
-    }
-    $plugins[$plugin] = $strpluginname;
-}
-collatorlib::asort($plugins);
-
-foreach ($plugins as $plugin => $name) {
-    $delete = new moodle_url($PAGE->url, array('delete' => $plugin, 'sesskey' => sesskey()));
-    $delete = html_writer::link($delete, get_string('delete'));
-
-    $version = get_config('local_' . $plugin);
-    if (!empty($version->version)) {
-        $version = $version->version;
-    } else {
-        $version = '?';
-    }
-
-    $table->add_data(array($name, $version, $delete));
-}
-
-$table->print_html();
-
-echo $OUTPUT->footer();

admin/mailout-debugger.php

@@ -1,77 +0,0 @@
-#!/usr/bin/php
-<?php
-  /*
-   * Utility to debug mailouts - will save the content of emails to a
-   * logfile instead of sending them out. Use it as a sendmail
-   * "stand-in" when testing mailouts.
-   *
-   * It is not Moodle specific - use it anywhere by setting the php
-   * "sendmail_path" setting to this file with a logfile parameter.
-   *
-   * - Set in php.ini (not settable in config.php):
-   *     sendmail_path=/path-to-moodle/admin/mailout-debugger.php');
-   *   Or from the commandline
-   *     php -d sendmail_path='/path-to-moodle/admin/mailout-debugger.php' /path/to/cron.php
-   *
-   * - Create a file in admin called mailout-debugger.enable
-   *   (this is a security check to prevent execution in prod environments)
-   *   touch /path/to/moodle/admin/mailout-debugger.enable
-   *
-   * - Mark as executable: chmod ugo+rx mailout-debugger.php
-   *
-   * - Run your admin/cron.php
-   *
-   * - Read /tmp/moodle-mailout.log
-   *
-   *
-   * This script will create logfiles in /tmp/ or in $TMPDIR if set.
-   * On windows, use php -r 'print sys_get_temp_dir()' to see where the file is saved.
-   */
-
-// Security check.
-if (!file_exists(dirname(__FILE__).'/mailout-debugger.enable')) {
-    mdie("Disabled.");
-}
-$tmpdir=sys_get_temp_dir(); // default
-
-if (isset($_SERVER['REMOTE_ADDR'])) {
-    mdie("should not be called from web server!");
-}
-
-if (isset($_ENV['TMPDIR']) && is_dir($_ENV['TMPDIR'])) {
-    $tmpdir = $_ENV['TMPDIR'];
-}
-
-$tmpfile = $tmpdir . '/moodle-mailout.log';
-$fh = fopen($tmpfile, 'a+', false)
-    or mdie("Error openning $tmpfile on append\n");
-fwrite($fh, "==== ".strftime("%a %b %e %H:%M:%S %Y", time())." ====\n");
-fwrite($fh, "==== Commandline: " . implode(' ',$argv) . "\n");
-
-$stdin = fopen('php://stdin', 'r');
-
-while ($line = fgets($stdin)) {
-    fwrite($fh, $line);
-}
-fwrite($fh, "\n");
-fclose($fh);
-fclose($stdin);
-
-/**
- * Print an error to STDOUT and exit with a non-zero code. For commandline scripts.
- * Default errorcode is 1.
- *
- * Very useful for perl-like error-handling:
- *
- * do_something() or mdie("Something went wrong");
- *
- * @param string  $msg       Error message
- * @param integer $errorcode Error code to emit
- *
- */
-function mdie($msg='', $errorcode=1) {
-    trigger_error($msg);
-    exit($errorcode);
-}
-
-

admin/maintenance.php

@@ -0,0 +1,68 @@
+<?php // $Id$
+      // Enables/disables maintenance mode
+
+    require('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+
+    $action = optional_param('action', '', PARAM_ALPHA);
+
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('maintenancemode', $adminroot);
+
+    //Check folder exists
+    if (! make_upload_directory(SITEID)) {   // Site folder
+            error("Could not create site folder.  The site administrator needs to fix the file permissions");
+        }
+
+    $filename = $CFG->dataroot.'/'.SITEID.'/maintenance.html';
+
+    if ($form = data_submitted()) {
+        if (confirm_sesskey()) {
+            if ($form->action == "disable") {
+                unlink($filename);
+                redirect('maintenance.php', get_string('sitemaintenanceoff','admin'));
+            } else {
+                $file = fopen($filename, 'w');
+                fwrite($file, stripslashes($form->text));
+                fclose($file);
+                redirect('maintenance.php', get_string('sitemaintenanceon', 'admin'));
+            }
+        }
+    }
+
+/// Print the header stuff
+
+    admin_externalpage_print_header($adminroot);
+
+/// Print the appropriate form
+
+    if (file_exists($filename)) {   // We are in maintenance mode
+        echo '<center>';
+        echo '<form action="maintenance.php" method="post">';
+        echo '<input type="hidden" name="action" value="disable">';
+        echo '<input type="hidden" name="sesskey" value="'.sesskey().'">';
+        echo '<p><input type="submit" value="'.get_string('disable').'"></p>';
+        echo '</form>';
+        echo '</center>';
+    } else {                        // We are not in maintenance mode
+        $usehtmleditor = can_use_html_editor();
+
+        echo '<center>';
+        echo '<form action="maintenance.php" method="post">';
+        echo '<input type="hidden" name="action" value="enable">';
+        echo '<input type="hidden" name="sesskey" value="'.sesskey().'">';
+        echo '<p><input type="submit" value="'.get_string('enable').'"></p>';
+        echo '<p>'.get_string('optionalmaintenancemessage', 'admin').':</p>';
+        echo '<table><tr><td>';
+        print_textarea($usehtmleditor, 20, 50, 600, 400, "text");
+        echo '</td></tr></table>';
+        echo '</form>';
+        echo '</center>';
+
+        if ($usehtmleditor) { 
+            use_html_editor();
+        }
+    }
+
+    admin_externalpage_print_footer($adminroot);
+?>

admin/message.php

@@ -1,98 +0,0 @@
-<?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/>.
-
-/**
- * Message outputs configuration page
- *
- * @package    message
- * @copyright  2011 Lancaster University Network Services Limited
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-require_once(dirname(__FILE__) . '/../config.php');
-require_once($CFG->dirroot . '/message/lib.php');
-require_once($CFG->libdir.'/adminlib.php');
-
-// This is an admin page
-admin_externalpage_setup('managemessageoutputs');
-
-// Require site configuration capability
-require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
-
-// Get the submitted params
-$disable    = optional_param('disable', 0, PARAM_INT);
-$enable     = optional_param('enable', 0, PARAM_INT);
-$uninstall  = optional_param('uninstall', 0, PARAM_INT);
-$confirm  = optional_param('confirm', false, PARAM_BOOL);
-
-$headingtitle = get_string('managemessageoutputs', 'message');
-
-if (!empty($disable) && confirm_sesskey()) {
-    if (!$processor = $DB->get_record('message_processors', array('id'=>$disable))) {
-        print_error('outputdoesnotexist', 'message');
-    }
-    $DB->set_field('message_processors', 'enabled', '0', array('id'=>$processor->id));      // Disable output
-}
-
-if (!empty($enable) && confirm_sesskey()) {
-    if (!$processor = $DB->get_record('message_processors', array('id'=>$enable))) {
-        print_error('outputdoesnotexist', 'message');
-    }
-    $DB->set_field('message_processors', 'enabled', '1', array('id'=>$processor->id));      // Enable output
-}
-
-if (!empty($uninstall) && confirm_sesskey()) {
-    echo $OUTPUT->header();
-    echo $OUTPUT->heading($headingtitle);
-
-    if (!$processor = $DB->get_record('message_processors', array('id'=>$uninstall))) {
-        print_error('outputdoesnotexist', 'message');
-    }
-
-    $processorname = get_string('pluginname', 'message_'.$processor->name);
-
-    if (!$confirm) {
-        echo $OUTPUT->confirm(get_string('processordeleteconfirm', 'message', $processorname), 'message.php?uninstall='.$processor->id.'&confirm=1', 'message.php');
-        echo $OUTPUT->footer();
-        exit;
-
-    } else {
-        message_processor_uninstall($processor->name);
-        $a = new stdClass();
-        $a->processor = $processorname;
-        $a->directory = $CFG->dirroot.'/message/output/'.$processor->name;
-        notice(get_string('processordeletefiles', 'message', $a), 'message.php');
-    }
-}
-
-if ($disable || $enable || $uninstall) {
-    $url = new moodle_url('message.php');
-    redirect($url);
-}
-// Page settings
-$PAGE->set_context(get_context_instance(CONTEXT_SYSTEM));
-
-// Grab the renderer
-$renderer = $PAGE->get_renderer('core', 'message');
-
-// Display the manage message outputs interface
-$processors = get_message_processors();
-$messageoutputs = $renderer->manage_messageoutputs($processors);
-
-// Display the page
-echo $OUTPUT->header();
-echo $OUTPUT->heading($headingtitle);
-echo $messageoutputs;
-echo $OUTPUT->footer();

admin/mnet/access_control.php

@@ -1,235 +0,0 @@
-<?php
-
-// Allows the admin to control user logins from remote moodles.
-
-require_once dirname(dirname(dirname(__FILE__))) . '/config.php';
-require_once($CFG->libdir.'/adminlib.php');
-include_once($CFG->dirroot.'/mnet/lib.php');
-
-$sort         = optional_param('sort', 'username', PARAM_ALPHA);
-$dir          = optional_param('dir', 'ASC', PARAM_ALPHA);
-$page         = optional_param('page', 0, PARAM_INT);
-$perpage      = optional_param('perpage', 30, PARAM_INT);
-$action       = trim(strtolower(optional_param('action', '', PARAM_ALPHA)));
-
-require_login();
-
-admin_externalpage_setup('ssoaccesscontrol');
-
-echo $OUTPUT->header();
-
-if (!extension_loaded('openssl')) {
-    print_error('requiresopenssl', 'mnet');
-}
-
-$sitecontext = get_context_instance(CONTEXT_SYSTEM);
-$sesskey = sesskey();
-$formerror = array();
-
-// grab the mnet hosts and remove the localhost
-$mnethosts = $DB->get_records_menu('mnet_host', array(), 'name', 'id, name');
-if (array_key_exists($CFG->mnet_localhost_id, $mnethosts)) {
-    unset($mnethosts[$CFG->mnet_localhost_id]);
-}
-
-
-
-// process actions
-if (!empty($action) and confirm_sesskey()) {
-
-    // boot if insufficient permission
-    if (!has_capability('moodle/user:delete', $sitecontext)) {
-        print_error('nomodifyacl','mnet');
-    }
-
-    // fetch the record in question
-    $id = required_param('id', PARAM_INT);
-    if (!$idrec = $DB->get_record('mnet_sso_access_control', array('id'=>$id))) {
-        print_error('recordnoexists','mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
-    }
-
-    switch ($action) {
-
-        case "delete":
-            $DB->delete_records('mnet_sso_access_control', array('id'=>$id));
-            redirect('access_control.php', get_string('deleteuserrecord', 'mnet', array('user'=>$idrec->username, 'host'=>$mnethosts[$idrec->mnet_host_id])));
-            break;
-
-        case "acl":
-
-            // require the access parameter, and it must be 'allow' or 'deny'
-            $accessctrl = trim(strtolower(required_param('accessctrl', PARAM_ALPHA)));
-            if ($accessctrl != 'allow' and $accessctrl != 'deny') {
-                print_error('invalidaccessparam', 'mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
-            }
-
-            if (mnet_update_sso_access_control($idrec->username, $idrec->mnet_host_id, $accessctrl)) {
-                if ($accessctrl == 'allow') {
-                    redirect('access_control.php', get_string('ssl_acl_allow','mnet', array('uset'=>$idrec->username, 'host'=>$mnethosts[$idrec->mnet_host_id])));
-                } elseif ($accessctrl == 'deny') {
-                    redirect('access_control.php', get_string('ssl_acl_deny','mnet', array('user'=>$idrec->username, 'host'=>$mnethosts[$idrec->mnet_host_id])));
-                }
-            }
-            break;
-
-        default:
-            print_error('invalidactionparam', 'mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
-    }
-}
-
-
-
-// process the form results
-if ($form = data_submitted() and confirm_sesskey()) {
-
-    // check permissions and verify form input
-    if (!has_capability('moodle/user:delete', $sitecontext)) {
-        print_error('nomodifyacl','mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
-    }
-    if (empty($form->username)) {
-        $formerror['username'] = get_string('enterausername','mnet');
-    }
-    if (empty($form->mnet_host_id)) {
-        $formerror['mnet_host_id'] = get_string('selectahost','mnet');
-    }
-    if (empty($form->accessctrl)) {
-        $formerror['accessctrl'] = get_string('selectaccesslevel','mnet'); ;
-    }
-
-    // process if there are no errors
-    if (count($formerror) == 0) {
-
-        // username can be a comma separated list
-        $usernames = explode(',', $form->username);
-
-        foreach ($usernames as $username) {
-            $username = trim(textlib::strtolower($username));
-            if (!empty($username)) {
-                if (mnet_update_sso_access_control($username, $form->mnet_host_id, $form->accessctrl)) {
-                    if ($form->accessctrl == 'allow') {
-                        redirect('access_control.php', get_string('ssl_acl_allow','mnet', array('user'=>$username, 'host'=>$mnethosts[$form->mnet_host_id])));
-                    } elseif ($form->accessctrl == 'deny') {
-                        redirect('access_control.php', get_string('ssl_acl_deny','mnet', array('user'=>$username, 'host'=>$mnethosts[$form->mnet_host_id])));
-                    }
-                }
-            }
-        }
-    }
-    exit;
-}
-
-// Explain
-echo $OUTPUT->box(get_string('ssoacldescr','mnet'));
-// Are the needed bits enabled?
-$warn = '';
-if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict') {
-    $warn = '<p>' . get_string('mnetdisabled','mnet') .'</p>';
-}
-
-if (!is_enabled_auth('mnet')) {
-    $warn .= '<p>' .  get_string('authmnetdisabled','mnet').'</p>';
-}
-
-if (!empty($warn)) {
-    $warn = '<p>' .  get_string('ssoaclneeds','mnet').'</p>' . $warn;
-    echo $OUTPUT->box($warn);
-}
-// output the ACL table
-$columns = array("username", "mnet_host_id", "access", "delete");
-$headings = array();
-$string = array('username'     => get_string('username'),
-                'mnet_host_id' => get_string('remotehost', 'mnet'),
-                'access'       => get_string('accesslevel', 'mnet'),
-                'delete'       => get_string('delete'));
-foreach ($columns as $column) {
-    if ($sort != $column) {
-        $columnicon = "";
-        $columndir = "ASC";
-    } else {
-        $columndir = $dir == "ASC" ? "DESC" : "ASC";
-        $columnicon = $dir == "ASC" ? "down" : "up";
-        $columnicon = " <img src=\"" . $OUTPUT->pix_url('t/' . $columnicon) . "\" alt=\"\" />";
-    }
-    $headings[$column] = "<a href=\"?sort=$column&amp;dir=$columndir&amp;\">".$string[$column]."</a>$columnicon";
-}
-$headings['delete'] = '';
-$acl = $DB->get_records('mnet_sso_access_control', null, "$sort $dir", '*'); //, $page * $perpage, $perpage);
-$aclcount = $DB->count_records('mnet_sso_access_control');
-
-if (!$acl) {
-    echo $OUTPUT->heading(get_string('noaclentries','mnet'));
-    $table = NULL;
-} else {
-    $table = new html_table();
-    $table->head = $headings;
-    $table->align = array('left', 'left', 'center');
-    $table->width = "95%";
-    foreach ($acl as $aclrecord) {
-        if ($aclrecord->accessctrl == 'allow') {
-            $accesscolumn = get_string('allow', 'mnet')
-                . " (<a href=\"?id={$aclrecord->id}&amp;action=acl&amp;accessctrl=deny&amp;sesskey=".sesskey()."\">"
-                . get_string('deny', 'mnet') . "</a>)";
-        } else {
-            $accesscolumn = get_string('deny', 'mnet')
-                . " (<a href=\"?id={$aclrecord->id}&amp;action=acl&amp;accessctrl=allow&amp;sesskey=".sesskey()."\">"
-                . get_string('allow', 'mnet') . "</a>)";
-        }
-        $deletecolumn = "<a href=\"?id={$aclrecord->id}&amp;action=delete&amp;sesskey=".sesskey()."\">"
-                . get_string('delete') . "</a>";
-        $table->data[] = array (s($aclrecord->username), $aclrecord->mnet_host_id, $accesscolumn, $deletecolumn);
-    }
-}
-
-if (!empty($table)) {
-    echo html_writer::table($table);
-    echo '<p>&nbsp;</p>';
-    $baseurl = new moodle_url('/admin/mnet/access_control.php', array('sort' => $sort, 'dir' => $dir, 'perpage' => $perpage));
-    echo $OUTPUT->paging_bar($aclcount, $page, $perpage, $baseurl);
-}
-
-
-
-// output the add form
-echo $OUTPUT->box_start();
-
-?>
- <div class="mnetaddtoaclform">
-  <form id="mnetaddtoacl" method="post">
-    <input type="hidden" name="sesskey" value="<?php echo $sesskey; ?>" />
-<?php
-
-// enter a username
-echo get_string('username') . ":\n";
-if (!empty($formerror['username'])) {
-    echo '<span class="error"> * </span>';
-}
-echo html_writer::label(get_string('username'), 'menuusername', false, array('class' => 'accesshide'));
-echo '<input id="menuusername" type="text" name="username" size="20" maxlength="100" />';
-
-// choose a remote host
-echo " " . html_writer::label(get_string('remotehost', 'mnet'), 'menumnet_host_id') . ":\n";
-if (!empty($formerror['mnet_host_id'])) {
-    echo '<span class="error"> * </span>';
-}
-echo html_writer::select($mnethosts, 'mnet_host_id');
-
-// choose an access level
-echo " " . html_writer::label(get_string('accesslevel', 'mnet'), 'menuaccessctrl') . ":\n";
-if (!empty($formerror['accessctrl'])) {
-    echo '<span class="error"> * </span>';
-}
-$accessmenu['allow'] = get_string('allow', 'mnet');
-$accessmenu['deny'] = get_string('deny', 'mnet');
-echo html_writer::select($accessmenu, 'accessctrl');
-
-// submit button
-echo '<input type="submit" value="' . get_string('addtoacl', 'mnet') . '" />';
-echo "</form></div>\n";
-
-// print errors
-foreach ($formerror as $error) {
-    echo "<br><span class=\"error\">$error<span>";
-}
-
-echo $OUTPUT->box_end();
-echo $OUTPUT->footer();

admin/mnet/delete.php

@@ -1,65 +0,0 @@
-<?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/>.
-
-
-/**
- * Page to allow the administrator to delete networked hosts, with a confirm message
- *
- * @package    core
- * @subpackage mnet
- * @copyright  2007 Donal McMullan
- * @copyright  2007 Martin Langhoff
- * @copyright  2010 Penny Leach
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
-require_once($CFG->libdir . '/adminlib.php');
-
-$step   = optional_param('step', 'verify', PARAM_ALPHA);
-$hostid = required_param('hostid', PARAM_INT);
-
-
-require_login();
-
-$context = get_context_instance(CONTEXT_SYSTEM);
-require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
-
-$mnet = get_mnet_environment();
-
-$PAGE->set_url('/admin/mnet/delete.php');
-admin_externalpage_setup('mnetpeer' . $hostid);
-
-require_sesskey();
-
-$mnet_peer = new mnet_peer();
-$mnet_peer->set_id($hostid);
-
-if ('verify' == $step) {
-    echo $OUTPUT->header();
-    echo $OUTPUT->heading(get_string('deleteaserver', 'mnet'));
-    if ($live_users = $mnet_peer->count_live_sessions() > 0) {
-        echo $OUTPUT->notification(get_string('usersareonline', 'mnet', $live_users));
-    }
-    $yesurl = new moodle_url('/admin/mnet/delete.php', array('hostid' => $mnet_peer->id, 'step' => 'delete'));
-    $nourl = new moodle_url('/admin/mnet/peers.php');
-    echo $OUTPUT->confirm(get_string('reallydeleteserver', 'mnet')  . ': ' .  $mnet_peer->name, $yesurl, $nourl);
-    echo $OUTPUT->footer();
-} elseif ('delete' == $step) {
-    $mnet_peer->delete();
-    redirect(new moodle_url('/admin/mnet/peers.php'), get_string('hostdeleted', 'mnet'), 5);
-}

admin/mnet/index.php

@@ -1,133 +0,0 @@
-<?PHP
-
-    // Allows the admin to configure mnet stuff
-
-    require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
-    require_once($CFG->libdir.'/adminlib.php');
-    include_once($CFG->dirroot.'/mnet/lib.php');
-
-    require_login();
-    admin_externalpage_setup('net');
-
-    $context = get_context_instance(CONTEXT_SYSTEM);
-
-    require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
-
-    $site = get_site();
-    $mnet = get_mnet_environment();
-
-    if (!extension_loaded('openssl')) {
-        echo $OUTPUT->header();
-        set_config('mnet_dispatcher_mode', 'off');
-        print_error('requiresopenssl', 'mnet');
-    }
-
-    if (!function_exists('curl_init') ) {
-        echo $OUTPUT->header();
-        set_config('mnet_dispatcher_mode', 'off');
-        print_error('nocurl', 'mnet');
-    }
-
-    if (!isset($CFG->mnet_dispatcher_mode)) {
-        set_config('mnet_dispatcher_mode', 'off');
-    }
-
-/// If data submitted, process and store
-    if (($form = data_submitted()) && confirm_sesskey()) {
-        if (!empty($form->submit) && $form->submit == get_string('savechanges')) {
-            if (in_array($form->mode, array("off", "strict", "dangerous"))) {
-                if (set_config('mnet_dispatcher_mode', $form->mode)) {
-                    redirect('index.php', get_string('changessaved'));
-                } else {
-                    print_error('invalidaction', '', 'index.php');
-                }
-            }
-        } elseif (!empty($form->submit) && $form->submit == get_string('delete')) {
-            $mnet->get_private_key();
-            $SESSION->mnet_confirm_delete_key = md5(sha1($mnet->keypair['keypair_PEM'])).':'.time();
-
-            $formcontinue = new single_button(new moodle_url('index.php', array('confirm' => md5($mnet->public_key))), get_string('yes'));
-            $formcancel = new single_button(new moodle_url('index.php', array()), get_string('no'));
-            echo $OUTPUT->confirm(get_string("deletekeycheck", "mnet"), $formcontinue, $formcancel);
-            exit;
-        } else {
-            // We're deleting
-
-
-            if (!isset($SESSION->mnet_confirm_delete_key)) {
-                // fail - you're being attacked?
-            }
-
-            $key = '';
-            $time = '';
-            @list($key, $time) = explode(':',$SESSION->mnet_confirm_delete_key);
-            $mnet->get_private_key();
-
-            if($time < time() - 60) {
-                // fail - you're out of time.
-                print_error ('deleteoutoftime', 'mnet', 'index.php');
-                exit;
-            }
-
-            if ($key != md5(sha1($mnet->keypair['keypair_PEM']))) {
-                // fail - you're being attacked?
-                print_error ('deletewrongkeyvalue', 'mnet', 'index.php');
-                exit;
-            }
-
-            $mnet->replace_keys();
-            redirect('index.php', get_string('keydeleted','mnet'));
-            exit;
-        }
-    }
-    $hosts = $DB->get_records_select('mnet_host', "id <> ? AND deleted = 0", array($CFG->mnet_localhost_id), 'wwwroot ASC');
-
-    echo $OUTPUT->header();
-?>
-<form method="post" action="index.php">
-    <table align="center" width="635" class="generalbox" border="0" cellpadding="5" cellspacing="0">
-        <tr>
-            <td  class="generalboxcontent">
-            <table cellpadding="9" cellspacing="0" >
-                <tr valign="top">
-                    <td colspan="2" class="header"><?php print_string('aboutyourhost', 'mnet'); ?></td>
-                </tr>
-                <tr valign="top">
-                    <td align="right"><?php print_string('publickey', 'mnet'); ?>:</td>
-                    <td><pre><?php echo $mnet->public_key; ?></pre></td>
-                </tr>
-                <tr valign="top">
-                    <td align="right"><?php print_string('expires', 'mnet'); ?>:</td>
-                    <td><?php echo userdate($mnet->public_key_expires); ?></td>
-                </tr>
-            </table>
-            </td>
-        </tr>
-    </table>
-</form>
-<form method="post" action="index.php">
-    <table align="center" width="635" class="generalbox" border="0" cellpadding="5" cellspacing="0">
-        <tr>
-            <td  class="generalboxcontent">
-            <table cellpadding="9" cellspacing="0" >
-                <tr valign="top">
-                    <td colspan="2" class="header"><?php print_string('expireyourkey', 'mnet'); ?></td>
-                </tr>
-                <tr valign="top">
-                    <td colspan="2"><?php print_string('expireyourkeyexplain', 'mnet'); ?></td>
-                </tr>
-                <tr valign="top">
-                    <td align="left" width="10" nowrap="nowrap"><?php print_string('expireyourkey', 'mnet'); ?></td>
-                    <td align="left"><input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />
-                        <input type="hidden" name="deleteKey" value="" />
-                        <input type="submit" name="submit" value="<?php print_string('delete'); ?>" />
-                    </td>
-                </tr>
-            </table>
-            </td>
-        </tr>
-    </table>
-</form>
-
-<?php
-echo $OUTPUT->footer();

admin/mnet/peer_forms.php

@@ -1,176 +0,0 @@
-<?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/>.
-
-/**
- * This file contains two forms for adding/editing mnet hosts, used by peers.php
- *
- * @package    core
- * @subpackage mnet
- * @copyright  2010 Penny Leach
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-require_once($CFG->libdir . '/formslib.php');
-
-/**
- * The very basic first step add new host form - just wwwroot & application
- * The second form is loaded up with the information from this one.
- */
-class mnet_simple_host_form extends moodleform {
-    function definition() {
-        global $DB;
-
-        $mform = $this->_form;
-
-        $mform->addElement('text', 'wwwroot', get_string('hostname', 'mnet'), array('maxlength' => 255, 'size' => 50));
-        $mform->setType('wwwroot', PARAM_URL);
-        $mform->addRule('wwwroot', null, 'required', null, 'client');
-        $mform->addRule('wwwroot', get_string('maximumchars', '', 255), 'maxlength', 255, 'client');
-
-        $mform->addElement('select', 'applicationid', get_string('applicationtype', 'mnet'),
-                           $DB->get_records_menu('mnet_application', array(), 'id,display_name'));
-        $mform->addRule('applicationid', null, 'required', null, 'client');
-
-        $this->add_action_buttons(false, get_string('addhost', 'mnet'));
-    }
-
-    function validation($data, $files) {
-        global $DB;
-
-        $wwwroot = $data['wwwroot'];
-        // ensure the wwwroot starts with a http or https prefix
-        if (strtolower(substr($wwwroot, 0, 4)) != 'http') {
-            $wwwroot = 'http://'.$wwwroot;
-        }
-        if ($host = $DB->get_record('mnet_host', array('wwwroot' => $wwwroot))) {
-            global $CFG;
-            return array('wwwroot' => get_string('hostexists', 'mnet', $CFG->wwwroot . '/admin/mnet/peers.php?hostid=' . $host->id));
-        }
-        return array();
-    }
-}
-
-/**
- * The second step of the form - reviewing the host details
- * This is also the same form that is used for editing an existing host
- */
-class mnet_review_host_form extends moodleform {
-    function definition() {
-        global $OUTPUT;
-
-        $mform = $this->_form;
-        $mnet_peer = $this->_customdata['peer'];
-
-        $mform->addElement('hidden', 'last_connect_time');
-        $mform->addElement('hidden', 'id');
-        $mform->addElement('hidden', 'applicationid');
-        $mform->addElement('hidden', 'oldpublickey');
-
-        $mform->addElement('text', 'name', get_string('site'), array('maxlength' => 80, 'size' => 50));
-        $mform->setType('name', PARAM_NOTAGS);
-        $mform->addRule('name', get_string('maximumchars', '', 80), 'maxlength', 80, 'client');
-
-        $mform->addElement('text', 'wwwroot', get_string('hostname', 'mnet'), array('maxlength' => 255, 'size' => 50));
-        $mform->setType('wwwroot', PARAM_URL);
-        $mform->addRule('wwwroot', get_string('maximumchars', '', 255), 'maxlength', 255, 'client');
-
-        $themes = array('' => get_string('forceno'));
-        foreach (array_keys(get_plugin_list('theme')) as $themename) {
-            $themes[$themename] = get_string('pluginname', 'theme_'.$themename);
-        }
-        $mform->addElement('select', 'theme', get_string('forcetheme'), $themes);
-
-        $mform->addElement('textarea', 'public_key', get_string('publickey', 'mnet'), array('rows' => 17, 'cols' => 100, 'class' => 'smalltext'));
-        $mform->setType('public_key', PARAM_PEM);
-        $mform->addRule('public_key', get_string('required'), 'required');
-
-        // finished with form controls, now the static informational stuff
-        if ($mnet_peer && !empty($mnet_peer->bootstrapped)) {
-            $expires = '';
-            if ($mnet_peer->public_key_expires < time()) {
-                $expires = get_string('expired', 'mnet')  . ' ';
-            }
-            $expires .= userdate($mnet_peer->public_key_expires);
-            $mform->addElement('static', 'validuntil', get_string('expires', 'mnet'), $expires);
-
-            $lastconnect = '';
-            if ($mnet_peer->last_connect_time == 0) {
-                $lastconnect = get_string('never', 'mnet');
-            } else {
-                $lastconnect = date('H:i:s d/m/Y',$mnet_peer->last_connect_time);
-            }
-
-            $mform->addElement('static', 'lastconnect', get_string('last_connect_time', 'mnet'), $lastconnect);
-            $mform->addElement('static', 'ipaddress', get_string('ipaddress', 'mnet'), $mnet_peer->ip_address);
-
-            if (isset($mnet_peer->currentkey)) { // key being published is not the same as our records
-                $currentkeystr = '<b>' . get_string('keymismatch', 'mnet') . '</b><br /><br /> ' . $OUTPUT->box('<pre>' . $mnet_peer->currentkey . '</pre>');
-                $mform->addElement('static', 'keymismatch', get_string('currentkey', 'mnet'), $currentkeystr);
-            }
-
-            $credstr = '';
-            if ($credentials = $mnet_peer->check_credentials($mnet_peer->public_key)) {
-                foreach($credentials['subject'] as $key => $credential) {
-                    if (is_scalar($credential)) {
-                        $credstr .= str_pad($key, 16, " ", STR_PAD_LEFT).': '.$credential."\n";
-                    } else {
-                        $credstr .= str_pad($key, 16, " ", STR_PAD_LEFT).': '.var_export($credential,1)."\n";
-                    }
-                }
-            }
-
-            $mform->addElement('static', 'certdetails', get_string('certdetails', 'mnet'),
-                $OUTPUT->box('<pre>' . $credstr . '</pre>', 'generalbox certdetails'));
-        }
-
-        if ($mnet_peer && !empty($mnet_peer->deleted)) {
-            $radioarray = array();
-            $radioarray[] = $mform->createElement('static', 'deletedinfo', '',
-                $OUTPUT->container(get_string('deletedhostinfo', 'mnet'), 'deletedhostinfo'));
-            $radioarray[] = $mform->createElement('radio', 'deleted', '', get_string('yes'), 1);
-            $radioarray[] = $mform->createElement('radio', 'deleted', '', get_string('no'), 0);
-            $mform->addGroup($radioarray, 'radioar', get_string('deleted'), array(' ', ' '), false);
-        } else {
-            $mform->addElement('hidden', 'deleted');
-        }
-
-        // finished with static stuff, print save button
-        $this->add_action_buttons(false);
-    }
-
-    function validation($data, $files) {
-        $errors = array();
-        if ($data['oldpublickey'] == $data['public_key']) {
-            return;
-        }
-        $mnet_peer = new mnet_peer(); // idiotic api
-        $mnet_peer->wwwroot = $data['wwwroot']; // just hard-set this rather than bootstrap the object
-        if (empty($data['public_key'])) {
-            $errors['public_key'] = get_string('publickeyrequired', 'mnet');
-        } else if (!$credentials = $mnet_peer->check_credentials($data['public_key'])) {
-            $errmsg = '';
-            foreach ($mnet_peer->error as $err) {
-                $errmsg .= $err['code'] . ': ' . $err['text'].'<br />';
-            }
-            $errors['public_key'] = get_string('invalidpubkey', 'mnet', $errmsg);
-        }
-        unset($mnet_peer);
-        return $errors;
-    }
-}

admin/mnet/peers.php

@@ -1,280 +0,0 @@
-<?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/>.
-
-
-/**
- * Page to allow the administrator to configure networked hosts, and add new ones
- *
- * @package    core
- * @subpackage mnet
- * @copyright  2007 Donal McMullan
- * @copyright  2007 Martin Langhoff
- * @copyright  2010 Penny Leach
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
-require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->dirroot.'/mnet/lib.php');
-require_once($CFG->dirroot.'/'.$CFG->admin.'/mnet/peer_forms.php');
-
-require_login();
-
-$context = get_context_instance(CONTEXT_SYSTEM);
-require_capability('moodle/site:config', $context, $USER->id, true, 'nopermissions');
-
-/// Initialize variables.
-$hostid = optional_param('hostid', 0, PARAM_INT);
-$updra = optional_param('updateregisterall', 0, PARAM_INT);
-
-// first process the register all hosts setting if required
-if (!empty($updra)) {
-    set_config('mnet_register_allhosts', optional_param('registerallhosts', 0, PARAM_INT));
-    redirect(new moodle_url('/admin/mnet/peers.php'), get_string('changessaved'));
-}
-
-$adminsection = 'mnetpeers';
-if ($hostid && $DB->get_field('mnet_host', 'deleted', array('id' => $hostid)) != 1) {
-    $adminsection = 'mnetpeer' . $hostid;
-}
-
-$PAGE->set_url('/admin/mnet/peers.php');
-admin_externalpage_setup($adminsection);
-
-if (!extension_loaded('openssl')) {
-    print_error('requiresopenssl', 'mnet');
-}
-
-if (!function_exists('curl_init') ) {
-    print_error('nocurl', 'mnet');
-}
-
-if (!function_exists('xmlrpc_encode_request')) {
-    print_error('xmlrpc-missing', 'mnet');
-}
-
-if (!isset($CFG->mnet_dispatcher_mode)) {
-    set_config('mnet_dispatcher_mode', 'off');
-}
-
-$mnet_peer = new mnet_peer();
-$simpleform = new mnet_simple_host_form(); // the one that goes on the bottom of the main page
-$reviewform = null; // set up later in different code branches, so mnet_peer can be passed to the constructor
-
-// if the first form has been submitted, bootstrap the peer and load up the review form
-if ($formdata = $simpleform->get_data()) {
-    // ensure we remove trailing slashes
-    $formdata->wwwroot = trim($formdata->wwwroot);
-    $formdata->wwwroot = rtrim($formdata->wwwroot, '/');
-
-    // ensure the wwwroot starts with a http or https prefix
-    if (strtolower(substr($formdata->wwwroot, 0, 4)) != 'http') {
-        $formdata->wwwroot = 'http://'.$formdata->wwwroot;
-    }
-
-    $mnet_peer->set_applicationid($formdata->applicationid);
-    $application = $DB->get_field('mnet_application', 'name', array('id'=>$formdata->applicationid));
-    $mnet_peer->bootstrap($formdata->wwwroot, null, $application);
-    // bootstrap the second form straight with the data from the first form
-    $reviewform = new mnet_review_host_form(null, array('peer' => $mnet_peer)); // the second step (also the edit host form)
-    $formdata->oldpublickey = $mnet_peer->public_key; // set this so we can confirm on form post without having to recreate the mnet_peer object
-    $reviewform->set_data($mnet_peer);
-    echo $OUTPUT->header();
-    echo $OUTPUT->box_start();
-    $reviewform->display();
-    echo $OUTPUT->box_end();
-    echo $OUTPUT->footer();
-    exit;
-} else if ($simpleform->is_submitted()) { // validation failed
-    $noreviewform = true;
-}
-
-// editing a host - load up the review form
-if (!empty($hostid)) {
-    // TODO print a nice little heading
-    $mnet_peer->set_id($hostid);
-    echo $OUTPUT->header();
-    $currenttab = 'mnetdetails';
-    require_once($CFG->dirroot . '/admin/mnet/tabs.php');
-
-    if ($hostid != $CFG->mnet_all_hosts_id) {
-        $mnet_peer->currentkey = mnet_get_public_key($mnet_peer->wwwroot, $mnet_peer->application);
-        if ($mnet_peer->currentkey == $mnet_peer->public_key) {
-            unset($mnet_peer->currentkey);
-        } else {
-            error_log($mnet_peer->currentkey);
-            error_log($mnet_peer->public_key);
-            error_log(md5($mnet_peer->currentkey));
-            error_log(md5($mnet_peer->public_key));
-        }
-        $credentials = $mnet_peer->check_credentials($mnet_peer->public_key);
-        $reviewform = new mnet_review_host_form(null, array('peer' => $mnet_peer)); // the second step (also the edit host form)
-        $mnet_peer->oldpublickey = $mnet_peer->public_key; // set this so we can confirm on form post without having to recreate the mnet_peer object
-        $reviewform->set_data((object)$mnet_peer);
-        echo $OUTPUT->box_start();
-        $reviewform->display();
-        echo $OUTPUT->box_end();
-    } else {
-        // no options for allhosts host - just let the tabs display and print a notification
-        echo $OUTPUT->notification(get_string('allhosts_no_options', 'mnet'));
-    }
-    echo $OUTPUT->footer();
-    exit;
-}
-
-// either we're in the second step of setting up a new host
-// or editing an existing host
-// try our best to set up the mnet_peer object to pass to the form definition
-// unless validation on simpleform failed, in which case fall through.
-if (empty($noreviewform) && $id = optional_param('id', 0, PARAM_INT)) {
-    // we're editing an existing one, so set up the tabs
-    $currenttab = 'mnetdetails';
-    $mnet_peer->set_id($id);
-    require_once($CFG->dirroot . '/admin/mnet/tabs.php');
-} else if (empty($noreviewform) && ($wwwroot = optional_param('wwwroot', '', PARAM_URL)) && ($applicationid = optional_param('applicationid', 0, PARAM_INT))) {
-    $application = $DB->get_field('mnet_application', 'name', array('id'=>$applicationid));
-    $mnet_peer->bootstrap($wwwroot, null, $application);
-}
-$reviewform = new mnet_review_host_form(null, array('peer' => $mnet_peer));
-if ($formdata = $reviewform->get_data()) {
-
-    $mnet_peer->set_applicationid($formdata->applicationid);
-    $application = $DB->get_field('mnet_application', 'name', array('id'=>$formdata->applicationid));
-    $mnet_peer->bootstrap($formdata->wwwroot, null, $application);
-
-    if (!empty($formdata->name) && $formdata->name != $mnet_peer->name) {
-        $mnet_peer->set_name($formdata->name);
-    }
-
-    if (empty($formdata->theme)) {
-        $mnet_peer->force_theme = 0;
-        $mnet_peer->theme = null;
-    } else {
-        $mnet_peer->force_theme = 1;
-        $mnet_peer->theme = $formdata->theme;
-    }
-
-    $mnet_peer->deleted             = $formdata->deleted;
-    $mnet_peer->public_key          = $formdata->public_key;
-    $credentials                    = $mnet_peer->check_credentials($mnet_peer->public_key);
-    $mnet_peer->public_key_expires  = $credentials['validTo_time_t'];
-
-    if ($mnet_peer->commit()) {
-        redirect(new moodle_url('/admin/mnet/peers.php', array('hostid' => $mnet_peer->id)), get_string('changessaved'));
-    } else {
-        print_error('invalidaction', 'error', 'index.php');
-    }
-} else if ($reviewform->is_submitted()) { // submitted, but errors
-    echo $OUTPUT->header();
-    echo $OUTPUT->box_start();
-    $reviewform->display();
-    echo $OUTPUT->box_end();
-    echo $OUTPUT->footer();
-    exit;
-}
-
-
-// normal flow - just display all hosts with links
-echo $OUTPUT->header();
-$hosts = mnet_get_hosts(true);
-
-// print the table to display the register all hosts setting
-$table = new html_table();
-$table->head = array(get_string('registerallhosts', 'mnet'));
-
-$registerrow = '';
-$registerstr = '';
-$registerurl = new moodle_url('/admin/mnet/peers.php', array('updateregisterall' => 1));
-if (!empty($CFG->mnet_register_allhosts)) {
-    $registerrow = get_string('registerhostson', 'mnet');
-    $registerurl->param('registerallhosts', 0);
-    $registerstr = get_string('turnitoff', 'mnet');
-} else {
-    $registerrow = get_string('registerhostsoff', 'mnet');
-    $registerurl->param('registerallhosts', 1);
-    $registerstr = get_string('turniton', 'mnet');
-}
-$registerrow .= $OUTPUT->single_button($registerurl, $registerstr);
-
-// simple table with two rows of a single cell
-$table->data = array(
-    array(
-        get_string('registerallhostsexplain', 'mnet'),
-    ),
-    array(
-        $registerrow
-    ),
-);
-echo html_writer::table($table);
-
-// print the list of all hosts, with little action links and buttons
-$table = new html_table();
-$table->head = array(
-    get_string('site'),
-    get_string('system', 'mnet'),
-    get_string('last_connect_time', 'mnet'),
-    '',
-);
-$table->wrap = array('nowrap', 'nowrap', 'nowrap', 'nowrap');
-$baseurl = new moodle_url('/admin/mnet/peers.php');
-$deleted = array();
-foreach($hosts as $host) {
-    $hosturl = new moodle_url($baseurl, array('hostid' => $host->id));
-    if (trim($host->name) === '') {
-        // should not happen but...
-        $host->name = '???';
-    }
-    // process all hosts first since it's the easiest
-    if ($host->id == $CFG->mnet_all_hosts_id) {
-        $table->data[] = array(html_writer::link($hosturl, get_string('allhosts', 'core_mnet')), '*', '', '');
-        continue;
-    }
-
-    // populate the list of deleted hosts
-    if ($host->deleted) {
-        $deleted[] = html_writer::link($hosturl, $host->name);
-        continue;
-    }
-
-    if ($host->last_connect_time == 0) {
-        $last_connect = get_string('never');
-    } else {
-        $last_connect = userdate($host->last_connect_time, get_string('strftimedatetime', 'core_langconfig'));
-    }
-    $table->data[] = array(
-        html_writer::link($hosturl, $host->name),
-        html_writer::link($host->wwwroot, $host->wwwroot),
-        $last_connect,
-        $OUTPUT->single_button(new moodle_url('/admin/mnet/delete.php', array('hostid' => $host->id)), get_string('delete'))
-    );
-}
-echo html_writer::table($table);
-
-if ($deleted) {
-    echo $OUTPUT->box(get_string('deletedhosts', 'core_mnet', join(', ', $deleted)), 'deletedhosts');
-}
-
-// finally, print the initial form to add a new host
-echo $OUTPUT->box_start();
-echo $OUTPUT->heading(get_string('addnewhost', 'mnet'), 3);
-$simpleform->display();
-echo $OUTPUT->box_end();
-
-// done
-echo $OUTPUT->footer();
-exit;
-

admin/mnet/profilefields.php

@@ -1,93 +0,0 @@
-<?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/>.
-
-/**
- * Allows the admin to configure a list of profile fields that are sent/recieved
- *
- * @package    core
- * @subpackage mnet
- * @copyright  2010 onwards Penny Leach <penny@liip.ch>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require(dirname(dirname(dirname(__FILE__))).'/config.php');
-require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->dirroot . '/admin/mnet/profilefields_form.php');
-$mnet = get_mnet_environment();
-
-require_login();
-$hostid = required_param('hostid', PARAM_INT);
-$mnet_peer = new mnet_peer();
-$mnet_peer->set_id($hostid);
-
-$context = get_context_instance(CONTEXT_SYSTEM);
-
-require_capability('moodle/site:config', $context, $USER->id, true, 'nopermissions');
-admin_externalpage_setup('mnetpeers');
-$form = new mnet_profile_form(null, array('hostid' => $hostid));
-
-if ($data = $form->get_data()) {
-    if (!isset($data->importdefault)) {
-        $data->importdefault = 0;
-    }
-    if (!isset($data->exportdefault)) {
-        $data->exportdefault = 0;
-    }
-    if (!isset($data->importfields)) {
-        $data->importfields = array();
-    }
-    if (!isset($data->exportfields)) {
-        $data->exportfields = array();
-    }
-    set_config('host' . $hostid . 'importdefault', $data->importdefault, 'mnet');
-    set_config('host' . $hostid . 'importfields', implode(',', $data->importfields), 'mnet');
-    set_config('host' . $hostid . 'exportdefault', $data->exportdefault, 'mnet');
-    set_config('host' . $hostid . 'exportfields', implode(',', $data->exportfields), 'mnet');
-
-    redirect(new moodle_url('/admin/mnet/peers.php'), get_string('changessaved'));
-} elseif ($form->is_cancelled()) {
-    redirect(new moodle_url('/admin/mnet/peers.php', array('hostid' => $hostid)));
-}
-
-echo $OUTPUT->header();
-
-$currenttab = 'mnetprofilefields';
-require_once('tabs.php');
-
-echo $OUTPUT->heading(get_string('peerprofilefielddesc', 'mnet'), 4);
-
-$data = new Stdclass;
-$data->importdefault = get_config('mnet', 'host' . $hostid . 'importdefault');
-$data->exportdefault = get_config('mnet', 'host' . $hostid . 'exportdefault');
-$data->importfields = get_config('mnet', 'host' . $hostid . 'importfields');
-$data->exportfields = get_config('mnet', 'host' . $hostid . 'exportfields');
-
-if ($data->importfields === false) {
-    $data->importdefault = true;
-} else {
-    $data->importfields = explode(',', $data->importfields);
-}
-if ($data->exportfields === false) {
-    $data->exportdefault = true;
-} else {
-    $data->exportfields = explode(',', $data->exportfields);
-}
-
-$form->set_data($data);
-$form->display();
-
-echo $OUTPUT->footer();

admin/mnet/profilefields_form.php

@@ -1,73 +0,0 @@
-<?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/>.
-
-/**
- * Allows the admin to configure a list of profile fields that are sent/recieved
- *
- * @package    core
- * @subpackage mnet
- * @copyright  2010 onwards Penny Leach <penny@liip.ch>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-if (!defined('MOODLE_INTERNAL')) {
-    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
-}
-
-require_once($CFG->libdir . '/formslib.php');
-
-/**
- * small form to allow the administrator to configure (override) which profile fields are sent/imported over mnet
- */
-class mnet_profile_form extends moodleform {
-
-    function definition() {
-        global $CFG;
-        $mform =& $this->_form;
-
-        $mnetprofileimportfields = '';
-        if (isset($CFG->mnetprofileimportfields)) {
-            $mnetprofileimportfields = str_replace(',', ', ', $CFG->mnetprofileimportfields);
-        }
-
-        $mnetprofileexportfields = '';
-        if (isset($CFG->mnetprofileexportfields)) {
-            $mnetprofileexportfields = str_replace(',', ', ', $CFG->mnetprofileexportfields);
-        }
-
-        $mform->addElement('hidden', 'hostid', $this->_customdata['hostid']);
-        $fields = mnet_profile_field_options();
-
-        // Fields to import ----------------------------------------------------
-        $mform->addElement('header', 'import', get_string('importfields', 'mnet'));
-
-        $select = $mform->addElement('select', 'importfields', get_string('importfields', 'mnet'), $fields['optional']);
-        $select->setMultiple(true);
-
-        $mform->addElement('checkbox', 'importdefault', get_string('leavedefault', 'mnet'), $mnetprofileimportfields);
-
-        // Fields to export ----------------------------------------------------
-        $mform->addElement('header', 'export', get_string('exportfields', 'mnet'));
-
-        $select = $mform->addElement('select', 'exportfields', get_string('exportfields', 'mnet'), $fields['optional']);
-        $select->setMultiple(true);
-
-        $mform->addElement('checkbox', 'exportdefault', get_string('leavedefault', 'mnet'), $mnetprofileexportfields);
-
-        $this->add_action_buttons();
-    }
-}

admin/mnet/services.php

@@ -1,92 +0,0 @@
-<?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/>.
-
-
-/**
- * This page is for configuring which services are published/subscribed on a host
- *
- * @package    core
- * @subpackage mnet
- * @copyright  2010 Penny Leach
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
-require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->dirroot . '/admin/mnet/services_form.php');
-$mnet = get_mnet_environment();
-
-require_login();
-admin_externalpage_setup('mnetpeers');
-
-$context = get_context_instance(CONTEXT_SYSTEM);
-require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
-
-$hostid = required_param('hostid', PARAM_INT);
-
-$mnet_peer = new mnet_peer();
-$mnet_peer->set_id($hostid);
-
-$mform = new mnet_services_form(null, array('peer' => $mnet_peer));
-if ($formdata = $mform->get_data()) {
-    if (!isset($formdata->publish)) {
-        $formdata->publish = array();
-    }
-    if (!isset($formdata->subscribe)) {
-        $formdata->subscribe = array();
-    }
-    foreach($formdata->exists as $key => $value) {
-        $host2service   = $DB->get_record('mnet_host2service', array('hostid'=>$hostid, 'serviceid'=>$key));
-        $publish        = (array_key_exists($key, $formdata->publish)) ? $formdata->publish[$key] : 0;
-        $subscribe      = (array_key_exists($key, $formdata->subscribe)) ? $formdata->subscribe[$key] : 0;
-
-        if ($publish != 1 && $subscribe != 1) {
-            if (false == $host2service) {
-                // We don't have or need a record - do nothing!
-            } else {
-                // We don't need the record - delete it
-                $DB->delete_records('mnet_host2service', array('hostid' => $hostid, 'serviceid'=>$key));
-            }
-        } elseif (false == $host2service && ($publish == 1 || $subscribe == 1)) {
-            $host2service = new stdClass();
-            $host2service->hostid = $hostid;
-            $host2service->serviceid = $key;
-
-            $host2service->publish = $publish;
-            $host2service->subscribe = $subscribe;
-
-            $host2service->id = $DB->insert_record('mnet_host2service', $host2service);
-        } elseif ($host2service->publish != $publish || $host2service->subscribe != $subscribe) {
-            $host2service->publish   = $publish;
-            $host2service->subscribe = $subscribe;
-            $DB->update_record('mnet_host2service', $host2service);
-        }
-    }
-    $redirecturl = new moodle_url('/admin/mnet/services.php?hostid=' . $hostid);
-    redirect($redirecturl, get_string('changessaved'));
-}
-
-echo $OUTPUT->header();
-$currenttab = 'mnetservices';
-require_once($CFG->dirroot . '/admin/mnet/tabs.php');
-echo $OUTPUT->box_start();
-$s = mnet_get_service_info($mnet_peer, false); // basic data only
-$mform->set_data($s);
-$mform->display();
-echo $OUTPUT->box_end();
-
-echo $OUTPUT->footer();

admin/mnet/services_form.php

@@ -1,74 +0,0 @@
-<?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/>.
-
-
-/**
- * The form for configuring which services are subscribed and published on a host
- *
- * @package    core
- * @subpackage mnet
- * @copyright  2010 Penny Leach
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-if (!defined('MOODLE_INTERNAL')) {
-    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
-}
-
-require_once($CFG->libdir . '/formslib.php');
-
-class mnet_services_form extends moodleform {
-
-    function definition() {
-        $mform =& $this->_form;
-        $mnet_peer =& $this->_customdata['peer'];
-        $myservices = mnet_get_service_info($mnet_peer);
-
-        $mform->addElement('hidden', 'hostid', $mnet_peer->id);
-
-        $count = 0;
-        foreach ($myservices as $name => $versions) {
-            $version = current($versions);
-            $langmodule =
-                ($version['plugintype'] == 'mod'
-                    ? ''
-                    : ($version['plugintype'] . '_'))
-                . $version['pluginname']; // TODO there should be a moodle-wide way to do this
-
-            if ($count > 0) {
-                $mform->addElement('html', '<hr />');
-            }
-            $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);
-
-            $pubstr = get_string('publish','mnet');
-            if (!empty($version['hostsubscribes'])) {
-                $pubstr .= ' <a class="notifysuccess" title="'.s(get_string('issubscribed','mnet', $mnet_peer->name)).'">&radic;</a> ';
-            }
-            $mform->addElement('advcheckbox', 'publish[' . $version['serviceid'] . ']', $pubstr);
-
-            $substr = get_string('subscribe','mnet');
-            if (!empty($version['hostpublishes'])) {
-                $substr .= ' <a class="notifysuccess" title="'.s(get_string('ispublished','mnet', $mnet_peer->name)).'">&radic;</a> ';
-            }
-            $mform->addElement('advcheckbox', 'subscribe[' . $version['serviceid']. ']', $substr);
-            $count++;
-        }
-        $this->add_action_buttons();
-    }
-}

admin/mnet/tabs.php

@@ -1,56 +0,0 @@
-<?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/>.
-
-
-/**
- * Tabs to be included on the pages for configuring a single host
- * $mnet_peer object must be set and bootstrapped
- * $currenttab string must be set
- *
- * @package    core
- * @subpackage mnet
- * @copyright  2007 Donal McMullan
- * @copyright  2007 Martin Langhoff
- * @copyright  2010 Penny Leach
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-if (!defined('MOODLE_INTERNAL')) {
-    die('Direct access to this script is forbidden.'); // It must be included from a Moodle page
-}
-
-$strmnetservices   = get_string('mnetservices', 'mnet');
-$strmnetlog        = get_string('mnetlog', 'mnet');
-$strmnetedithost   = get_string('reviewhostdetails', 'mnet');
-
-$logurl = $CFG->wwwroot.
-          '/report/log/index.php?chooselog=1&amp;showusers=1&amp;showcourses=1&amp;host_course='.$mnet_peer->id.
-          '%2F1&amp;user='.'0'.
-          '&amp;date=0'.
-          '&amp;modid=&amp;modaction=0&amp;logformat=showashtml';
-$tabs = array();
-if (isset($mnet_peer->id) && $mnet_peer->id > 0) {
-    $tabs[] = new tabobject('mnetdetails', 'peers.php?step=update&amp;hostid='.$mnet_peer->id, $strmnetedithost, $strmnetedithost, false);
-    $tabs[] = new tabobject('mnetservices', 'services.php?hostid='.$mnet_peer->id, $strmnetservices, $strmnetservices, false);
-    if ($mnet_peer->application->name == 'moodle' && $mnet_peer->id != $CFG->mnet_all_hosts_id) {
-        $tabs[] = new tabobject('mnetlog', $logurl, $strmnetlog, $strmnetlog, false);
-    }
-    $tabs[] = new tabobject('mnetprofilefields', 'profilefields.php?hostid=' . $mnet_peer->id, get_string('profilefields', 'mnet'), get_string('profilefields', 'mnet'), false);
-} else {
-    $tabs[] = new tabobject('mnetdetails', '#', $strmnetedithost, $strmnetedithost, false);
-}
-print_tabs(array($tabs), $currenttab);

admin/mnet/testclient.php

@@ -1,212 +0,0 @@
-<?php
-/**
- * A service browser for remote Moodles
- *
- * This script 'remotely' executes the reflection methods on a remote Moodle,
- * and publishes the details of the available services
- *
- * @package    core
- * @subpackage mnet
- * @author  Donal McMullan  donal@catalyst.net.nz
- * @version 0.0.1
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package mnet
- */
-require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
-require_once $CFG->dirroot.'/mnet/xmlrpc/client.php';
-require_once($CFG->libdir.'/adminlib.php');
-include_once($CFG->dirroot.'/mnet/lib.php');
-
-if ($CFG->mnet_dispatcher_mode === 'off') {
-    print_error('mnetdisabled', 'mnet');
-}
-
-require_login();
-admin_externalpage_setup('mnettestclient');
-
-$context = get_context_instance(CONTEXT_SYSTEM);
-require_capability('moodle/site:config', $context);
-
-error_reporting(DEBUG_ALL);
-
-echo $OUTPUT->header();
-if (!extension_loaded('openssl')) {
-    print_error('requiresopenssl', 'mnet', '', NULL, true);
-}
-
-// optional drilling down parameters
-$hostid = optional_param('hostid', 0, PARAM_INT);
-$servicename = optional_param('servicename', '', PARAM_SAFEDIR);
-$methodid = optional_param('method', 0, PARAM_INT);
-
-$hosts = $DB->get_records('mnet_host');
-$moodleapplicationid = $DB->get_field('mnet_application', 'id', array('name' => 'moodle'));
-
-$url = new moodle_url('/admin/mnet/testclient.php');
-$PAGE->set_url($url);
-
-echo $OUTPUT->heading(get_string('hostlist', 'mnet'));
-foreach ($hosts as $id => $host) {
-    if (empty($host->wwwroot) || $host->wwwroot == $CFG->wwwroot) {
-        continue;
-    }
-    $newurl = new moodle_url($url, array('hostid' => $host->id));
-    echo '<p>' . html_writer::link($newurl, $host->wwwroot) . '</p>';
-}
-
-if (!empty($hostid) && array_key_exists($hostid, $hosts)) {
-    $host = $hosts[$hostid];
-    if ($host->applicationid != $moodleapplicationid) {
-        echo $OUTPUT->notification(get_string('notmoodleapplication', 'mnet'));
-    }
-    $mnet_peer = new mnet_peer();
-    $mnet_peer->set_wwwroot($host->wwwroot);
-
-    $mnet_request = new mnet_xmlrpc_client();
-
-    $mnet_request->set_method('system/listServices');
-    $mnet_request->send($mnet_peer);
-    $services = $mnet_request->response;
-    $yesno = array('No', 'Yes');
-    $servicenames = array();
-
-    echo $OUTPUT->heading(get_string('servicesavailableonhost', 'mnet', $host->wwwroot));
-
-    $table = new html_table();
-    $table->head = array(
-        get_string('serviceid', 'mnet'),
-        get_string('service', 'mnet'),
-        get_string('version', 'mnet'),
-        get_string('theypublish', 'mnet'),
-        get_string('theysubscribe', 'mnet'),
-        get_string('options', 'mnet'),
-    );
-    $table->data = array();
-
-    $yesno = array(get_string('no'), get_string('yes'));
-
-    // this query is horrible and has to be remapped afterwards, because of the non-uniqueness
-    // of the remoterep service (it has two plugins so far that use it)
-    // it's possible to get a unique list back using a subquery with LIMIT but that would break oracle
-    // so it's best to just do this small query and then remap the results afterwards
-    $sql = '
-        SELECT DISTINCT
-            ' . $DB->sql_concat('r.plugintype', "'_'", 'r.pluginname', "'_'", 's.name')  . ' AS uniqueid,
-             s.name,
-             r.plugintype,
-             r.pluginname
-        FROM
-            {mnet_service} s
-       JOIN {mnet_remote_service2rpc} s2r ON s2r.serviceid = s.id
-       JOIN {mnet_remote_rpc} r ON r.id = s2r.rpcid';
-
-    $serviceinfo = array();
-
-    foreach ($DB->get_records_sql($sql) as $result) {
-        $serviceinfo[$result->name] = $result->plugintype . '_' . $result->pluginname;
-    }
-
-    foreach ($services as $id => $servicedata) {
-        if (array_key_exists($servicedata['name'], $serviceinfo)) {
-            $service = $serviceinfo[$servicedata['name']];
-            $servicedata['humanname'] = get_string($servicedata['name'].'_name', $service);
-        } else {
-            $servicedata['humanname'] = get_string('unknown', 'mnet');
-        }
-        $newurl = new moodle_url($url, array('hostid' => $host->id, 'servicename' => $servicedata['name']));
-        $table->data[] = array(
-            $servicedata['name'],
-            $servicedata['humanname'],
-            $servicedata['apiversion'],
-            $yesno[$servicedata['publish']],
-            $yesno[$servicedata['subscribe']],
-            html_writer::link($newurl, get_string('listservices', 'mnet'))
-        );
-
-    }
-    echo html_writer::table($table);
-
-
-    $mnet_request->set_method('system/listMethods');
-    if (isset($servicename) && array_key_exists($servicename, $serviceinfo)) {
-        echo $OUTPUT->heading(get_string('methodsavailableonhostinservice', 'mnet', (object)array('host' => $host->wwwroot, 'service' => $servicename)));
-        $service = $serviceinfo[$servicename];
-        $mnet_request->add_param($servicename, 'string');
-    } else {
-        echo $OUTPUT->heading(get_string('methodsavailableonhost', 'mnet', $host->wwwroot));
-    }
-
-    $mnet_request->send($mnet_peer);
-    $methods = $mnet_request->response;
-
-
-    $table = new html_table();
-    $table->head = array(
-        get_string('method', 'mnet'),
-        get_string('options', 'mnet'),
-    );
-    $table->data = array();
-
-    foreach ($methods as $id => $method) {
-        $params = array('hostid' => $host->id, 'method' => $id+1);
-        if (isset($servicename)) {
-            $params['servicename'] = $servicename;
-        }
-        $newurl = new moodle_url($url, $params);
-        $table->data[] = array(
-            $method,
-            html_writer::link($newurl, get_string('inspect', 'mnet'))
-        );
-    }
-    echo html_writer::table($table);
-
-    if (isset($methodid) && array_key_exists($methodid-1, $methods)) {
-        $method = $methods[$methodid-1];
-
-        $mnet_request = new mnet_xmlrpc_client();
-        $mnet_request->set_method('system/methodSignature');
-        $mnet_request->add_param($method, 'string');
-        $mnet_request->send($mnet_peer);
-        $signature = $mnet_request->response;
-
-        echo $OUTPUT->heading(get_string('methodsignature', 'mnet', $method));
-
-        $table = new html_table();
-        $table->head = array(
-            get_string('position', 'mnet'),
-            get_string('name', 'mnet'),
-            get_string('type', 'mnet'),
-            get_string('description', 'mnet'),
-        );
-        $table->data = array();
-
-        $params = $signature['parameters'];
-        foreach ($params as $pos => $details) {
-            $table->data[] = array(
-                $pos,
-                $details['name'],
-                $details['type'],
-                $details['description'],
-            );
-        }
-        $table->data[] = array(
-            get_string('returnvalue', 'mnet'),
-            '',
-            $signature['return']['type'],
-            $signature['return']['description']
-        );
-
-        echo html_writer::table($table);
-
-        $mnet_request->set_method('system/methodHelp');
-        $mnet_request->add_param($method, 'string');
-        $mnet_request->send($mnet_peer);
-        $help = $mnet_request->response;
-
-        echo $OUTPUT->heading(get_string('methodhelp', 'mnet', $method));
-        echo(str_replace('\n', '<br />',$help));
-    }
-}
-
-echo $OUTPUT->footer();
-?>

admin/mnet/trustedhosts.html

@@ -1,68 +0,0 @@
-<?php
-echo $OUTPUT->header();
-?>
-<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->
-<table cellspacing="0" cellpadding="5"  class="generaltable generalbox" >
-    <tr>
-        <th class="header c0" colspan="2"><?php print_string('trustedhosts', 'mnet'); ?></th>
-    </tr>
-    <tr>
-        <td class="cell c1" colspan="2"><?php print_string('trustedhostsexplain', 'mnet'); ?></td>
-    </tr>
-    <tr>
-        <td class="cell c1" colspan="2">
-            <form  method="post" action="trustedhosts.php">
-            <div>
-                <input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />
-                <textarea name="hostlist" cols="40" rows="20"><?php echo $trusted_hosts; ?></textarea><br />
-                <input type="submit" value="<?php print_string('savechanges'); ?>" />
-            </div>
-            </form>
-        </td>
-    </tr>
-</table>
-<table cellspacing="0" cellpadding="5" class="generaltable generalbox" >
-    <tr>
-        <th class="header c0" colspan="2"><?php print_string('testtrustedhosts', 'mnet'); ?></th>
-    </tr>
-<?php
-    if (!empty($test_ip_address)){
-?>
-    <tr>
-        <td class="cell c1" colspan="2">
-            <?php
-                if ($in_range) {
-                    print_string('is_in_range',  'mnet', $test_ip_address);
-                    echo '<br />';
-                    print_string('validated_by', 'mnet', $validated_by);
-                } else {
-                    print_string('not_in_range',  'mnet', $test_ip_address);
-                }
-            ?>
-        </td>
-    </tr>
-<?php
-   } else {
-?>
-    <tr>
-        <td class="cell c1" colspan="2"><?php print_string('testtrustedhostsexplain', 'mnet'); ?></td>
-    </tr>
-<?php
-   }
-?>
-    <tr>
-        <td class="cell c1" colspan="2">
-            <form  method="get" action="trustedhosts.php">
-            <div>
-                <input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />
-                <input type="text" name="testipaddress" value="<?php echo $test_ip_address; ?>" />
-                <input type="submit" value="<?php print_string('go'); ?>" />
-            </div>
-            </form>
-        </td>
-    </tr>
-</table>
-</div>
-<?php
-echo $OUTPUT->footer();
-?>

admin/mnet/trustedhosts.php

@@ -1,63 +0,0 @@
-<?php
-    // Allows the admin to configure services for remote hosts
-
-    require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
-    require_once($CFG->libdir.'/adminlib.php');
-    include_once($CFG->dirroot.'/mnet/lib.php');
-
-    require_login();
-    admin_externalpage_setup('trustedhosts');
-
-    $context = get_context_instance(CONTEXT_SYSTEM);
-
-    require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
-
-    if (!extension_loaded('openssl')) {
-        echo $OUTPUT->header();
-        print_error('requiresopenssl', 'mnet', '', NULL, true);
-    }
-
-    $site = get_site();
-
-    $trusted_hosts = '';//array();
-    $old_trusted_hosts = get_config('mnet', 'mnet_trusted_hosts');
-    if (!empty($old_trusted_hosts)) {
-        $old_trusted_hosts =  explode(',', $old_trusted_hosts);
-    } else {
-        $old_trusted_hosts = array();
-    }
-
-    $test_ip_address = optional_param('testipaddress', NULL, PARAM_HOST);
-    $in_range = false;
-    if (!empty($test_ip_address)) {
-        foreach($old_trusted_hosts as $host) {
-            if (address_in_subnet($test_ip_address, $host)) {
-                $in_range = true;
-                $validated_by = $host;
-                break;
-            }
-        }
-    }
-
-    /// If data submitted, process and store
-    if (($form = data_submitted()) && confirm_sesskey()) {
-        $hostlist = preg_split("/[\s,]+/", $form->hostlist);
-        foreach($hostlist as $host) {
-            list($address, $mask) = explode('/', $host.'/');
-            if (empty($address)) continue;
-            if (strlen($mask) == 0) $mask = 32;
-            $trusted_hosts .= trim($address).'/'.trim($mask)."\n";
-            unset($address, $mask);
-        }
-        set_config('mnet_trusted_hosts', str_replace("\n", ',', $trusted_hosts), 'mnet');
-    } elseif (!empty($old_trusted_hosts)) {
-        foreach($old_trusted_hosts as $host) {
-            list($address, $mask) = explode('/', $host.'/');
-            if (empty($address)) continue;
-            if (strlen($mask) == 0) $mask = 32;
-            $trusted_hosts .= trim($address).'/'.trim($mask)."\n";
-            unset($address, $mask);
-        }
-    }
-
-    include('./trustedhosts.html');

admin/module.php

@@ -0,0 +1,67 @@
+<?PHP  // $Id$
+       // module.php - allows admin to edit all local configuration variables for a module
+
+    require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('managemodules', $adminroot);
+
+/// If data submitted, then process and store.
+
+    if ($config = data_submitted()) {
+        $module = optional_param('module', '', PARAM_SAFEDIR);
+
+        if (!confirm_sesskey()) {
+            error(get_string('confirmsesskeybad', 'error'));
+        }
+
+        if ($module != '') {
+            require_once("$CFG->dirroot/mod/$module/lib.php");
+            // if the config.html contains a hidden form field giving
+            // the module name then the form does not have to prefix all
+            // its variable names, we will do it here.
+            $moduleprefix = $module.'_';
+            // let the module process the form data if it has to,
+            // $config is passed to this function by reference
+            $moduleconfig = $module.'_process_options';
+            if (function_exists($moduleconfig)) {
+                $moduleconfig($config);
+            }
+        } else {
+            $moduleprefix = '';
+        }
+
+        unset($config->sesskey);
+        unset($config->module);
+
+        foreach ($config as $name => $value) {
+            set_config($moduleprefix.$name, $value);
+        }
+        redirect("$CFG->wwwroot/$CFG->admin/modules.php", get_string("changessaved"), 1);
+        exit;
+    }
+
+/// Otherwise print the form.
+    $module = required_param('module', PARAM_SAFEDIR);
+    require_once("$CFG->dirroot/mod/$module/lib.php");
+
+    $strmodulename = get_string("modulename", $module);
+
+    // $CFG->pagepath is used to generate the body and id attributes for the body tag
+    // of the page. It is also used to generate the link to the Moodle Docs for this view.
+    $CFG->pagepath = 'mod/' . $module . '/config';
+
+    admin_externalpage_print_header($adminroot);
+
+    print_heading($strmodulename);
+
+    print_simple_box("<center>".get_string("configwarning", 'admin')."</center>", "center", "60%");
+    echo "<br />";
+
+    print_simple_box_start("center", "");
+    include("$CFG->dirroot/mod/$module/config.html");
+    print_simple_box_end();
+
+    admin_externalpage_print_footer($adminroot);
+
+?>

admin/modules.php

@@ -1,19 +1,15 @@
-<?php
+<?PHP // $Id$
       // Allows the admin to manage activity modules
 
     require_once('../config.php');
-    require_once('../course/lib.php');
     require_once($CFG->libdir.'/adminlib.php');
-    require_once($CFG->libdir.'/tablelib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('managemodules', $adminroot);
+    require_once('../course/lib.php');
 
-    // defines
-    define('MODULE_TABLE','module_administration_table');
-
-    admin_externalpage_setup('managemodules');
-
-    $show    = optional_param('show', '', PARAM_PLUGIN);
-    $hide    = optional_param('hide', '', PARAM_PLUGIN);
-    $delete  = optional_param('delete', '', PARAM_PLUGIN);
+    $show    = optional_param('show', '', PARAM_SAFEDIR);
+    $hide    = optional_param('hide', '', PARAM_SAFEDIR);
+    $delete  = optional_param('delete', '', PARAM_SAFEDIR);
     $confirm = optional_param('confirm', '', PARAM_BOOL);
 
 
@@ -27,166 +23,173 @@
     $strsettings = get_string("settings");
     $stractivities = get_string("activities");
     $stractivitymodule = get_string("activitymodule");
-    $strshowmodulecourse = get_string('showmodulecourse');
+
+    admin_externalpage_print_header($adminroot);
+
+    print_heading($stractivities);
+
+    $coursesaffected = false;
+
 
 /// If data submitted, then process and store.
 
     if (!empty($hide) and confirm_sesskey()) {
-        if (!$module = $DB->get_record("modules", array("name"=>$hide))) {
-            print_error('moduledoesnotexist', 'error');
+        if (!$module = get_record("modules", "name", $hide)) {
+            error("Module doesn't exist!");
         }
-        $DB->set_field("modules", "visible", "0", array("id"=>$module->id)); // Hide main module
-        // Remember the visibility status in visibleold
-        // and hide...
-        $sql = "UPDATE {course_modules}
-                   SET visibleold=visible, visible=0
-                 WHERE module=?";
-        $DB->execute($sql, array($module->id));
-        // clear the course modinfo cache for courses
-        // where we just deleted something
-        $sql = "UPDATE {course}
-                   SET modinfo=''
-                 WHERE id IN (SELECT DISTINCT course
-                                FROM {course_modules}
-                               WHERE visibleold=1 AND module=?)";
-        $DB->execute($sql, array($module->id));
-        admin_get_root(true, false);  // settings not required - only pages
+        set_field("modules", "visible", "0", "id", $module->id);                               // Hide main module
+        set_field('course_modules', 'visibleold', '1', 'visible' ,'1', 'module', $module->id); // Remember the previous visible state so we can toggle this back if the module is unhidden.
+        set_field('course_modules', 'visibleold', '0', 'visible' ,'0', 'module', $module->id);
+        set_field("course_modules", "visible", "0", "module", $module->id);                    // Hide all related activity modules
+        $coursesaffected = true;
     }
 
     if (!empty($show) and confirm_sesskey()) {
-        if (!$module = $DB->get_record("modules", array("name"=>$show))) {
-            print_error('moduledoesnotexist', 'error');
+        if (!$module = get_record("modules", "name", $show)) {
+            error("Module doesn't exist!");
         }
-        $DB->set_field("modules", "visible", "1", array("id"=>$module->id)); // Show main module
-        $DB->set_field('course_modules', 'visible', '1', array('visibleold'=>1, 'module'=>$module->id)); // Get the previous saved visible state for the course module.
-        // clear the course modinfo cache for courses
-        // where we just made something visible
-        $sql = "UPDATE {course}
-                   SET modinfo = ''
-                 WHERE id IN (SELECT DISTINCT course
-                                FROM {course_modules}
-                               WHERE visible=1 AND module=?)";
-        $DB->execute($sql, array($module->id));
-        admin_get_root(true, false);  // settings not required - only pages
+        set_field("modules", "visible", "1", "id", $module->id);                               // Show main module
+        set_field('course_modules', 'visible', '1', 'visibleold', '1', 'module', $module->id); // Get the previous saved visible state for the course module.
+        $coursesaffected = true;
     }
 
     if (!empty($delete) and confirm_sesskey()) {
-        echo $OUTPUT->header();
-        echo $OUTPUT->heading($stractivities);
 
-        if (get_string_manager()->string_exists('modulename', $delete)) {
-            $strmodulename = get_string('modulename', $delete);
-        } else {
-            $strmodulename = $delete;
-        }
+        $strmodulename = get_string("modulename", "$delete");
 
         if (!$confirm) {
-            echo $OUTPUT->confirm(get_string("moduledeleteconfirm", "", $strmodulename), "modules.php?delete=$delete&confirm=1", "modules.php");
-            echo $OUTPUT->footer();
+            notice_yesno(get_string("moduledeleteconfirm", "", $strmodulename),
+                         "modules.php?delete=$delete&amp;confirm=1&amp;sesskey=$USER->sesskey",
+                         "modules.php");
+            admin_externalpage_print_footer($adminroot);
             exit;
 
         } else {  // Delete everything!!
 
             if ($delete == "forum") {
-                print_error("cannotdeleteforummodule", 'forum');
+                error("You can not delete the forum module!!");
             }
 
-            uninstall_plugin('mod', $delete);
-            $a = new stdClass();
+            if (!$module = get_record("modules", "name", $delete)) {
+                error("Module doesn't exist!");
+            }
+
+            // OK, first delete all the relevant instances from all course sections
+            if ($coursemods = get_records("course_modules", "module", $module->id)) {
+                foreach ($coursemods as $coursemod) {
+                    if (! delete_mod_from_section($coursemod->id, $coursemod->section)) {
+                        notify("Could not delete the $strmodulename with id = $coursemod->id from section $coursemod->section");
+                    }
+                }
+            }
+
+            // Now delete all the course module records
+            if (!delete_records("course_modules", "module", $module->id)) {
+                notify("Error occurred while deleting all $strmodulename records in course_modules table");
+            }
+
+            // Then delete all the logs
+            if (!delete_records("log", "module", $module->name)) {
+                notify("Error occurred while deleting all $strmodulename records in log table");
+            }
+
+            // And log_display information
+            if (!delete_records("log_display", "module", $module->name)) {
+                notify("Error occurred while deleting all $strmodulename records in log_display table");
+            }
+
+            // And the module entry itself
+            if (!delete_records("modules", "name", $module->name)) {
+                notify("Error occurred while deleting the $strmodulename record from modules table");
+            }
+
+            // Then the tables themselves
+
+            if ($tables = $db->Metatables()) {
+                $prefix = $CFG->prefix.$module->name;
+                foreach ($tables as $table) {
+                    if (strpos($table, $prefix) === 0) {
+                        if (!execute_sql("DROP TABLE $table", false)) {
+                            notify("ERROR: while trying to drop table $table");
+                        }
+                    }
+                }
+            }
+            // Delete the capabilities that were defined by this module
+            capabilities_cleanup('mod/'.$module->name);
+
+            // rebuild_course_cache();  // Because things have changed
+            $coursesaffected = true;
+
             $a->module = $strmodulename;
             $a->directory = "$CFG->dirroot/mod/$delete";
-            echo $OUTPUT->notification(get_string("moduledeletefiles", "", $a), 'notifysuccess');
-            echo $OUTPUT->continue_button("modules.php");
-            echo $OUTPUT->footer();
-            exit;
+            notice(get_string("moduledeletefiles", "", $a), "modules.php");
         }
     }
 
-    echo $OUTPUT->header();
-    echo $OUTPUT->heading($stractivities);
+    if ($coursesaffected) {
+        rebuild_course_cache();  // Because things have changed
+    }
+
 
 /// Get and sort the existing modules
 
-    if (!$modules = $DB->get_records('modules', array(), 'name ASC')) {
-        print_error('moduledoesnotexist', 'error');
+    if (!$modules = get_records("modules")) {
+        error("No modules found!!");        // Should never happen
     }
 
-/// Print the table of all modules
-    // construct the flexible table ready to display
-    $table = new flexible_table(MODULE_TABLE);
-    $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'delete', 'settings'));
-    $table->define_headers(array($stractivitymodule, $stractivities, $strversion, "$strhide/$strshow", $strdelete, $strsettings));
-    $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/modules.php');
-    $table->set_attribute('id', 'modules');
-    $table->set_attribute('class', 'generaltable');
-    $table->setup();
-
     foreach ($modules as $module) {
-
-        if (!file_exists("$CFG->dirroot/mod/$module->name/lib.php")) {
-            $strmodulename = '<span class="notifyproblem">'.$module->name.' ('.get_string('missingfromdisk').')</span>';
-            $missing = true;
-        } else {
-            // took out hspace="\10\", because it does not validate. don't know what to replace with.
-            $icon = "<img src=\"" . $OUTPUT->pix_url('icon', $module->name) . "\" class=\"icon\" alt=\"\" />";
-            $strmodulename = $icon.' '.get_string('modulename', $module->name);
-            $missing = false;
+        $strmodulename = get_string("modulename", "$module->name");
+        // Deal with modules which are lacking the language string
+        if ($strmodulename == '[[modulename]]') {
+            $strmodulename = $module->name;
         }
+        $modulebyname[$strmodulename] = $module;
+    }
+    ksort($modulebyname);
 
-        $delete = "<a href=\"modules.php?delete=$module->name&amp;sesskey=".sesskey()."\">$strdelete</a>";
+/// Print the table of all modules
 
-        if (file_exists("$CFG->dirroot/mod/$module->name/settings.php") ||
-                file_exists("$CFG->dirroot/mod/$module->name/settingstree.php")) {
-            $settings = "<a href=\"settings.php?section=modsetting$module->name\">$strsettings</a>";
+    $table->head  = array ($stractivitymodule, $stractivities, $strversion, "$strhide/$strshow", $strdelete, $strsettings);
+    $table->align = array ("left", "right", "left", "center", "center", "center");
+    $table->wrap  = array ("nowrap", "", "", "", "","");
+    $table->size  = array ("100%", "10", "10", "10", "10","12");
+    $table->width = "100";
+
+    foreach ($modulebyname as $modulename => $module) {
+
+        $icon = "<img src=\"$CFG->modpixpath/$module->name/icon.gif\" hspace=\"10\" height=\"16\" width=\"16\" border=\"0\" alt=\"\" />";
+
+        $delete = "<a href=\"modules.php?delete=$module->name&amp;sesskey=$USER->sesskey\">$strdelete</a>";
+
+        if (file_exists("$CFG->dirroot/mod/$module->name/config.html")) {
+            $settings = "<a href=\"module.php?module=$module->name\">$strsettings</a>";
         } else {
             $settings = "";
         }
 
-        try {
-            $count = $DB->count_records_select($module->name, "course<>0");
-        } catch (dml_exception $e) {
-            $count = -1;
-        }
-        if ($count>0) {
-            $countlink = "<a href=\"{$CFG->wwwroot}/course/search.php?modulelist=$module->name" .
-                "&amp;sesskey=".sesskey()."\" title=\"$strshowmodulecourse\">$count</a>";
-        } else if ($count < 0) {
-            $countlink = get_string('error');
-        } else {
-            $countlink = "$count";
-        }
+        $count = count_records_select("$module->name",'course<>0');
 
-        if ($missing) {
-            $visible = '';
-            $class   = '';
-        } else if ($module->visible) {
-            $visible = "<a href=\"modules.php?hide=$module->name&amp;sesskey=".sesskey()."\" title=\"$strhide\">".
-                       "<img src=\"" . $OUTPUT->pix_url('i/hide') . "\" class=\"icon\" alt=\"$strhide\" /></a>";
-            $class   = '';
+        if ($module->visible) {
+            $visible = "<a href=\"modules.php?hide=$module->name&amp;sesskey=$USER->sesskey\" title=\"$strhide\">".
+                       "<img src=\"$CFG->pixpath/i/hide.gif\" align=\"middle\" height=\"16\" width=\"16\" border=\"0\" alt=\"\" /></a>";
+            $class = "";
         } else {
-            $visible = "<a href=\"modules.php?show=$module->name&amp;sesskey=".sesskey()."\" title=\"$strshow\">".
-                       "<img src=\"" . $OUTPUT->pix_url('i/show') . "\" class=\"icon\" alt=\"$strshow\" /></a>";
-            $class =   ' class="dimmed_text"';
+            $visible = "<a href=\"modules.php?show=$module->name&amp;sesskey=$USER->sesskey\" title=\"$strshow\">".
+                       "<img src=\"$CFG->pixpath/i/show.gif\" align=\"middle\" height=\"16\" width=\"16\" border=\"0\" alt=\"\" /></a>";
+            $class = "class=\"dimmed_text\"";
         }
         if ($module->name == "forum") {
             $delete = "";
             $visible = "";
             $class = "";
         }
-
-
-        $table->add_data(array(
-            '<span'.$class.'>'.$strmodulename.'</span>',
-            $countlink,
-            '<span'.$class.'>'.$module->version.'</span>',
-            $visible,
-            $delete,
-            $settings
-        ));
+        $table->data[] = array ("<span $class>$icon $modulename</span>", $count, $module->version, $visible, $delete, $settings);
     }
+    print_table($table);
 
-    $table->print_html();
-
-    echo $OUTPUT->footer();
+    echo "<br /><br />";
 
+    admin_externalpage_print_footer($adminroot);
 
+?>

admin/oacleanup.php

@@ -1,25 +1,29 @@
-<?php
+<?php // $Id$
 
 if (!isset($CFG)) {
 
     require('../config.php');
     require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('oacleanup', $adminroot);
 
-    admin_externalpage_setup('oacleanup');
+    require_login();
 
-    echo $OUTPUT->header();
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+
+    admin_externalpage_print_header($adminroot);
     online_assignment_cleanup(true);
-    echo $OUTPUT->footer();
+    admin_externalpage_print_footer($adminroot);
 
 }
 
 
 
 function online_assignment_cleanup($output=false) {
-    global $CFG, $DB, $OUTPUT;
+    global $CFG;
 
     if ($output) {
-        echo $OUTPUT->heading('Online Assignment Cleanup');
+        print_heading('Online Assignment Cleanup');
         echo '<center>';
     }
 
@@ -27,7 +31,7 @@ function online_assignment_cleanup($output=false) {
     /// We don't want to run this code if we are doing an upgrade from an assignment
     /// version earlier than 2005041400
     /// because the assignment type field will not exist
-    $amv = $DB->get_field('modules', 'version', array('name'=>'assignment'));
+    $amv = get_field('modules', 'version', 'name', 'assignment');
     if ((int)$amv < 2005041400) {
         if ($output) {
             echo '</center>';
@@ -37,34 +41,22 @@ function online_assignment_cleanup($output=false) {
 
 
     /// get the module id for assignments from db
-    $arecord = $DB->get_record('modules', array('name', 'assignment'));
+    $arecord = get_record('modules', 'name', 'assignment');
     $aid = $arecord->id;
 
 
     /// get a list of all courses on this site
-    list($ctxselect, $ctxjoin) = context_instance_preload_sql('c.id', CONTEXT_COURSE, 'ctx');
-    $sql = "SELECT c.* $ctxselect FROM {course} c $ctxjoin";
-    $courses = $DB->get_records_sql($sql);
+    $courses = get_records('course');
 
     /// cycle through each course
     foreach ($courses as $course) {
-        context_instance_preload($course);
-        $context = get_context_instance(CONTEXT_COURSE, $course->id);
 
-        if (empty($course->fullname)) {
-            $fullname = get_string('course').': '.$course->id;
-        } else {
-            $fullname = format_string($course->fullname, true, array('context' => $context));
-        }
-        if ($output) echo $OUTPUT->heading($fullname);
+        $fullname = empty($course->fullname) ? 'Course: '.$course->id : $course->fullname;
+        if ($output) print_heading($fullname);
 
         /// retrieve a list of sections beyond what is currently being shown
-        $sql = "SELECT *
-                  FROM {course_sections}
-                 WHERE course=? AND section>?
-              ORDER BY section ASC";
-        $params = array($course->id, $course->numsections);
-        if (!($xsections = $DB->get_records_sql($sql, $params))) {
+        $sql = 'SELECT * FROM '.$CFG->prefix.'course_sections WHERE course='.$course->id.' AND section>'.$course->numsections.' ORDER BY section ASC';
+        if (!($xsections = get_records_sql($sql))) {
             if ($output) echo 'No extra sections<br />';
             continue;
         }
@@ -82,13 +74,16 @@ function online_assignment_cleanup($output=false) {
                 foreach ($instances as $instance) {
                     /// is this an instance of an online assignment
                     $sql = "SELECT a.id
-                              FROM  {course_modules} cm, {assignment} a
-                             WHERE cm.id = ? AND cm.module = ? AND
-                                   cm.instance = a.id AND a.assignmenttype = 'online'";
-                    $params = array($instance, $aid);
+                        FROM  {$CFG->prefix}course_modules cm,
+                    {$CFG->prefix}assignment a
+                    WHERE cm.id = '$instance' AND
+                        cm.module = '$aid' AND
+                        cm.instance = a.id AND
+                        a.assignmenttype = 'online'";
+
 
                     /// if record exists then we need to move instance to it's correct section
-                    if ($DB->record_exists_sql($sql, $params)) {
+                    if (record_exists_sql($sql)) {
 
                         /// check the new section id
                         /// the journal update erroneously stored it in course_sections->section
@@ -96,17 +91,15 @@ function online_assignment_cleanup($output=false) {
                         /// double check the new section
                         if ($newsection > $course->numsections) {
                             /// get the record for section 0 for this course
-                            if (!($zerosection = $DB->get_record('course_sections', array('course'=>$course->id, 'section'=>'0')))) {
+                            if (!($zerosection = get_record('course_sections', 'course', $course->id, 'section', '0'))) {
                                 continue;
                             }
                             $newsection = $zerosection->id;
                         }
 
                         /// grab the section record
-                        if (!($section = $DB->get_record('course_sections', array('id'=>$newsection)))) {
-                            if ($output) {
-                                echo 'Serious error: Cannot retrieve section: '.$newsection.' for course: '. $fullname .'<br />';
-                            }
+                        if (!($section = get_record('course_sections', 'id', $newsection))) {
+                            if ($output) echo 'Serious error: Cannot retrieve section: '.$newsection.' for course: '.$course->fullname.'<br />';
                             continue;
                         }
 
@@ -121,13 +114,13 @@ function online_assignment_cleanup($output=false) {
                         /// implode the sequence
                         $section->sequence = implode(',', $sequence);
 
-                        $DB->set_field('course_sections', 'sequence', $section->sequence, array('id'=>$section->id));
+                        set_field('course_sections', 'sequence', $section->sequence, 'id', $section->id);
 
                         /// now we need to remove the instance from the old sequence
 
                         /// grab the old section record
-                        if (!($section = $DB->get_record('course_sections', array('id'=>$xsection->id)))) {
-                            if ($output) echo 'Serious error: Cannot retrieve old section: '.$xsection->id.' for course: '.$fullname.'<br />';
+                        if (!($section = get_record('course_sections', 'id', $xsection->id))) {
+                            if ($output) echo 'Serious error: Cannot retrieve old section: '.$xsection->id.' for course: '.$course->fullname.'<br />';
                             continue;
                         }
 
@@ -143,7 +136,7 @@ function online_assignment_cleanup($output=false) {
                         /// implode the sequence
                         $section->sequence = implode(',', $sequence);
 
-                        $DB->set_field('course_sections', 'sequence', $section->sequence, array('id'=>$section->id));
+                        set_field('course_sections', 'sequence', $section->sequence, 'id', $section->id);
 
 
                         if ($output) echo 'Online Assignment (instance '.$instance.') moved from section '.$section->id.': to section '.$newsection.'<br />';
@@ -154,7 +147,7 @@ function online_assignment_cleanup($output=false) {
 
             /// if the summary and sequence are empty then remove this section
             if (empty($xsection->summary) and empty($xsection->sequence)) {
-                $DB->delete_records('course_sections', array('id'=>$xsection->id));
+                delete_records('course_sections', 'id', $xsection->id);
                 if ($output) echo 'Deleting empty section '.$xsection->section.'<br />';
             }
         }
@@ -163,4 +156,4 @@ function online_assignment_cleanup($output=false) {
     echo '</center>';
 }
 
-
+?>

admin/oauth2callback.php

@@ -1,46 +0,0 @@
-<?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/>.
-
-/**
- * An oauth2 redirection endpoint which can be used for an application:
- * http://tools.ietf.org/html/draft-ietf-oauth-v2-26#section-3.1.2
- *
- * This is used because some oauth servers will not allow a redirect urls
- * with get params (like repository callback) and that needs to be called
- * using the state param.
- *
- * @package    core
- * @copyright  2012 Dan Poltawski
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once(dirname(dirname(__FILE__)).'/config.php');
-
-// The authorization code generated by the authorization server.
-$code = required_param('code', PARAM_RAW);
-// The state parameter we've given (used in moodle as a redirect url).
-$state = required_param('state', PARAM_LOCALURL);
-
-$redirecturl = new moodle_url($state);
-$params = $redirecturl->params();
-
-if (isset($params['sesskey']) and confirm_sesskey($params['sesskey'])) {
-    $redirecturl->param('oauth2code', $code);
-    redirect($redirecturl);
-} else {
-    print_error('invalidsesskey');
-}

admin/pagelib.php

@@ -0,0 +1,131 @@
+<?php // $Id$
+
+require_once($CFG->libdir.'/pagelib.php');
+
+define('PAGE_ADMIN', 'admin');
+
+define('BLOCK_L_MIN_WIDTH',0);
+define('BLOCK_L_MAX_WIDTH',210);
+define('BLOCK_R_MIN_WIDTH',0);
+define('BLOCK_R_MAX_WIDTH',210);
+
+page_map_class(PAGE_ADMIN, 'page_admin');
+
+class page_admin extends page_base {
+
+    var $section;
+    var $pathtosection;
+    var $visiblepathtosection;
+
+    // hack alert!
+    // this function works around the inability to store the section name
+    // in default block, maybe we should "improve" the blocks a bit?
+    function init_extra($section) { 
+        global $CFG;
+
+        if($this->full_init_done) {
+            return;
+        }
+
+        $adminroot = admin_get_root();
+
+        // fetch the path parameter
+        $this->section = $section;
+
+        $this->visiblepathtosection = array();
+        
+        // this part is (potentially) processor-intensive... there's gotta be a better way
+        // of handling this
+        if ($this->pathtosection = $adminroot->path($this->section)) {
+            foreach($this->pathtosection as $element) {
+                if ($pointer = $adminroot->locate($element)) {
+                    array_push($this->visiblepathtosection, $pointer->visiblename);
+                }
+            }
+        }
+
+        // all done
+        $this->full_init_done = true;
+    }
+    
+    function blocks_get_default() {
+        return 'admin_tree,admin_bookmarks';
+    }
+
+    // seems reasonable that the only people that can edit blocks on the admin pages
+    // are the admins... but maybe we want a role for this?
+    function user_allowed_editing() { 
+        return has_capability('moodle/site:manageblocks', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    }
+
+    // has to be fixed. i know there's a "proper" way to do this
+    function user_is_editing() { 
+        global $USER;
+        return $USER->adminediting;
+    }
+
+    function url_get_path() { 
+        global $CFG;
+
+        $adminroot = admin_get_root();
+
+        $root = $adminroot->locate($this->section);
+        if (is_a($root, 'admin_externalpage')) {
+            return $root->url;
+        } else {
+            return ($CFG->wwwroot . '/' . $CFG->admin . '/settings.php');
+        }
+    }
+
+    function url_get_parameters() {  // only handles parameters relevant to the admin pagetype
+        return array('section' => (isset($this->section) ? $this->section : ''));
+    }
+
+    function blocks_get_positions() { 
+        return array(BLOCK_POS_LEFT, BLOCK_POS_RIGHT);
+    }
+
+    function blocks_default_position() { 
+        return BLOCK_POS_LEFT;
+    }
+
+    function blocks_move_position(&$instance, $move) {
+        if($instance->position == BLOCK_POS_LEFT && $move == BLOCK_MOVE_RIGHT) {
+            return BLOCK_POS_RIGHT;
+        } else if ($instance->position == BLOCK_POS_RIGHT && $move == BLOCK_MOVE_LEFT) {
+            return BLOCK_POS_LEFT;
+        }
+        return $instance->position;
+    }
+
+    // does anything need to be done here?
+    function init_quick($data) {
+        parent::init_quick($data);
+    }
+
+    function print_header($section = '') {
+        global $USER, $CFG, $SITE;
+
+        $this->init_full($section); // we're trusting that init_full() has already been called by now; it should have.
+                                    // if not, print_header() has to be called with a $section parameter
+
+        if ($this->user_allowed_editing()) {
+            $buttons = '<table><tr><td><form target="' . $CFG->framename . '" method="get" action="' . $this->url_get_path() . '">'.
+                       '<input type="hidden" name="adminedit" value="'.($this->user_is_editing()?'off':'on').'" />'.
+                       '<input type="hidden" name="section" value="'.$this->section.'" />'.
+                       '<input type="submit" value="'.get_string($this->user_is_editing()?'blockseditoff':'blocksediton').'" /></form></td>' . 
+                       '</tr></table>';
+        } else {
+            $buttons = '&nbsp;';
+        }
+        
+        print_header("$SITE->shortname: " . implode(": ",$this->visiblepathtosection), $SITE->fullname, 
+                       implode(" -> ",$this->visiblepathtosection),'', '', true, $buttons, '');
+    }
+
+    function get_type() {
+        return PAGE_ADMIN;
+    }
+}
+
+?>

admin/phpinfo.php

@@ -1,12 +1,17 @@
-<?php
+<?PHP  // $Id$
        // phpinfo.php - shows phpinfo for the current server
 
     require_once("../config.php");
     require_once($CFG->libdir.'/adminlib.php');
 
-    admin_externalpage_setup('phpinfo');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('phpinfo', $adminroot);
 
-    echo $OUTPUT->header();
+    require_login();
+
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+
+    admin_externalpage_print_header($adminroot);
 
     echo '<div class="phpinfo">';
 
@@ -15,19 +20,13 @@
     $html = ob_get_contents();
     ob_end_clean();
 
-/// Delete styles from output
     $html = preg_replace('#(\n?<style[^>]*?>.*?</style[^>]*?>)|(\n?<style[^>]*?/>)#is', '', $html);
     $html = preg_replace('#(\n?<head[^>]*?>.*?</head[^>]*?>)|(\n?<head[^>]*?/>)#is', '', $html);
-/// Delete DOCTYPE from output
-    $html = preg_replace('/<!DOCTYPE html PUBLIC.*?>/is', '', $html);
-/// Delete body and html tags
-    $html = preg_replace('/<html.*?>.*?<body.*?>/is', '', $html);
-    $html = preg_replace('/<\/body><\/html>/is', '', $html);
 
     echo $html;
 
     echo '</div>';
 
-    echo $OUTPUT->footer();
-
+    admin_externalpage_print_footer($adminroot);
 
+?>

admin/plugins.php

@@ -1,46 +0,0 @@
-<?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/>.
-
-/**
- * UI for general plugins management
- *
- * @package    core
- * @subpackage admin
- * @copyright  2011 David Mudrak <david@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once(dirname(dirname(__FILE__)) . '/config.php');
-require_once($CFG->libdir . '/adminlib.php');
-require_once($CFG->libdir . '/pluginlib.php');
-
-require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
-admin_externalpage_setup('pluginsoverview');
-
-$fetchremote = optional_param('fetchremote', false, PARAM_BOOL);
-
-$pluginman = plugin_manager::instance();
-$checker = available_update_checker::instance();
-
-if ($fetchremote) {
-    require_sesskey();
-    $checker->fetch();
-    redirect($PAGE->url);
-}
-
-$output = $PAGE->get_renderer('core', 'admin');
-echo $output->plugin_management_page($pluginman, $checker);

admin/portfolio.php

@@ -1,249 +0,0 @@
-<?php
-
-require_once(dirname(dirname(__FILE__)) . '/config.php');
-require_once($CFG->libdir . '/portfoliolib.php');
-require_once($CFG->libdir . '/portfolio/forms.php');
-require_once($CFG->libdir . '/adminlib.php');
-
-$portfolio     = optional_param('pf', '', PARAM_FORMAT);
-$action        = optional_param('action', '', PARAM_ALPHA);
-$sure          = optional_param('sure', '', PARAM_ALPHA);
-
-$display = true; // fall through to normal display
-
-$pagename = 'manageportfolios';
-
-if ($action == 'edit') {
-    $pagename = 'portfoliosettings' . $portfolio;
-} else if ($action == 'delete') {
-    $pagename = 'portfoliodelete';
-} else if (($action == 'newon') || ($action == 'newoff')) {
-    $pagename = 'portfolionew';
-}
-
-// Need to remember this for form
-$formaction = $action;
-
-// Check what visibility to show the new repository
-if ($action == 'newon') {
-    $action = 'new';
-    $visible = 1;
-} else if ($action == 'newoff') {
-    $action = 'new';
-    $visible = 0;
-}
-
-admin_externalpage_setup($pagename);
-
-require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
-
-$baseurl    = "$CFG->wwwroot/$CFG->admin/portfolio.php";
-$sesskeyurl = "$CFG->wwwroot/$CFG->admin/portfolio.php?sesskey=" . sesskey();
-$configstr  = get_string('manageportfolios', 'portfolio');
-
-$return = true; // direct back to the main page
-
-/**
- * Helper function that generates a moodle_url object
- * relevant to the portfolio
- */
-function portfolio_action_url($portfolio) {
-    global $baseurl;
-    return new moodle_url($baseurl, array('sesskey'=>sesskey(), 'pf'=>$portfolio));
-}
-
-if (($action == 'edit') || ($action == 'new')) {
-    if (($action == 'edit')) {
-        $instance = portfolio_instance($portfolio);
-        $plugin = $instance->get('plugin');
-
-        // Since visible is being passed to form
-        // and used to set the value when a new
-        // instance is created - we must also
-        // place the currently visibility into the
-        // form as well
-        $visible = $instance->get('visible');
-    } else {
-        $instance = null;
-        $plugin = $portfolio;
-    }
-
-    $PAGE->set_pagetype('admin-portfolio-' . $plugin);
-
-    // Display the edit form for this instance
-    $mform = new portfolio_admin_form('', array('plugin' => $plugin, 'instance' => $instance, 'portfolio' => $portfolio, 'action' => $formaction, 'visible' => $visible));
-    // End setup, begin output
-    if ($mform->is_cancelled()){
-        redirect($baseurl);
-        exit;
-    } else if (($fromform = $mform->get_data()) && (confirm_sesskey())) {
-        // Unset whatever doesn't belong in fromform
-        foreach (array('pf', 'action', 'plugin', 'sesskey', 'submitbutton') as $key) {
-            unset($fromform->{$key});
-        }
-        // This branch is where you process validated data.
-        if ($action == 'edit') {
-            $instance->set_config((array)$fromform);
-            $instance->save();
-        } else {
-            portfolio_static_function($plugin, 'create_instance', $plugin, $fromform->name, $fromform);
-        }
-        $savedstr = get_string('instancesaved', 'portfolio');
-        redirect($baseurl, $savedstr, 1);
-        exit;
-    } else {
-        echo $OUTPUT->header();
-        echo $OUTPUT->heading(get_string('configplugin', 'portfolio'));
-        echo $OUTPUT->box_start();
-        $mform->display();
-        echo $OUTPUT->box_end();
-        $return = false;
-    }
-} else if (($action == 'hide') || ($action == 'show')) {
-    require_sesskey();
-
-    $instance = portfolio_instance($portfolio);
-    $current = $instance->get('visible');
-    if (empty($current) && $instance->instance_sanity_check()) {
-        print_error('cannotsetvisible', 'portfolio', $baseurl);
-    }
-
-    if ($action == 'show') {
-        $visible = 1;
-    } else {
-        $visible = 0;
-    }
-
-    $instance->set('visible', $visible);
-    $instance->save();
-    $return = true;
-} else if ($action == 'delete') {
-    $instance = portfolio_instance($portfolio);
-    if ($sure) {
-        if (!confirm_sesskey()) {
-            print_error('confirmsesskeybad', '', $baseurl);
-        }
-        if ($instance->delete()) {
-            $deletedstr = get_string('instancedeleted', 'portfolio');
-            redirect($baseurl, $deletedstr, 1);
-        } else {
-            print_error('instancenotdeleted', 'portfolio', $baseurl);
-        }
-        exit;
-    } else {
-        echo $OUTPUT->header();
-        echo $OUTPUT->confirm(get_string('sure', 'portfolio', $instance->get('name')), $sesskeyurl . '&pf='.$portfolio.'&action=delete&sure=yes', $baseurl);
-        $return = false;
-    }
-} else {
-    // If page is loaded directly
-    echo $OUTPUT->header();
-    echo $OUTPUT->heading(get_string('manageportfolios', 'portfolio'));
-
-    // Get strings that are used
-    $strshow = get_string('on', 'portfolio');
-    $strhide = get_string('off', 'portfolio');
-    $strdelete = get_string('disabledinstance', 'portfolio');
-    $strsettings = get_string('settings');
-
-    $actionchoicesforexisting = array(
-        'show' => $strshow,
-        'hide' => $strhide,
-        'delete' => $strdelete
-    );
-
-    $actionchoicesfornew = array(
-        'newon' => $strshow,
-        'newoff' => $strhide,
-        'delete' => $strdelete
-    );
-
-    $output = $OUTPUT->box_start('generalbox');
-
-    $plugins = get_plugin_list('portfolio');
-    $plugins = array_keys($plugins);
-    $instances = portfolio_instances(false, false);
-    $usedplugins = array();
-
-    // to avoid notifications being sent out while admin is editing the page
-    define('ADMIN_EDITING_PORTFOLIO', true);
-
-    $insane = portfolio_plugin_sanity_check($plugins);
-    $insaneinstances = portfolio_instance_sanity_check($instances);
-
-    $table = new html_table();
-    $table->head = array(get_string('plugin', 'portfolio'), '', '');
-    $table->data = array();
-
-    foreach ($instances as $i) {
-        $settings = '<a href="' . $sesskeyurl . '&amp;action=edit&amp;pf=' . $i->get('id') . '">' . $strsettings .'</a>';
-        // Set some commonly used variables
-        $pluginid = $i->get('id');
-        $plugin = $i->get('plugin');
-        $pluginname = $i->get('name');
-
-        // Check if the instance is misconfigured
-        if (array_key_exists($plugin, $insane) || array_key_exists($pluginid, $insaneinstances)) {
-            if (!empty($insane[$plugin])) {
-                $information = $insane[$plugin];
-            } else if (!empty($insaneinstances[$pluginid])) {
-                $information = $insaneinstances[$pluginid];
-            }
-            $table->data[] = array($pluginname, $strdelete  . " " . $OUTPUT->help_icon($information, 'portfolio_' .  $plugin), $settings);
-        } else {
-            if ($i->get('visible')) {
-                $currentaction = 'show';
-            } else {
-                $currentaction = 'hide';
-            }
-            $select = new single_select(portfolio_action_url($pluginid, 'pf'), 'action', $actionchoicesforexisting, $currentaction, null, 'applyto' . $pluginid);
-            $select->set_label(get_string('action'), array('class' => 'accesshide'));
-            $table->data[] = array($pluginname, $OUTPUT->render($select), $settings);
-        }
-        if (!in_array($plugin, $usedplugins)) {
-            $usedplugins[] = $plugin;
-        }
-    }
-
-    // Create insane plugin array
-    $insaneplugins = array();
-    if (!empty($plugins)) {
-        foreach ($plugins as $p) {
-            // Check if it can not have multiple instances and has already been used
-            if (!portfolio_static_function($p, 'allows_multiple_instances') && in_array($p, $usedplugins)) {
-                continue;
-            }
-
-            // Check if it is misconfigured - if so store in array then display later
-            if (array_key_exists($p, $insane)) {
-                $insaneplugins[] = $p;
-            } else {
-                $select = new single_select(portfolio_action_url($p, 'pf'), 'action', $actionchoicesfornew, 'delete', null, 'applyto' . $p);
-                $select->set_label(get_string('action'), array('class' => 'accesshide'));
-                $table->data[] = array(portfolio_static_function($p, 'get_name'), $OUTPUT->render($select), '');
-            }
-        }
-    }
-
-    // Loop through all the insane plugins
-    if (!empty($insaneplugins)) {
-        foreach ($insaneplugins as $p) {
-            $table->data[] = array(portfolio_static_function($p, 'get_name'), $strdelete . " " . $OUTPUT->help_icon($insane[$p], 'portfolio_' .  $p), '');
-        }
-    }
-
-    $output .= html_writer::table($table);
-
-    $output .= $OUTPUT->box_end();
-
-    echo $output;
-    $return = false;
-}
-
-if ($return) {
-    // Redirect to base
-    redirect($baseurl);
-}
-
-echo $OUTPUT->footer();
-

admin/process_email.php

@@ -1,6 +1,6 @@
 #!/usr/bin/php -f
-<?php
-
+<?php // $Id$
+define('FULLME','cron'); // prevent warnings
 //error_reporting(0);
 //ini_set('display_errors',0);
 require_once(dirname(dirname(__FILE__)).'/config.php');
@@ -9,17 +9,16 @@ $address = $tmp[0];
 
 // BOUNCE EMAILS TO NOREPLY
 if ($_ENV['RECIPIENT'] == $CFG->noreplyaddress) {
-    $user = new stdClass();
     $user->email = $_ENV['SENDER'];
 
     if (!validate_email($user->email)) {
         die();
     }
-
+    
     $site = get_site();
-    $subject = get_string('noreplybouncesubject','moodle',format_string($site->fullname));
-    $body = get_string('noreplybouncemessage','moodle',format_string($site->fullname))."\n\n";
-
+    $subject = get_string('noreplybouncesubject','moodle',$site->fullname);
+    $body = get_string('noreplybouncemessage','moodle',$site->fullname)."\n\n";
+    
     $fd = fopen('php://stdin','r');
     if ($fd) {
         while(!feof($fd)) {
@@ -27,14 +26,14 @@ if ($_ENV['RECIPIENT'] == $CFG->noreplyaddress) {
         }
         fclose($fd);
     }
-
+    
     $user->id = 0; // to prevent anything annoying happening
-
+    
     $from->firstname = null;
     $from->lastname = null;
     $from->email = '<>';
     $from->maildisplay = true;
-
+    
     email_to_user($user,$from,$subject,$body);
     die ();
 }
@@ -54,13 +53,13 @@ if ($modid == '0') { // special
     $modname = 'moodle';
 }
 else {
-    $modname = $DB->get_field("modules", "name", array("id"=>$modid));
-    include_once('mod/'.$modname.'/lib.php');
+    $modname = get_field("modules","name","id",$modid);
+    require_once('mod/'.$modname.'/lib.php');
 }
 $function = $modname.'_process_email';
 
 if (!function_exists($function)) {
-    die();
+    die(); 
 }
 $fd = fopen('php://stdin','r');
 if (!$fd) {
@@ -71,10 +70,10 @@ while(!feof($fd)) {
     $body .= fgets($fd);
 }
 
-$function($modargs,$body);
-
-fclose($fd);
+$function($modargs,$body); 
 
+fclose($handle);
 
 
 
+?>

admin/purgecaches.php

@@ -1,63 +0,0 @@
-<?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/>.
-
-/**
- * This script triggers a full purging of system caches,
- * this is useful mostly for developers who did not disable the caching.
- *
- * @package    core
- * @copyright  2010 Petr Skoda {@link http://skodak.org}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once('../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-
-$confirm = optional_param('confirm', 0, PARAM_BOOL);
-
-admin_externalpage_setup('purgecaches');
-
-require_login();
-require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
-
-if ($confirm) {
-    require_sesskey();
-
-    // Valid request. Purge, and redisplay the form so it is easy to purge again
-    // in the near future.
-    purge_all_caches();
-    redirect(new moodle_url('/admin/purgecaches.php'), get_string('purgecachesfinished', 'admin'));
-
-} else {
-    // Show a confirm form.
-    echo $OUTPUT->header();
-    echo $OUTPUT->heading(get_string('purgecaches', 'admin'));
-
-    $url = new moodle_url('/admin/purgecaches.php', array('sesskey'=>sesskey(), 'confirm'=>1));
-    $button = new single_button($url, get_string('purgecaches','admin'), 'post');
-
-    // Cancel button takes them back to the page the were on, if possible,
-    // otherwise to the site home page.
-    $return = new moodle_url('/');
-    if (isset($_SERVER['HTTP_REFERER']) and !empty($_SERVER['HTTP_REFERER'])) {
-        if ($_SERVER['HTTP_REFERER'] !== "$CFG->wwwroot/$CFG->admin/purgecaches.php") {
-            $return = $_SERVER['HTTP_REFERER'];
-        }
-    }
-
-    echo $OUTPUT->confirm(get_string('purgecachesconfirm', 'admin'), $button, $return);
-    echo $OUTPUT->footer();
-}

admin/qbehaviours.php

@@ -1,302 +0,0 @@
-<?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/>.
-
-/**
- * Allows the admin to manage question behaviours.
- *
- * @package    moodlecore
- * @subpackage questionengine
- * @copyright  2011 The Open University
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-
-require_once(dirname(__FILE__) . '/../config.php');
-require_once($CFG->libdir . '/questionlib.php');
-require_once($CFG->libdir . '/adminlib.php');
-require_once($CFG->libdir . '/pluginlib.php');
-require_once($CFG->libdir . '/tablelib.php');
-
-// Check permissions.
-require_login();
-$systemcontext = get_context_instance(CONTEXT_SYSTEM);
-require_capability('moodle/question:config', $systemcontext);
-
-admin_externalpage_setup('manageqbehaviours');
-$thispageurl = new moodle_url('/admin/qbehaviours.php');
-
-$behaviours = get_plugin_list('qbehaviour');
-$pluginmanager = plugin_manager::instance();
-
-// Get some data we will need - question counts and which types are needed.
-$counts = $DB->get_records_sql_menu("
-        SELECT behaviour, COUNT(1)
-        FROM {question_attempts} GROUP BY behaviour");
-$needed = array();
-$archetypal = array();
-foreach ($behaviours as $behaviour => $notused) {
-    if (!array_key_exists($behaviour, $counts)) {
-        $counts[$behaviour] = 0;
-    }
-    $needed[$behaviour] = ($counts[$behaviour] > 0) ||
-            $pluginmanager->other_plugins_that_require('qbehaviour_' . $behaviour);
-    $archetypal[$behaviour] = question_engine::is_behaviour_archetypal($behaviour);
-}
-foreach ($counts as $behaviour => $count) {
-    if (!array_key_exists($behaviour, $behaviours)) {
-        $counts['missing'] += $count;
-    }
-}
-$needed['missing'] = true;
-
-// Work of the correct sort order.
-$config = get_config('question');
-$sortedbehaviours = array();
-foreach ($behaviours as $behaviour => $notused) {
-    $sortedbehaviours[$behaviour] = question_engine::get_behaviour_name($behaviour);
-}
-if (!empty($config->behavioursortorder)) {
-    $sortedbehaviours = question_engine::sort_behaviours($sortedbehaviours,
-            $config->behavioursortorder, '');
-}
-
-if (!empty($config->disabledbehaviours)) {
-    $disabledbehaviours = explode(',', $config->disabledbehaviours);
-} else {
-    $disabledbehaviours = array();
-}
-
-// Process actions ============================================================
-
-// Disable.
-if (($disable = optional_param('disable', '', PARAM_PLUGIN)) && confirm_sesskey()) {
-    if (!isset($behaviours[$disable])) {
-        print_error('unknownbehaviour', 'question', $thispageurl, $disable);
-    }
-
-    if (array_search($disable, $disabledbehaviours) === false) {
-        $disabledbehaviours[] = $disable;
-        set_config('disabledbehaviours', implode(',', $disabledbehaviours), 'question');
-    }
-    redirect($thispageurl);
-}
-
-// Enable.
-if (($enable = optional_param('enable', '', PARAM_PLUGIN)) && confirm_sesskey()) {
-    if (!isset($behaviours[$enable])) {
-        print_error('unknownbehaviour', 'question', $thispageurl, $enable);
-    }
-
-    if (!$archetypal[$enable]) {
-        print_error('cannotenablebehaviour', 'question', $thispageurl, $enable);
-    }
-
-    if (($key = array_search($enable, $disabledbehaviours)) !== false) {
-        unset($disabledbehaviours[$key]);
-        set_config('disabledbehaviours', implode(',', $disabledbehaviours), 'question');
-    }
-    redirect($thispageurl);
-}
-
-// Move up in order.
-if (($up = optional_param('up', '', PARAM_PLUGIN)) && confirm_sesskey()) {
-    if (!isset($behaviours[$up])) {
-        print_error('unknownbehaviour', 'question', $thispageurl, $up);
-    }
-
-    // This function works fine for behaviours, as well as qtypes.
-    $neworder = question_reorder_qtypes($sortedbehaviours, $up, -1);
-    set_config('behavioursortorder', implode(',', $neworder), 'question');
-    redirect($thispageurl);
-}
-
-// Move down in order.
-if (($down = optional_param('down', '', PARAM_PLUGIN)) && confirm_sesskey()) {
-    if (!isset($behaviours[$down])) {
-        print_error('unknownbehaviour', 'question', $thispageurl, $down);
-    }
-
-    // This function works fine for behaviours, as well as qtypes.
-    $neworder = question_reorder_qtypes($sortedbehaviours, $down, +1);
-    set_config('behavioursortorder', implode(',', $neworder), 'question');
-    redirect($thispageurl);
-}
-
-// Delete.
-if (($delete = optional_param('delete', '', PARAM_PLUGIN)) && confirm_sesskey()) {
-    // Check it is OK to delete this question type.
-    if ($delete == 'missing') {
-        print_error('cannotdeletemissingbehaviour', 'question', $thispageurl);
-    }
-
-    if (!isset($behaviours[$delete])) {
-        print_error('unknownbehaviour', 'question', $thispageurl, $delete);
-    }
-
-    $behaviourname = $sortedbehaviours[$delete];
-    if ($counts[$delete] > 0) {
-        print_error('cannotdeletebehaviourinuse', 'question', $thispageurl, $behaviourname);
-    }
-    if ($needed[$delete] > 0) {
-        print_error('cannotdeleteneededbehaviour', 'question', $thispageurl, $behaviourname);
-    }
-
-    // If not yet confirmed, display a confirmation message.
-    if (!optional_param('confirm', '', PARAM_BOOL)) {
-        echo $OUTPUT->header();
-        echo $OUTPUT->heading(get_string('deletebehaviourareyousure', 'question', $behaviourname));
-        echo $OUTPUT->confirm(
-                get_string('deletebehaviourareyousuremessage', 'question', $behaviourname),
-                new moodle_url($thispageurl, array('delete' => $delete, 'confirm' => 1)),
-                $thispageurl);
-        echo $OUTPUT->footer();
-        exit;
-    }
-
-    // Do the deletion.
-    echo $OUTPUT->header();
-    echo $OUTPUT->heading(get_string('deletingbehaviour', 'question', $behaviourname));
-
-    // Delete any configuration records.
-    if (!unset_all_config_for_plugin('qbehaviour_' . $delete)) {
-        echo $OUTPUT->notification(get_string('errordeletingconfig', 'admin', 'qbehaviour_' . $delete));
-    }
-    if (($key = array_search($delete, $disabledbehaviours)) !== false) {
-        unset($disabledbehaviours[$key]);
-        set_config('disabledbehaviours', implode(',', $disabledbehaviours), 'question');
-    }
-    $behaviourorder = array_keys($sortedbehaviours);
-    if (($key = array_search($delete, $behaviourorder)) !== false) {
-        unset($behaviourorder[$key]);
-        set_config('behavioursortorder', implode(',', $behaviourorder), 'question');
-    }
-
-    // Then the tables themselves
-    drop_plugin_tables($delete, get_plugin_directory('qbehaviour', $delete) . '/db/install.xml', false);
-
-    // Remove event handlers and dequeue pending events
-    events_uninstall('qbehaviour_' . $delete);
-
-    $a = new stdClass();
-    $a->behaviour = $behaviourname;
-    $a->directory = get_plugin_directory('qbehaviour', $delete);
-    echo $OUTPUT->box(get_string('qbehaviourdeletefiles', 'question', $a), 'generalbox', 'notice');
-    echo $OUTPUT->continue_button($thispageurl);
-    echo $OUTPUT->footer();
-    exit;
-}
-
-// End of process actions ==================================================
-
-// Print the page heading.
-echo $OUTPUT->header();
-echo $OUTPUT->heading(get_string('manageqbehaviours', 'admin'));
-
-// Set up the table.
-$table = new flexible_table('qbehaviouradmintable');
-$table->define_baseurl($thispageurl);
-$table->define_columns(array('behaviour', 'numqas', 'version', 'requires',
-        'available', 'delete'));
-$table->define_headers(array(get_string('behaviour', 'question'), get_string('numqas', 'question'),
-        get_string('version'), get_string('requires', 'admin'),
-        get_string('availableq', 'question'), get_string('delete')));
-$table->set_attribute('id', 'qbehaviours');
-$table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
-$table->setup();
-
-// Add a row for each question type.
-foreach ($sortedbehaviours as $behaviour => $behaviourname) {
-    $row = array();
-
-    // Question icon and name.
-    $row[] = $behaviourname;
-
-    // Count
-    $row[] = $counts[$behaviour];
-
-    // Question version number.
-    $version = get_config('qbehaviour_' . $behaviour, 'version');
-    if ($version) {
-        $row[] = $version;
-    } else {
-        $row[] = html_writer::tag('span', get_string('nodatabase', 'admin'), array('class' => 'disabled'));
-    }
-
-    // Other question types required by this one.
-    $plugin = $pluginmanager->get_plugin_info('qbehaviour_' . $behaviour);
-    $required = $plugin->get_other_required_plugins();
-    if (!empty($required)) {
-        $strrequired = array();
-        foreach ($required as $component => $notused) {
-            $strrequired[] = $pluginmanager->plugin_name($component);
-        }
-        $row[] = implode(', ', $strrequired);
-    } else {
-        $row[] = '';
-    }
-
-    // Are people allowed to select this behaviour?
-    $rowclass = '';
-    if ($archetypal[$behaviour]) {
-        $enabled = array_search($behaviour, $disabledbehaviours) === false;
-        $icons = question_behaviour_enable_disable_icons($behaviour, $enabled);
-        if (!$enabled) {
-            $rowclass = 'dimmed_text';
-        }
-    } else {
-        $icons = $OUTPUT->spacer() . ' ';
-    }
-
-    // Move icons.
-    $icons .= question_behaviour_icon_html('up', $behaviour, 't/up', get_string('up'), null);
-    $icons .= question_behaviour_icon_html('down', $behaviour, 't/down', get_string('down'), null);
-    $row[] = $icons;
-
-    // Delete link, if available.
-    if ($needed[$behaviour]) {
-        $row[] = '';
-    } else {
-        $row[] = html_writer::link(new moodle_url($thispageurl,
-                array('delete' => $behaviour, 'sesskey' => sesskey())), get_string('delete'),
-                array('title' => get_string('uninstallbehaviour', 'question')));
-    }
-
-    $table->add_data($row, $rowclass);
-}
-
-$table->finish_output();
-
-echo $OUTPUT->footer();
-
-function question_behaviour_enable_disable_icons($behaviour, $enabled) {
-    if ($enabled) {
-        return question_behaviour_icon_html('disable', $behaviour, 'i/hide',
-                get_string('enabled', 'question'), get_string('disable'));
-    } else {
-        return question_behaviour_icon_html('enable', $behaviour, 'i/show',
-                get_string('disabled', 'question'), get_string('enable'));
-    }
-}
-
-function question_behaviour_icon_html($action, $behaviour, $icon, $alt, $tip) {
-    global $OUTPUT;
-    return $OUTPUT->action_icon(new moodle_url('/admin/qbehaviours.php',
-            array($action => $behaviour, 'sesskey' => sesskey())),
-            new pix_icon($icon, $alt, 'moodle', array('title' => '')),
-            null, array('title' => $tip)) . ' ';
-}
-

admin/qtypes.php

@@ -1,312 +0,0 @@
-<?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/>.
-
-/**
- * Allows the admin to manage question types.
- *
- * @package    moodlecore
- * @subpackage questionbank
- * @copyright  2008 Tim Hunt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-
-require_once(dirname(__FILE__) . '/../config.php');
-require_once($CFG->libdir . '/questionlib.php');
-require_once($CFG->libdir . '/adminlib.php');
-require_once($CFG->libdir . '/pluginlib.php');
-require_once($CFG->libdir . '/tablelib.php');
-
-// Check permissions.
-require_login();
-$systemcontext = get_context_instance(CONTEXT_SYSTEM);
-require_capability('moodle/question:config', $systemcontext);
-$canviewreports = has_capability('report/questioninstances:view', $systemcontext);
-
-admin_externalpage_setup('manageqtypes');
-$thispageurl = new moodle_url('/admin/qtypes.php');
-
-$qtypes = question_bank::get_all_qtypes();
-$pluginmanager = plugin_manager::instance();
-
-// Get some data we will need - question counts and which types are needed.
-$counts = $DB->get_records_sql("
-        SELECT qtype, COUNT(1) as numquestions, SUM(hidden) as numhidden
-        FROM {question} GROUP BY qtype", array());
-$needed = array();
-foreach ($qtypes as $qtypename => $qtype) {
-    if (!isset($counts[$qtypename])) {
-        $counts[$qtypename] = new stdClass;
-        $counts[$qtypename]->numquestions = 0;
-        $counts[$qtypename]->numhidden = 0;
-    }
-    $needed[$qtypename] = $counts[$qtypename]->numquestions > 0 ||
-            $pluginmanager->other_plugins_that_require($qtype->plugin_name());
-    $counts[$qtypename]->numquestions -= $counts[$qtypename]->numhidden;
-}
-$needed['missingtype'] = true; // The system needs the missing question type.
-foreach ($counts as $qtypename => $count) {
-    if (!isset($qtypes[$qtypename])) {
-        $counts['missingtype']->numquestions += $count->numquestions - $count->numhidden;
-        $counts['missingtype']->numhidden += $count->numhidden;
-    }
-}
-
-// Work of the correct sort order.
-$config = get_config('question');
-$sortedqtypes = array();
-foreach ($qtypes as $qtypename => $qtype) {
-    $sortedqtypes[$qtypename] = $qtype->local_name();
-}
-$sortedqtypes = question_bank::sort_qtype_array($sortedqtypes, $config);
-
-// Process actions ============================================================
-
-// Disable.
-if (($disable = optional_param('disable', '', PARAM_PLUGIN)) && confirm_sesskey()) {
-    if (!isset($qtypes[$disable])) {
-        print_error('unknownquestiontype', 'question', $thispageurl, $disable);
-    }
-
-    set_config($disable . '_disabled', 1, 'question');
-    redirect($thispageurl);
-}
-
-// Enable.
-if (($enable = optional_param('enable', '', PARAM_PLUGIN)) && confirm_sesskey()) {
-    if (!isset($qtypes[$enable])) {
-        print_error('unknownquestiontype', 'question', $thispageurl, $enable);
-    }
-
-    if (!$qtypes[$enable]->menu_name()) {
-        print_error('cannotenable', 'question', $thispageurl, $enable);
-    }
-
-    unset_config($enable . '_disabled', 'question');
-    redirect($thispageurl);
-}
-
-// Move up in order.
-if (($up = optional_param('up', '', PARAM_PLUGIN)) && confirm_sesskey()) {
-    if (!isset($qtypes[$up])) {
-        print_error('unknownquestiontype', 'question', $thispageurl, $up);
-    }
-
-    $neworder = question_reorder_qtypes($sortedqtypes, $up, -1);
-    question_save_qtype_order($neworder, $config);
-    redirect($thispageurl);
-}
-
-// Move down in order.
-if (($down = optional_param('down', '', PARAM_PLUGIN)) && confirm_sesskey()) {
-    if (!isset($qtypes[$down])) {
-        print_error('unknownquestiontype', 'question', $thispageurl, $down);
-    }
-
-    $neworder = question_reorder_qtypes($sortedqtypes, $down, +1);
-    question_save_qtype_order($neworder, $config);
-    redirect($thispageurl);
-}
-
-// Delete.
-if (($delete = optional_param('delete', '', PARAM_PLUGIN)) && confirm_sesskey()) {
-    // Check it is OK to delete this question type.
-    if ($delete == 'missingtype') {
-        print_error('cannotdeletemissingqtype', 'question', $thispageurl);
-    }
-
-    if (!isset($qtypes[$delete])) {
-        print_error('unknownquestiontype', 'question', $thispageurl, $delete);
-    }
-
-    $qtypename = $qtypes[$delete]->local_name();
-    if ($counts[$delete]->numquestions + $counts[$delete]->numhidden > 0) {
-        print_error('cannotdeleteqtypeinuse', 'question', $thispageurl, $qtypename);
-    }
-
-    if ($needed[$delete] > 0) {
-        print_error('cannotdeleteqtypeneeded', 'question', $thispageurl, $qtypename);
-    }
-
-    // If not yet confirmed, display a confirmation message.
-    if (!optional_param('confirm', '', PARAM_BOOL)) {
-        $qtypename = $qtypes[$delete]->local_name();
-        echo $OUTPUT->header();
-        echo $OUTPUT->heading(get_string('deleteqtypeareyousure', 'question', $qtypename));
-        echo $OUTPUT->confirm(get_string('deleteqtypeareyousuremessage', 'question', $qtypename),
-                new moodle_url($thispageurl, array('delete' => $delete, 'confirm' => 1)),
-                $thispageurl);
-        echo $OUTPUT->footer();
-        exit;
-    }
-
-    // Do the deletion.
-    echo $OUTPUT->header();
-    echo $OUTPUT->heading(get_string('deletingqtype', 'question', $qtypename));
-
-    // Delete any configuration records.
-    if (!unset_all_config_for_plugin('qtype_' . $delete)) {
-        echo $OUTPUT->notification(get_string('errordeletingconfig', 'admin', 'qtype_' . $delete));
-    }
-    unset_config($delete . '_disabled', 'question');
-    unset_config($delete . '_sortorder', 'question');
-
-    // Then the tables themselves
-    drop_plugin_tables($delete, $qtypes[$delete]->plugin_dir() . '/db/install.xml', false);
-
-    // Remove event handlers and dequeue pending events
-    events_uninstall('qtype_' . $delete);
-
-    $a = new stdClass();
-    $a->qtype = $qtypename;
-    $a->directory = $qtypes[$delete]->plugin_dir();
-    echo $OUTPUT->box(get_string('qtypedeletefiles', 'question', $a), 'generalbox', 'notice');
-    echo $OUTPUT->continue_button($thispageurl);
-    echo $OUTPUT->footer();
-    exit;
-}
-
-// End of process actions ==================================================
-
-// Print the page heading.
-echo $OUTPUT->header();
-echo $OUTPUT->heading(get_string('manageqtypes', 'admin'));
-
-// Set up the table.
-$table = new flexible_table('qtypeadmintable');
-$table->define_baseurl($thispageurl);
-$table->define_columns(array('questiontype', 'numquestions', 'version', 'requires',
-        'availableto', 'delete', 'settings'));
-$table->define_headers(array(get_string('questiontype', 'question'), get_string('numquestions', 'question'),
-        get_string('version'), get_string('requires', 'admin'), get_string('availableq', 'question'),
-        get_string('delete'), get_string('settings')));
-$table->set_attribute('id', 'qtypes');
-$table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
-$table->setup();
-
-// Add a row for each question type.
-$createabletypes = question_bank::get_creatable_qtypes();
-foreach ($sortedqtypes as $qtypename => $localname) {
-    $qtype = $qtypes[$qtypename];
-    $row = array();
-
-    // Question icon and name.
-    $fakequestion = new stdClass;
-    $fakequestion->qtype = $qtypename;
-    $icon = print_question_icon($fakequestion, true);
-    $row[] = $icon . ' ' . $localname;
-
-    // Number of questions of this type.
-    if ($counts[$qtypename]->numquestions + $counts[$qtypename]->numhidden > 0) {
-        if ($counts[$qtypename]->numhidden > 0) {
-            $strcount = get_string('numquestionsandhidden', 'question', $counts[$qtypename]);
-        } else {
-            $strcount = $counts[$qtypename]->numquestions;
-        }
-        if ($canviewreports) {
-            $row[] = html_writer::link(new moodle_url('/report/questioninstances/index.php',
-                    array('qtype' => $qtypename)), $strcount, array('title' => get_string('showdetails', 'admin')));
-        } else {
-            $strcount;
-        }
-    } else {
-        $row[] = 0;
-    }
-
-    // Question version number.
-    $version = get_config('qtype_' . $qtypename, 'version');
-    if ($version) {
-        $row[] = $version;
-    } else {
-        $row[] = html_writer::tag('span', get_string('nodatabase', 'admin'), array('class' => 'disabled'));
-    }
-
-    // Other question types required by this one.
-    $plugin = $pluginmanager->get_plugin_info($qtype->plugin_name());
-    $requiredtypes = $plugin->get_other_required_plugins();
-    $strtypes = array();
-    if (!empty($requiredtypes)) {
-        foreach ($requiredtypes as $required => $notused) {
-            $strtypes[] = $pluginmanager->plugin_name($required);
-        }
-        $row[] = implode(', ', $strtypes);
-    } else {
-        $row[] = '';
-    }
-
-    // Are people allowed to create new questions of this type?
-    $rowclass = '';
-    if ($qtype->menu_name()) {
-        $createable = isset($createabletypes[$qtypename]);
-        $icons = question_types_enable_disable_icons($qtypename, $createable);
-        if (!$createable) {
-            $rowclass = 'dimmed_text';
-        }
-    } else {
-        $icons = $OUTPUT->spacer() . ' ';
-    }
-
-    // Move icons.
-    $icons .= question_type_icon_html('up', $qtypename, 't/up', get_string('up'), '');
-    $icons .= question_type_icon_html('down', $qtypename, 't/down', get_string('down'), '');
-    $row[] = $icons;
-
-    // Delete link, if available.
-    if ($needed[$qtypename]) {
-        $row[] = '';
-    } else {
-        $row[] = html_writer::link(new moodle_url($thispageurl,
-                array('delete' => $qtypename, 'sesskey' => sesskey())), get_string('delete'),
-                array('title' => get_string('uninstallqtype', 'question')));
-    }
-
-    // Settings link, if available.
-    $settings = admin_get_root()->locate('qtypesetting' . $qtypename);
-    if ($settings instanceof admin_externalpage) {
-        $row[] = html_writer::link($settings->url, get_string('settings'));
-    } else if ($settings instanceof admin_settingpage) {
-        $row[] = html_writer::link(new moodle_url('/admin/settings.php',
-                array('section' => 'qtypesetting' . $qtypename)), get_string('settings'));
-    } else {
-        $row[] = '';
-    }
-
-    $table->add_data($row, $rowclass);
-}
-
-$table->finish_output();
-
-echo $OUTPUT->footer();
-
-function question_types_enable_disable_icons($qtypename, $createable) {
-    if ($createable) {
-        return question_type_icon_html('disable', $qtypename, 'i/hide',
-                get_string('enabled', 'question'), get_string('disable'));
-    } else {
-        return question_type_icon_html('enable', $qtypename, 'i/show',
-                get_string('disabled', 'question'), get_string('enable'));
-    }
-}
-
-function question_type_icon_html($action, $qtypename, $icon, $alt, $tip) {
-    global $OUTPUT;
-    return $OUTPUT->action_icon(new moodle_url('/admin/qtypes.php',
-            array($action => $qtypename, 'sesskey' => sesskey())),
-            new pix_icon($icon, $alt, 'moodle', array('title' => '')),
-            null, array('title' => $tip)) . ' ';
-}
-

admin/register.php

@@ -0,0 +1,203 @@
+<?php  // $Id$
+       // register.php - allows admin to register their site on moodle.org
+
+    require_once('../config.php');
+
+    require_login();
+
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+
+    if (!$site = get_site()) {
+        redirect("index.php");
+    }
+
+    if (!confirm_sesskey()) {
+        error(get_string('confirmsesskeybad', 'error'));
+    }
+
+    if (!$admin = get_admin()) {
+        error("No admins");
+    }
+
+    if (!$admin->country and $CFG->country) {
+        $admin->country = $CFG->country;
+    }
+
+    if (empty($CFG->siteidentifier)) {    // Unique site identification code
+        set_config('siteidentifier', random_string(32).$_SERVER['HTTP_HOST']);
+    }
+
+
+/// Print headings
+
+    $stradministration = get_string("administration");
+    $strregistration = get_string("registration");
+    $strregistrationinfo = get_string("registrationinfo");
+
+    print_header("$site->shortname: $strregistration", "$site->fullname", 
+                 "<a href=\"../$CFG->admin/index.php\">$stradministration</a> -> $strregistration");
+
+    print_heading($strregistration);
+
+    print_simple_box($strregistrationinfo, "center", "70%");
+    echo "<br />";
+
+
+/// Print the form
+
+    print_simple_box_start("center", "");
+
+    echo "<form name=\"form\" action=\"http://moodle.org/register/\" method=\"post\">\n";
+    echo "<table cellpadding=\"9\" border=\"0\">\n";
+    echo "<tr valign=\"top\">\n";
+    echo "<td align=\"center\" colspan=\"2\">".get_string("location")."</td>\n";
+    echo "</tr>\n";
+
+    echo "<tr valign=\"top\">\n";
+    echo "<td align=\"right\">Moodle URL:</td>\n";
+    echo "<td>$CFG->wwwroot</td>\n";
+    echo "<!-- The following hidden variables are to help prevent fake entries being sent. -->\n";
+    echo "<!-- Together they form a key.  If any of these change between updates then the entry  -->\n";
+    echo "<!-- is flagged as a new entry and will be manually checked by the list maintainer -->\n";
+   
+    echo "<input type=\"hidden\" name=\"url\" value=\"$CFG->wwwroot\">\n";
+    echo "<input type=\"hidden\" name=\"secret\" value=\"$CFG->siteidentifier\">\n";
+    echo "<input type=\"hidden\" name=\"host\" value=\"".$_SERVER["HTTP_HOST"]."\">\n";
+    echo "<input type=\"hidden\" name=\"lang\" value=\"".current_language()."\">\n";
+    echo "</td></tr>\n";
+
+    echo "<tr valign=\"top\">\n";
+    echo "<td align=\"right\">".get_string("currentversion").":</td>\n";
+    echo "<td>$CFG->release ($CFG->version)</td>\n";
+    echo "<input type=\"hidden\" name=\"version\" value=\"$CFG->version\">\n";
+    echo "<input type=\"hidden\" name=\"release\" value=\"$CFG->release\">\n";
+    echo "</td></tr>\n";
+
+    echo "<tr valign=\"top\">\n";
+    echo "<td align=\"right\">".get_string("fullsitename").":</td>\n";
+    echo "<td><input size=\"50\" type=\"text\" name=\"sitename\" value=\"$site->fullname\"></td>\n";
+    echo "</tr>\n";
+
+    echo "<tr valign=\"top\">\n";
+    echo "<td align=\"right\">".get_string("country").":</td>\n";
+    echo "<td>";
+    choose_from_menu (get_list_of_countries(), "country", $admin->country, get_string("selectacountry")."...", "", "");
+    echo "</td>\n";
+    echo "</tr>\n";
+
+    echo "<tr valign=\"top\">\n";
+    echo "<td align=\"right\"><a href=\"http://moodle.org/sites/?country=$admin->country\" title=\"See the current list of sites\" target=_blank>".get_string("publicdirectory")."</a>:</td>\n";
+    echo "<td>";
+    $options[0] = get_string("publicdirectory0");
+    $options[1] = get_string("publicdirectory1");
+    $options[2] = get_string("publicdirectory2");
+    choose_from_menu ($options, "public", "2", "", "", "");
+    unset($options);
+    echo "</td>\n";
+    echo "</tr>\n";
+
+    echo "<tr valign=\"top\">\n";
+    echo "<td align=\"right\">".get_string("registrationcontact")."</a>:</td>\n";
+    echo "<td>\n";
+    $options[0] = get_string("registrationcontactno");
+    $options[1] = get_string("registrationcontactyes");
+    choose_from_menu ($options, "contact", "1", "", "", "");
+    unset($options);
+    echo "</td>\n";
+    echo "</tr>\n";
+
+    echo "<tr valign=\"top\">\n";
+    echo "<td align=\"right\">".get_string("statistics").":";
+    echo "<br />(".get_string("notpublic").')';
+    echo "</td>\n";
+    echo "<td>";
+
+    $count = count_records('course')-1;
+    echo get_string("courses").": ".$count;
+    echo "<input type=\"hidden\" name=\"courses\" value=\"$count\">\n";
+    echo '<br />';
+
+    $count = count_records('user', 'deleted', 0);
+    echo get_string("users").": ".$count;
+    echo "<input type=\"hidden\" name=\"users\" value=\"$count\">\n";
+    echo '<br />';
+
+    // total number of role assignments
+    $count = count_records('role_assignments'); 
+    echo get_string('roleassignments', 'role').": ".$count;
+    echo "<input type=\"hidden\" name=\"roleassignments\" value=\"$count\">\n";
+    echo '<br />';
+
+    // first find all distinct roles with mod/course:update
+    // please change the name and strings to something appropriate to reflect the new data collected
+    $sql = "SELECT COUNT(DISTINCT u.id)
+            FROM {$CFG->prefix}role_capabilities rc, 
+                 {$CFG->prefix}role_assignments ra,
+                 {$CFG->prefix}user u
+            WHERE (rc.capability = 'moodle/course:update' or rc.capability='moodle/site:doanything')
+                   AND rc.roleid = ra.roleid
+                   AND u.id = ra.userid";
+    
+    $count = count_records_sql($sql);
+    echo get_string("teachers").": ".$count;
+    echo "<input type=\"hidden\" name=\"courseupdaters\" value=\"$count\">\n";
+    echo '<br />';
+
+    $count = count_records('forum_posts');
+    echo get_string("posts", 'forum').": ".$count;
+    echo "<input type=\"hidden\" name=\"posts\" value=\"$count\">\n";
+    echo '<br />';
+
+    $count = count_records('question');
+    echo get_string("questions", 'quiz').": ".$count;
+    echo "<input type=\"hidden\" name=\"questions\" value=\"$count\">\n";
+    echo '<br />';
+
+    $count = count_records('resource');
+    echo get_string("modulenameplural", "resource").": ".$count;
+    echo "<input type=\"hidden\" name=\"resources\" value=\"$count\">\n";
+    echo '<br />';
+
+    echo "</td>\n";
+    echo "</tr>\n";
+
+    echo "<tr valign=\"top\">\n";
+    echo "<td align=\"center\" colspan=\"2\"><hr size=\"1\" noshade>".get_string("administrator")."</td>\n";
+    echo "</tr>\n";
+
+    echo "<tr valign=\"top\">\n";
+    echo "<td align=\"right\">".get_string("administrator").":</td>\n";
+    echo "<td><input size=\"50\" type=\"text\" name=\"adminname\" value=\"".fullname($admin, true)."\"></td>\n";
+    echo "</tr>\n";
+
+    echo "<tr valign=\"top\">\n";
+    echo "<td align=\"right\">".get_string("email").":</td>\n";
+    echo "<td><input size=\"50\" type=\"text\" name=\"adminemail\" value=\"$admin->email\"></td>\n";
+    echo "</tr>\n";
+
+    echo "<tr valign=\"top\">\n";
+    echo "<td align=\"right\">".get_string("registrationemail")."</a>:</td>\n";
+    echo "<td>\n";
+    $options[0] = get_string("registrationno");
+    $options[1] = get_string("registrationyes");
+    choose_from_menu ($options, "mailme", "1", "", "", "");
+    unset($options);
+    echo "</td>\n";
+    echo "</tr>\n";
+
+    echo "<tr valign=\"top\">\n";
+    echo "<td align=\"right\">&nbsp;</td>\n";
+    echo "<td><input type=\"submit\" value=\"".get_string("registrationsend")."\"></td>\n";
+    echo "</tr>\n";
+
+
+    echo "</table>\n";
+    echo "</form>\n";
+
+    print_simple_box_end();
+
+    echo "<br />\n";
+
+    print_footer();
+
+?>

admin/registration/confirmregistration.php

@@ -1,92 +0,0 @@
-<?php
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// This file is part of Moodle - http://moodle.org/                      //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//                                                                       //
-// Moodle is free software: you can redistribute it and/or modify        //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation, either version 3 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// Moodle is distributed in the hope that it will be useful,             //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details.                          //
-//                                                                       //
-// You should have received a copy of the GNU General Public License     //
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.       //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/*
- * @package    moodle
- * @subpackage registration
- * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
- * @copyright  (C) 1999 onwards Martin Dougiamas  http://dougiamas.com
- *
- * The administrator is redirect to this page from the hub to confirm that the
- * site has been registered. It is an administration page. The administrator
- * should be using the same browser during all the registration process.
- * This page save the token that the hub gave us, in order to call the hub
- * directory later by web service.
- */
-
-require('../../config.php');
-require_once($CFG->libdir . '/adminlib.php');
-require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
-
-$newtoken = optional_param('newtoken', '', PARAM_ALPHANUM);
-$url = optional_param('url', '', PARAM_URL);
-$hubname = optional_param('hubname', '', PARAM_TEXT);
-$token = optional_param('token', '', PARAM_TEXT);
-$error = optional_param('error', '', PARAM_ALPHANUM);
-
-admin_externalpage_setup('registrationhubs');
-
-if (!empty($error) and $error == 'urlalreadyexist') {
-    throw new moodle_exception('urlalreadyregistered', 'hub',
-            $CFG->wwwroot . '/' . $CFG->admin . '/registration/index.php');
-}
-
-//check that we are waiting a confirmation from this hub, and check that the token is correct
-$registrationmanager = new registration_manager();
-$registeredhub = $registrationmanager->get_unconfirmedhub($url);
-if (!empty($registeredhub) and $registeredhub->token == $token) {
-
-    echo $OUTPUT->header();
-    echo $OUTPUT->heading(get_string('registrationconfirmed', 'hub'), 3, 'main');
-    $hublink = html_writer::tag('a', $hubname, array('href' => $url));
-
-    $registeredhub->token = $newtoken;
-    $registeredhub->confirmed = 1;
-    $registeredhub->hubname = $hubname;
-    $registrationmanager->update_registeredhub($registeredhub);
-
-    //display notficiation message
-    $notificationmessage = $OUTPUT->notification(
-            get_string('registrationconfirmedon', 'hub', $hublink), 'notifysuccess');
-    echo $notificationmessage;
-
-    //display continue button
-    $registrationpage = new moodle_url('/admin/registration/index.php');
-    $continuebutton = $OUTPUT->render(new single_button($registrationpage, get_string('continue', 'hub')));
-    $continuebutton = html_writer::tag('div', $continuebutton, array('class' => 'mdl-align'));
-    echo $continuebutton;
-
-    if (!extension_loaded('xmlrpc')) {
-        //display notice about xmlrpc
-        $xmlrpcnotification = $OUTPUT->doc_link('admin/environment/php_extension/xmlrpc', '');
-        $xmlrpcnotification .= get_string('xmlrpcdisabledregistration', 'hub');
-        echo $OUTPUT->notification($xmlrpcnotification);
-    }
-
-    echo $OUTPUT->footer();
-} else {
-    throw new moodle_exception('wrongtoken', 'hub',
-            $CFG->wwwroot . '/' . $CFG->admin . '/registration/index.php');
-}
-
-

admin/registration/forms.php

@@ -1,469 +0,0 @@
-<?php
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// This file is part of Moodle - http://moodle.org/                      //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//                                                                       //
-// Moodle is free software: you can redistribute it and/or modify        //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation, either version 3 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// Moodle is distributed in the hope that it will be useful,             //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details.                          //
-//                                                                       //
-// You should have received a copy of the GNU General Public License     //
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.       //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/*
- * @package    moodle
- * @subpackage registration
- * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
- * @copyright  (C) 1999 onwards Martin Dougiamas  http://dougiamas.com
- *
- * The forms needed by registration pages.
- */
-
-
-require_once($CFG->libdir . '/formslib.php');
-require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
-
-/**
- * This form display a unregistration form.
- */
-class site_unregistration_form extends moodleform {
-
-    public function definition() {
-        $mform = & $this->_form;
-        $mform->addElement('header', 'site', get_string('unregister', 'hub'));
-
-        $huburl = $this->_customdata['huburl'];
-        $hubname = $this->_customdata['hubname'];
-
-        $unregisterlabel = get_string('unregister', 'hub');
-        $mform->addElement('checkbox', 'unpublishalladvertisedcourses', '',
-                ' ' . get_string('unpublishalladvertisedcourses', 'hub'));
-        $mform->addElement('checkbox', 'unpublishalluploadedcourses', '',
-                ' ' . get_string('unpublishalluploadedcourses', 'hub'));
-
-        $mform->addElement('hidden', 'confirm', 1);
-        $mform->setType('confirm', PARAM_INT);
-        $mform->addElement('hidden', 'unregistration', 1);
-        $mform->setType('unregistration', PARAM_INT);
-        $mform->addElement('hidden', 'huburl', $huburl);
-        $mform->setType('huburl', PARAM_URL);
-        $mform->addElement('hidden', 'hubname', $hubname);
-        $mform->setType('hubname', PARAM_TEXT);
-
-        $this->add_action_buttons(true, $unregisterlabel);
-    }
-
-}
-
-/**
- * This form display a clean registration data form.
- */
-class site_clean_registration_data_form extends moodleform {
-
-    public function definition() {
-        $mform = & $this->_form;
-        $mform->addElement('header', 'site', get_string('unregister', 'hub'));
-
-        $huburl = $this->_customdata['huburl'];
-        $hubname = $this->_customdata['hubname'];
-
-
-        $unregisterlabel = get_string('forceunregister', 'hub');
-        $mform->addElement('static', '', get_string('warning', 'hub'), get_string('forceunregisterconfirmation', 'hub', $hubname));
-
-
-        $mform->addElement('hidden', 'confirm', 1);
-        $mform->setType('confirm', PARAM_INT);
-        $mform->addElement('hidden', 'unregistration', 1);
-        $mform->setType('unregistration', PARAM_INT);
-        $mform->addElement('hidden', 'cleanregdata', 1);
-        $mform->setType('cleanregdata', PARAM_INT);
-        $mform->addElement('hidden', 'huburl', $huburl);
-        $mform->setType('huburl', PARAM_URL);
-        $mform->addElement('hidden', 'hubname', $hubname);
-        $mform->setType('hubname', PARAM_TEXT);
-
-        $this->add_action_buttons(true, $unregisterlabel);
-    }
-
-}
-
-/**
- * This form display a hub selector.
- * The hub list is retrieved from Moodle.org hub directory.
- * Also displayed, a text field to enter private hub url + its password
- */
-class hub_selector_form extends moodleform {
-
-    public function definition() {
-        global $CFG, $OUTPUT;
-        $mform = & $this->_form;
-        $mform->addElement('header', 'site', get_string('selecthub', 'hub'));
-
-        //retrieve the hub list on the hub directory by web service
-        $function = 'hubdirectory_get_hubs';
-        $params = array();
-        $serverurl = HUB_HUBDIRECTORYURL . "/local/hubdirectory/webservice/webservices.php";
-        require_once($CFG->dirroot . "/webservice/xmlrpc/lib.php");
-        $xmlrpcclient = new webservice_xmlrpc_client($serverurl, 'publichubdirectory');
-        try {
-            $hubs = $xmlrpcclient->call($function, $params);
-        } catch (Exception $e) {
-            $error = $OUTPUT->notification(get_string('errorhublisting', 'hub', $e->getMessage()));
-            $mform->addElement('static', 'errorhub', '', $error);
-            $hubs = array();
-        }
-
-        //remove moodle.org from the hub list
-        foreach ($hubs as $key => $hub) {
-            if ($hub['url'] == HUB_MOODLEORGHUBURL) {
-                unset($hubs[$key]);
-            }
-        }
-
-        //Public hub list
-        $options = array();
-        foreach ($hubs as $hub) {
-            //to not display a name longer than 100 character (too big)
-            if (textlib::strlen($hub['name']) > 100) {
-                $hubname = textlib::substr($hub['name'], 0, 100);
-                $hubname = $hubname . "...";
-            } else {
-                $hubname = $hub['name'];
-            }
-            $options[$hub['url']] = $hubname;
-            $mform->addElement('hidden', clean_param($hub['url'], PARAM_ALPHANUMEXT), $hubname);
-            $mform->setType(clean_param($hub['url'], PARAM_ALPHANUMEXT), PARAM_ALPHANUMEXT);
-        }
-        if (!empty($hubs)) {
-            $mform->addElement('select', 'publichub', get_string('publichub', 'hub'),
-                    $options, array("size" => 15));
-        }
-
-        $mform->addElement('static', 'or', '', get_string('orenterprivatehub', 'hub'));
-
-        //Private hub
-        $mform->addElement('text', 'unlistedurl', get_string('privatehuburl', 'hub'),
-                array('class' => 'registration_textfield'));
-        $mform->addElement('text', 'password', get_string('password'),
-                array('class' => 'registration_textfield'));
-
-        $this->add_action_buttons(false, get_string('selecthub', 'hub'));
-    }
-
-    /**
-     * Check the unlisted URL is a URL
-     */
-    function validation($data, $files) {
-        global $CFG;
-        $errors = parent::validation($data, $files);
-
-        $unlistedurl = $this->_form->_submitValues['unlistedurl'];
-
-        if (!empty($unlistedurl)) {
-            $unlistedurltotest = clean_param($unlistedurl, PARAM_URL);
-            if (empty($unlistedurltotest)) {
-                $errors['unlistedurl'] = get_string('badurlformat', 'hub');
-            }
-        }
-
-        return $errors;
-    }
-
-}
-
-/**
- * The site registration form. Information will be sent to a given hub.
- */
-class site_registration_form extends moodleform {
-
-    public function definition() {
-        global $CFG, $DB;
-
-        $strrequired = get_string('required');
-        $mform = & $this->_form;
-        $huburl = $this->_customdata['huburl'];
-        $hubname = $this->_customdata['hubname'];
-        $password = $this->_customdata['password'];
-        $admin = get_admin();
-        $site = get_site();
-
-        //retrieve config for this hub and set default if they don't exist
-        $cleanhuburl = clean_param($huburl, PARAM_ALPHANUMEXT);
-        $sitename = get_config('hub', 'site_name_' . $cleanhuburl);
-        if ($sitename === false) {
-            $sitename = format_string($site->fullname, true, array('context' => get_context_instance(CONTEXT_COURSE, SITEID)));
-        }
-        $sitedescription = get_config('hub', 'site_description_' . $cleanhuburl);
-        if ($sitedescription === false) {
-            $sitedescription = $site->summary;
-        }
-        $contactname = get_config('hub', 'site_contactname_' . $cleanhuburl);
-        if ($contactname === false) {
-            $contactname = fullname($admin, true);
-        }
-        $contactemail = get_config('hub', 'site_contactemail_' . $cleanhuburl);
-        if ($contactemail === false) {
-            $contactemail = $admin->email;
-        }
-        $contactphone = get_config('hub', 'site_contactphone_' . $cleanhuburl);
-        if ($contactphone === false) {
-            $contactphone = $admin->phone1;
-        }
-        $imageurl = get_config('hub', 'site_imageurl_' . $cleanhuburl);
-        $privacy = get_config('hub', 'site_privacy_' . $cleanhuburl);
-        $address = get_config('hub', 'site_address_' . $cleanhuburl);
-        $region = get_config('hub', 'site_region_' . $cleanhuburl);
-        $country = get_config('hub', 'site_country_' . $cleanhuburl);
-        if ($country === false) {
-            $country = $admin->country;
-        }
-        $language = get_config('hub', 'site_language_' . $cleanhuburl);
-        if ($language === false) {
-            $language = current_language();
-        }
-        $geolocation = get_config('hub', 'site_geolocation_' . $cleanhuburl);
-        $contactable = get_config('hub', 'site_contactable_' . $cleanhuburl);
-        $emailalert = get_config('hub', 'site_emailalert_' . $cleanhuburl);
-        $emailalert = ($emailalert === 0) ? 0 : 1;
-        $coursesnumber = get_config('hub', 'site_coursesnumber_' . $cleanhuburl);
-        $usersnumber = get_config('hub', 'site_usersnumber_' . $cleanhuburl);
-        $roleassignmentsnumber = get_config('hub', 'site_roleassignmentsnumber_' . $cleanhuburl);
-        $postsnumber = get_config('hub', 'site_postsnumber_' . $cleanhuburl);
-        $questionsnumber = get_config('hub', 'site_questionsnumber_' . $cleanhuburl);
-        $resourcesnumber = get_config('hub', 'site_resourcesnumber_' . $cleanhuburl);
-        $mediancoursesize = get_config('hub', 'site_mediancoursesize_' . $cleanhuburl);
-
-        //hidden parameters
-        $mform->addElement('hidden', 'huburl', $huburl);
-        $mform->setType('huburl', PARAM_URL);
-        $mform->addElement('hidden', 'hubname', $hubname);
-        $mform->setType('hubname', PARAM_TEXT);
-        $mform->addElement('hidden', 'password', $password);
-        $mform->setType('password', PARAM_RAW);
-
-        //the input parameters
-        $mform->addElement('header', 'moodle', get_string('registrationinfo', 'hub'));
-
-        $mform->addElement('text', 'name', get_string('sitename', 'hub'),
-                array('class' => 'registration_textfield'));
-        $mform->addRule('name', $strrequired, 'required', null, 'client');
-        $mform->setType('name', PARAM_TEXT);
-        $mform->setDefault('name', $sitename);
-        $mform->addHelpButton('name', 'sitename', 'hub');
-
-        $options = array();
-        $registrationmanager = new registration_manager();
-        $options[HUB_SITENOTPUBLISHED] = $registrationmanager->get_site_privacy_string(HUB_SITENOTPUBLISHED);
-        $options[HUB_SITENAMEPUBLISHED] = $registrationmanager->get_site_privacy_string(HUB_SITENAMEPUBLISHED);
-        $options[HUB_SITELINKPUBLISHED] = $registrationmanager->get_site_privacy_string(HUB_SITELINKPUBLISHED);
-        $mform->addElement('select', 'privacy', get_string('siteprivacy', 'hub'), $options);
-        $mform->setDefault('privacy', $privacy);
-        $mform->addHelpButton('privacy', 'privacy', 'hub');
-        unset($options);
-
-        $mform->addElement('textarea', 'description', get_string('sitedesc', 'hub'),
-                array('rows' => 8, 'cols' => 41));
-        $mform->addRule('description', $strrequired, 'required', null, 'client');
-        $mform->setDefault('description', $sitedescription);
-        $mform->setType('description', PARAM_TEXT);
-        $mform->addHelpButton('description', 'sitedesc', 'hub');
-
-        $languages = get_string_manager()->get_list_of_languages();
-        collatorlib::asort($languages);
-        $mform->addElement('select', 'language', get_string('sitelang', 'hub'),
-                $languages);
-        $mform->setType('language', PARAM_ALPHANUMEXT);
-        $mform->addHelpButton('language', 'sitelang', 'hub');
-        $mform->setDefault('language', $language);
-
-        $mform->addElement('textarea', 'address', get_string('postaladdress', 'hub'),
-                array('rows' => 4, 'cols' => 41));
-        $mform->setType('address', PARAM_TEXT);
-        $mform->setDefault('address', $address);
-        $mform->addHelpButton('address', 'postaladdress', 'hub');
-
-        //TODO: use the region array I generated
-//        $mform->addElement('select', 'region', get_string('selectaregion'), array('-' => '-'));
-//        $mform->setDefault('region', $region);
-        $mform->addElement('hidden', 'regioncode', '-');
-        $mform->setType('regioncode', PARAM_ALPHANUMEXT);
-
-        $countries = get_string_manager()->get_list_of_countries();
-        $mform->addElement('select', 'countrycode', get_string('sitecountry', 'hub'), $countries);
-        $mform->setDefault('countrycode', $country);
-        $mform->addHelpButton('countrycode', 'sitecountry', 'hub');
-
-        $mform->addElement('text', 'geolocation', get_string('sitegeolocation', 'hub'),
-                array('class' => 'registration_textfield'));
-        $mform->setDefault('geolocation', $geolocation);
-        $mform->addHelpButton('geolocation', 'sitegeolocation', 'hub');
-
-        $mform->addElement('text', 'contactname', get_string('siteadmin', 'hub'),
-                array('class' => 'registration_textfield'));
-        $mform->addRule('contactname', $strrequired, 'required', null, 'client');
-        $mform->setType('contactname', PARAM_TEXT);
-        $mform->setDefault('contactname', $contactname);
-        $mform->addHelpButton('contactname', 'siteadmin', 'hub');
-
-        $mform->addElement('text', 'contactphone', get_string('sitephone', 'hub'),
-                array('class' => 'registration_textfield'));
-        $mform->setType('contactphone', PARAM_TEXT);
-        $mform->addHelpButton('contactphone', 'sitephone', 'hub');
-
-        $mform->addElement('text', 'contactemail', get_string('siteemail', 'hub'),
-                array('class' => 'registration_textfield'));
-        $mform->addRule('contactemail', $strrequired, 'required', null, 'client');
-        $mform->setType('contactemail', PARAM_TEXT);
-        $mform->setDefault('contactemail', $contactemail);
-        $mform->addHelpButton('contactemail', 'siteemail', 'hub');
-
-        $options = array();
-        $options[0] = get_string("registrationcontactno");
-        $options[1] = get_string("registrationcontactyes");
-        $mform->addElement('select', 'contactable', get_string('siteregistrationcontact', 'hub'), $options);
-        $mform->setDefault('contactable', $contactable);
-        $mform->addHelpButton('contactable', 'siteregistrationcontact', 'hub');
-        unset($options);
-
-        $options = array();
-        $options[0] = get_string("registrationno");
-        $options[1] = get_string("registrationyes");
-        $mform->addElement('select', 'emailalert', get_string('siteregistrationemail', 'hub'), $options);
-        $mform->setDefault('emailalert', $emailalert);
-        $mform->addHelpButton('emailalert', 'siteregistrationemail', 'hub');
-        unset($options);
-
-        //TODO site logo
-        $mform->addElement('hidden', 'imageurl', ''); //TODO: temporary
-        $mform->setType('imageurl', PARAM_URL);
-
-        $mform->addElement('static', 'urlstring', get_string('siteurl', 'hub'), $CFG->wwwroot);
-        $mform->addHelpButton('urlstring', 'siteurl', 'hub');
-
-        $mform->addElement('static', 'versionstring', get_string('siteversion', 'hub'), $CFG->version);
-        $mform->addElement('hidden', 'moodleversion', $CFG->version);
-        $mform->setType('moodleversion', PARAM_INT);
-        $mform->addHelpButton('versionstring', 'siteversion', 'hub');
-
-        $mform->addElement('static', 'releasestring', get_string('siterelease', 'hub'), $CFG->release);
-        $mform->addElement('hidden', 'moodlerelease', $CFG->release);
-        $mform->setType('moodlerelease', PARAM_TEXT);
-        $mform->addHelpButton('releasestring', 'siterelease', 'hub');
-
-        /// Display statistic that are going to be retrieve by the hub
-        $coursecount = $DB->count_records('course') - 1;
-        $usercount = $DB->count_records('user', array('deleted' => 0));
-        $roleassigncount = $DB->count_records('role_assignments');
-        $postcount = $DB->count_records('forum_posts');
-        $questioncount = $DB->count_records('question');
-        $resourcecount = $DB->count_records('resource');
-        require_once($CFG->dirroot . "/course/lib.php");
-        $participantnumberaverage = number_format(average_number_of_participants(), 2);
-        $modulenumberaverage = number_format(average_number_of_courses_modules(), 2);
-
-        if (HUB_MOODLEORGHUBURL != $huburl) {
-            $mform->addElement('checkbox', 'courses', get_string('sendfollowinginfo', 'hub'),
-                    " " . get_string('coursesnumber', 'hub', $coursecount));
-            $mform->setDefault('courses', true);
-            $mform->addHelpButton('courses', 'sendfollowinginfo', 'hub');
-
-            $mform->addElement('checkbox', 'users', '',
-                    " " . get_string('usersnumber', 'hub', $usercount));
-            $mform->setDefault('users', true);
-
-            $mform->addElement('checkbox', 'roleassignments', '',
-                    " " . get_string('roleassignmentsnumber', 'hub', $roleassigncount));
-            $mform->setDefault('roleassignments', true);
-
-            $mform->addElement('checkbox', 'posts', '',
-                    " " . get_string('postsnumber', 'hub', $postcount));
-            $mform->setDefault('posts', true);
-
-            $mform->addElement('checkbox', 'questions', '',
-                    " " . get_string('questionsnumber', 'hub', $questioncount));
-            $mform->setDefault('questions', true);
-
-            $mform->addElement('checkbox', 'resources', '',
-                    " " . get_string('resourcesnumber', 'hub', $resourcecount));
-            $mform->setDefault('resources', true);
-
-            $mform->addElement('checkbox', 'participantnumberaverage', '',
-                    " " . get_string('participantnumberaverage', 'hub', $participantnumberaverage));
-            $mform->setDefault('participantnumberaverage', true);
-
-            $mform->addElement('checkbox', 'modulenumberaverage', '',
-                    " " . get_string('modulenumberaverage', 'hub', $modulenumberaverage));
-            $mform->setDefault('modulenumberaverage', true);
-        } else {
-            $mform->addElement('static', 'courseslabel', get_string('sendfollowinginfo', 'hub'),
-                    " " . get_string('coursesnumber', 'hub', $coursecount));
-            $mform->addElement('hidden', 'courses', true);
-            $mform->setType('courses', PARAM_FLOAT);
-            $mform->addHelpButton('courseslabel', 'sendfollowinginfo', 'hub');
-
-            $mform->addElement('static', 'userslabel', '',
-                    " " . get_string('usersnumber', 'hub', $usercount));
-            $mform->addElement('hidden', 'users', true);
-            $mform->setType('users', PARAM_FLOAT);
-
-            $mform->addElement('static', 'roleassignmentslabel', '',
-                    " " . get_string('roleassignmentsnumber', 'hub', $roleassigncount));
-            $mform->addElement('hidden', 'roleassignments', true);
-            $mform->setType('roleassignments', PARAM_FLOAT);
-
-            $mform->addElement('static', 'postslabel', '',
-                    " " . get_string('postsnumber', 'hub', $postcount));
-            $mform->addElement('hidden', 'posts', true);
-            $mform->setType('posts', PARAM_FLOAT);
-
-            $mform->addElement('static', 'questionslabel', '',
-                    " " . get_string('questionsnumber', 'hub', $questioncount));
-            $mform->addElement('hidden', 'questions', true);
-            $mform->setType('questions', PARAM_FLOAT);
-
-            $mform->addElement('static', 'resourceslabel', '',
-                    " " . get_string('resourcesnumber', 'hub', $resourcecount));
-            $mform->addElement('hidden', 'resources', true);
-            $mform->setType('resources', PARAM_FLOAT);
-
-            $mform->addElement('static', 'participantnumberaveragelabel', '',
-                    " " . get_string('participantnumberaverage', 'hub', $participantnumberaverage));
-            $mform->addElement('hidden', 'participantnumberaverage', true);
-            $mform->setType('participantnumberaverage', PARAM_FLOAT);
-
-            $mform->addElement('static', 'modulenumberaveragelabel', '',
-                    " " . get_string('modulenumberaverage', 'hub', $modulenumberaverage));
-            $mform->addElement('hidden', 'modulenumberaverage', true);
-            $mform->setType('modulenumberaverage', PARAM_FLOAT);
-        }
-
-        //check if it's a first registration or update
-        $hubregistered = $registrationmanager->get_registeredhub($huburl);
-
-        if (!empty($hubregistered)) {
-            $buttonlabel = get_string('updatesite', 'hub',
-                            !empty($hubname) ? $hubname : $huburl);
-            $mform->addElement('hidden', 'update', true);
-            $mform->setType('update', PARAM_BOOL);
-        } else {
-            $buttonlabel = get_string('registersite', 'hub',
-                            !empty($hubname) ? $hubname : $huburl);
-        }
-
-        $this->add_action_buttons(false, $buttonlabel);
-    }
-
-}
-

admin/registration/index.php

@@ -1,213 +0,0 @@
-<?php
-
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/*
- * @package    moodle
- * @subpackage registration
- * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
- * @copyright  (C) 1999 onwards Martin Dougiamas  http://dougiamas.com
- *
- * On this page the administrator selects which hub he wants to register,
- * except for MOOCH. Admins can register with MOOCH with the top admin menu "Registration" link.
- * On this page the administrator can also unregister from any hubs, including MOOCH.
- */
-
-require('../../config.php');
-
-require_once($CFG->libdir . '/adminlib.php');
-require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
-require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/forms.php');
-require_once($CFG->dirroot . '/course/publish/lib.php');
-require_once($CFG->dirroot . "/webservice/xmlrpc/lib.php");
-
-admin_externalpage_setup('registrationhubs');
-
-$renderer = $PAGE->get_renderer('core', 'register');
-
-$unregistration = optional_param('unregistration', 0, PARAM_INT);
-$cleanregdata = optional_param('cleanregdata', 0, PARAM_BOOL);
-$confirm = optional_param('confirm', 0, PARAM_INT);
-$huburl = optional_param('huburl', '', PARAM_URL);
-$cancel = optional_param('cancel', null, PARAM_ALPHA);
-
-$registrationmanager = new registration_manager();
-$publicationmanager = new course_publish_manager();
-$errormessage = '';
-if (empty($cancel) and $unregistration and $confirm and confirm_sesskey()) {
-
-    $hub = $registrationmanager->get_registeredhub($huburl);
-
-    //unpublish course and unregister the site by web service
-    if (!$cleanregdata) {
-
-        //check if we need to unpublish courses
-        //enrollable courses
-        $unpublishalladvertisedcourses = optional_param('unpublishalladvertisedcourses', 0, PARAM_INT);
-        $hubcourseids = array();
-        if ($unpublishalladvertisedcourses) {
-            $enrollablecourses = $publicationmanager->get_publications($huburl, null, 1);
-            if (!empty($enrollablecourses)) {
-                foreach ($enrollablecourses as $enrollablecourse) {
-                    $hubcourseids[] = $enrollablecourse->hubcourseid;
-                }
-            }
-        }
-        //downloadable courses
-        $unpublishalluploadedcourses = optional_param('unpublishalluploadedcourses', 0, PARAM_INT);
-        if ($unpublishalluploadedcourses) {
-            $downloadablecourses = $publicationmanager->get_publications($huburl, null, 0);
-            if (!empty($downloadablecourses)) {
-                foreach ($downloadablecourses as $downloadablecourse) {
-                    $hubcourseids[] = $downloadablecourse->hubcourseid;
-                }
-            }
-        }
-
-        //unpublish the courses by web service
-        if (!empty($hubcourseids)) {
-            $function = 'hub_unregister_courses';
-            $params = array('courseids' => $hubcourseids);
-            $serverurl = $huburl . "/local/hub/webservice/webservices.php";
-            $xmlrpcclient = new webservice_xmlrpc_client($serverurl, $hub->token);
-            try {
-                $result = $xmlrpcclient->call($function, $params);
-                //delete the published courses
-                if (!empty($enrollablecourses)) {
-                    $publicationmanager->delete_hub_publications($huburl, 1);
-                }
-                if (!empty($downloadablecourses)) {
-                    $publicationmanager->delete_hub_publications($huburl, 0);
-                }
-            } catch (Exception $e) {
-                $errormessage = $e->getMessage();
-                $errormessage .= html_writer::empty_tag('br') .
-                        get_string('errorunpublishcourses', 'hub');
-                $confirm = false;
-                $cleanregdata = 1;
-            }
-        }
-    }
-
-    //course unpublish went ok, unregister the site now
-    if ($confirm) {
-        $function = 'hub_unregister_site';
-        $params = array();
-        $serverurl = $huburl . "/local/hub/webservice/webservices.php";
-        $xmlrpcclient = new webservice_xmlrpc_client($serverurl, $hub->token);
-        try {
-            $result = $xmlrpcclient->call($function, $params);
-        } catch (Exception $e) {
-            if (!$cleanregdata) {
-                $errormessage = $e->getMessage();
-                $confirm = false;
-                $cleanregdata = 1;
-            }
-        }
-    }
-
-    //check that we are still processing the unregistration,
-    //it could have been unset if an exception were previsouly catched
-    if ($confirm) {
-        $registrationmanager->delete_registeredhub($huburl);
-    }
-}
-
-if (empty($cancel) and $unregistration and !$confirm) {
-
-    echo $OUTPUT->header();
-
-    //do not check sesskey if confirm = false because this script is linked into email message
-    if (!empty($errormessage)) {
-        echo $OUTPUT->notification(get_string('unregistrationerror', 'hub', $errormessage));
-    }
-
-    $hub = $registrationmanager->get_registeredhub($huburl);
-    echo $OUTPUT->heading(get_string('unregisterfrom', 'hub', $hub->hubname), 3, 'main');
-    if ($cleanregdata) {
-        $siteunregistrationform = new site_clean_registration_data_form('',
-                        array('huburl' => $huburl, 'hubname' => $hub->hubname));
-    } else {
-        $siteunregistrationform = new site_unregistration_form('',
-                        array('huburl' => $huburl, 'hubname' => $hub->hubname));
-    }
-
-    $siteunregistrationform->display();
-} else {
-    $registeredonmoodleorg = false;
-    $moodleorghub = $registrationmanager->get_registeredhub(HUB_MOODLEORGHUBURL);
-    if (!empty($moodleorghub)) {
-        $registeredonmoodleorg = true;
-    }
-
-    // load the hub selector form
-    $hubselectorform = new hub_selector_form();
-    $fromform = $hubselectorform->get_data();
-    $selectedhuburl = optional_param('publichub', false, PARAM_URL);
-    $unlistedhuburl = optional_param('unlistedurl', false, PARAM_TEXT);
-    $password = optional_param('password', '', PARAM_RAW);
-    $registeringhuburl = null;
-    if (!empty($unlistedhuburl)) {
-        if (clean_param($unlistedhuburl, PARAM_URL) !== '') {
-            $registeringhuburl = $unlistedhuburl;
-        }
-    } else if (!empty($selectedhuburl)) {
-        $registeringhuburl = $selectedhuburl;
-    }
-
-    // a hub has been selected, redirect to the hub registration page
-    if (empty($cancel) and !empty($registeringhuburl) and confirm_sesskey()) {
-        $hubname = optional_param(clean_param($registeringhuburl, PARAM_ALPHANUMEXT), '', PARAM_TEXT);
-        $params = array('sesskey' => sesskey(), 'huburl' => $registeringhuburl,
-            'password' => $password, 'hubname' => $hubname);
-        redirect(new moodle_url($CFG->wwwroot . "/" . $CFG->admin . "/registration/register.php",
-                        $params));
-    }
-
-    echo $OUTPUT->header();
-
-    //check if the site is registered on Moodle.org and display a message about registering on MOOCH
-    $registered = $DB->count_records('registration_hubs', array('huburl' => HUB_MOODLEORGHUBURL, 'confirmed' => 1));
-    if (empty($registered)) {
-        $warningmsg = get_string('registermoochtips', 'hub');
-        $warningmsg .= $renderer->single_button(new moodle_url('register.php', array('huburl' => HUB_MOODLEORGHUBURL
-                    , 'hubname' => 'Moodle.org')), get_string('register', 'admin'));
-        echo $renderer->box($warningmsg, 'buttons mdl-align generalbox adminwarning');
-    }
-
-    //do not check sesskey if confirm = false because this script is linked into email message
-    if (!empty($errormessage)) {
-        echo $OUTPUT->notification(get_string('unregistrationerror', 'hub', $errormessage));
-    }
-
-    echo $OUTPUT->heading(get_string('registerwith', 'hub'));
-
-    $hubselectorform->display();
-
-    if (extension_loaded('xmlrpc')) {
-        $hubs = $registrationmanager->get_registered_on_hubs();
-        if (!empty($hubs)) {
-            echo $OUTPUT->heading(get_string('registeredon', 'hub'), 3, 'main');
-            echo $renderer->registeredonhublisting($hubs);
-        }
-    } else { //display notice about xmlrpc
-        $xmlrpcnotification = $OUTPUT->doc_link('admin/environment/php_extension/xmlrpc', '');
-        $xmlrpcnotification .= get_string('xmlrpcdisabledregistration', 'hub');
-        echo $OUTPUT->notification($xmlrpcnotification);
-    }
-}
-echo $OUTPUT->footer();

admin/registration/lib.php

@@ -1,296 +0,0 @@
-<?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/>.
-
-
-
-
-//// SITE PRIVACY /////
-
-/**
- * Site privacy: private
- */
-define('HUB_SITENOTPUBLISHED', 'notdisplayed');
-
-/**
- * Site privacy: public
- */
-define('HUB_SITENAMEPUBLISHED', 'named');
-
-/**
- * Site privacy: public and global
- */
-define('HUB_SITELINKPUBLISHED', 'linked');
-
-/**
- *
- * Site registration library
- *
- * @package   course
- * @copyright 2010 Moodle Pty Ltd (http://moodle.com)
- * @author    Jerome Mouneyrac
- * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class registration_manager {
-
-    /**
-     * Automatically update the registration on all hubs
-     */
-    public function cron() {
-        global $CFG;
-        if (extension_loaded('xmlrpc')) {
-            //check if the last registration cron update was less than a week ago
-            $lastcron = get_config('registration', 'crontime');
-            if ($lastcron === false or $lastcron < strtotime("-7 day")) { //set to a week, see MDL-23704
-                $function = 'hub_update_site_info';
-                require_once($CFG->dirroot . "/webservice/xmlrpc/lib.php");
-
-                //update all hub where the site is registered on
-                $hubs = $this->get_registered_on_hubs();
-                foreach ($hubs as $hub) {
-                    //update the registration
-                    $siteinfo = $this->get_site_info($hub->huburl);
-                    $params = array('siteinfo' => $siteinfo);
-                    $serverurl = $hub->huburl . "/local/hub/webservice/webservices.php";
-                    $xmlrpcclient = new webservice_xmlrpc_client($serverurl, $hub->token);
-                    try {
-                        $result = $xmlrpcclient->call($function, $params);
-                        mtrace(get_string('siteupdatedcron', 'hub', $hub->hubname));
-                    } catch (Exception $e) {
-                        $errorparam = new stdClass();
-                        $errorparam->errormessage = $e->getMessage();
-                        $errorparam->hubname = $hub->hubname;
-                        mtrace(get_string('errorcron', 'hub', $errorparam));
-                    }
-                }
-                set_config('crontime', time(), 'registration');
-            }
-        } else {
-            mtrace(get_string('errorcronnoxmlrpc', 'hub'));
-        }
-    }
-
-    /**
-     * Return the site secret for a given hub
-     * site identifier is assigned to Mooch
-     * each hub has a unique and personal site secret.
-     * @param string $huburl
-     * @return string site secret
-     */
-    public function get_site_secret_for_hub($huburl) {
-        global $DB;
-
-        $existingregistration = $DB->get_record('registration_hubs',
-                    array('huburl' => $huburl));
-
-        if (!empty($existingregistration)) {
-            return $existingregistration->secret;
-        }
-
-        if ($huburl == HUB_MOODLEORGHUBURL) {
-            $siteidentifier =  get_site_identifier();
-        } else {
-            $siteidentifier = random_string(32) . $_SERVER['HTTP_HOST'];
-        }
-
-        return $siteidentifier;
-
-    }
-
-    /**
-     * When the site register on a hub, he must call this function
-     * @param object $hub where the site is registered on
-     * @return integer id of the record
-     */
-    public function add_registeredhub($hub) {
-        global $DB;
-        $id = $DB->insert_record('registration_hubs', $hub);
-        return $id;
-    }
-
-    /**
-     * When a site unregister from a hub, he must call this function
-     * @param string $huburl the huburl to delete
-     */
-    public function delete_registeredhub($huburl) {
-        global $DB;
-        $DB->delete_records('registration_hubs', array('huburl' => $huburl));
-    }
-
-    /**
-     * Get a hub on which the site is registered for a given url or token
-     * Mostly use to check if the site is registered on a specific hub
-     * @param string $huburl
-     * @param string $token
-     * @return object the  hub
-     */
-    public function get_registeredhub($huburl = null, $token = null) {
-        global $DB;
-
-        $params = array();
-        if (!empty($huburl)) {
-            $params['huburl'] = $huburl;
-        }
-        if (!empty($token)) {
-            $params['token'] = $token;
-        }
-        $params['confirmed'] = 1;
-        $token = $DB->get_record('registration_hubs', $params);
-        return $token;
-    }
-
-    /**
-     * Get the hub which has not confirmed that the site is registered on,
-     * but for which a request has been sent
-     * @param string $huburl
-     * @return object the  hub
-     */
-    public function get_unconfirmedhub($huburl) {
-        global $DB;
-
-        $params = array();
-        $params['huburl'] = $huburl;
-        $params['confirmed'] = 0;
-        $token = $DB->get_record('registration_hubs', $params);
-        return $token;
-    }
-
-    /**
-     * Update a registered hub (mostly use to update the confirmation status)
-     * @param object $communication the hub
-     */
-    public function update_registeredhub($communication) {
-        global $DB;
-        $DB->update_record('registration_hubs', $communication);
-    }
-
-    /**
-     * Return all hubs where the site is registered on
-     */
-    public function get_registered_on_hubs() {
-        global $DB;
-        $hubs = $DB->get_records('registration_hubs', array('confirmed' => 1));
-        return $hubs;
-    }
-
-    /**
-     * Return site information for a specific hub
-     * @param string $huburl
-     * @return array site info
-     */
-    public function get_site_info($huburl) {
-        global $CFG, $DB;
-
-        $siteinfo = array();
-        $cleanhuburl = clean_param($huburl, PARAM_ALPHANUMEXT);
-        $siteinfo['name'] = get_config('hub', 'site_name_' . $cleanhuburl);
-        $siteinfo['description'] = get_config('hub', 'site_description_' . $cleanhuburl);
-        $siteinfo['contactname'] = get_config('hub', 'site_contactname_' . $cleanhuburl);
-        $siteinfo['contactemail'] = get_config('hub', 'site_contactemail_' . $cleanhuburl);
-        $siteinfo['contactphone'] = get_config('hub', 'site_contactphone_' . $cleanhuburl);
-        $siteinfo['imageurl'] = get_config('hub', 'site_imageurl_' . $cleanhuburl);
-        $siteinfo['privacy'] = get_config('hub', 'site_privacy_' . $cleanhuburl);
-        $siteinfo['street'] = get_config('hub', 'site_address_' . $cleanhuburl);
-        $siteinfo['regioncode'] = get_config('hub', 'site_region_' . $cleanhuburl);
-        $siteinfo['countrycode'] = get_config('hub', 'site_country_' . $cleanhuburl);
-        $siteinfo['geolocation'] = get_config('hub', 'site_geolocation_' . $cleanhuburl);
-        $siteinfo['contactable'] = get_config('hub', 'site_contactable_' . $cleanhuburl);
-        $siteinfo['emailalert'] = get_config('hub', 'site_emailalert_' . $cleanhuburl);
-        if (get_config('hub', 'site_coursesnumber_' . $cleanhuburl) == -1) {
-            $coursecount = -1;
-        } else {
-            $coursecount = $DB->count_records('course') - 1;
-        }
-        $siteinfo['courses'] = $coursecount;
-        if (get_config('hub', 'site_usersnumber_' . $cleanhuburl) == -1) {
-            $usercount = -1;
-        } else {
-            $usercount = $DB->count_records('user', array('deleted' => 0));
-        }
-        $siteinfo['users'] = $usercount;
-
-        if (get_config('hub', 'site_roleassignmentsnumber_' . $cleanhuburl) == -1) {
-            $roleassigncount = -1;
-        } else {
-            $roleassigncount = $DB->count_records('role_assignments');
-        }
-        $siteinfo['enrolments'] = $roleassigncount;
-        if (get_config('hub', 'site_postsnumber_' . $cleanhuburl) == -1) {
-            $postcount = -1;
-        } else {
-            $postcount = $DB->count_records('forum_posts');
-        }
-        $siteinfo['posts'] = $postcount;
-        if (get_config('hub', 'site_questionsnumber_' . $cleanhuburl) == -1) {
-            $questioncount = -1;
-        } else {
-            $questioncount = $DB->count_records('question');
-        }
-        $siteinfo['questions'] = $questioncount;
-        if (get_config('hub', 'site_resourcesnumber_' . $cleanhuburl) == -1) {
-            $resourcecount = -1;
-        } else {
-            $resourcecount = $DB->count_records('resource');
-        }
-        $siteinfo['resources'] = $resourcecount;
-        //TODO
-        require_once($CFG->dirroot . "/course/lib.php");
-        if (get_config('hub', 'site_participantnumberaverage_' . $cleanhuburl) == -1) {
-            $participantnumberaverage = -1;
-        } else {
-            $participantnumberaverage = average_number_of_participants();
-        }
-        $siteinfo['participantnumberaverage'] = $participantnumberaverage;
-        if (get_config('hub', 'site_modulenumberaverage_' . $cleanhuburl) == -1) {
-            $modulenumberaverage = -1;
-        } else {
-            $modulenumberaverage = average_number_of_courses_modules();
-        }
-        $siteinfo['modulenumberaverage'] = $modulenumberaverage;
-        $siteinfo['language'] = get_config('hub', 'site_language_' . $cleanhuburl);
-        $siteinfo['moodleversion'] = $CFG->version;
-        $siteinfo['moodlerelease'] = $CFG->release;
-        $siteinfo['url'] = $CFG->wwwroot;
-
-        return $siteinfo;
-    }
-
-    /**
-     * Retrieve the site privacy string matching the define value
-     * @param string $privacy must match the define into moodlelib.php
-     * @return string
-     */
-    public function get_site_privacy_string($privacy) {
-        switch ($privacy) {
-            case HUB_SITENOTPUBLISHED:
-                $privacystring = get_string('siteprivacynotpublished', 'hub');
-                break;
-            case HUB_SITENAMEPUBLISHED:
-                $privacystring = get_string('siteprivacypublished', 'hub');
-                break;
-            case HUB_SITELINKPUBLISHED:
-                $privacystring = get_string('siteprivacylinked', 'hub');
-                break;
-        }
-        if (empty($privacystring)) {
-            throw new moodle_exception('unknownprivacy');
-        }
-        return $privacystring;
-    }
-
-}
-?>

admin/registration/register.php

@@ -1,158 +0,0 @@
-<?php
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// This file is part of Moodle - http://moodle.org/                      //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//                                                                       //
-// Moodle is free software: you can redistribute it and/or modify        //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation, either version 3 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// Moodle is distributed in the hope that it will be useful,             //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details.                          //
-//                                                                       //
-// You should have received a copy of the GNU General Public License     //
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.       //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/*
- * @package    moodle
- * @subpackage registration
- * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
- * @copyright  (C) 1999 onwards Martin Dougiamas  http://dougiamas.com
- *
- * This page displays the site registration form for Moodle.org/MOOCH or for a different hub.
- * It handles redirection to the hub to continue the registration workflow process.
- * It also handles update operation by web service.
- */
-
-
-require_once('../../config.php');
-require_once($CFG->libdir . '/adminlib.php');
-require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/forms.php');
-require_once($CFG->dirroot . '/webservice/lib.php');
-require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
-
-$huburl = required_param('huburl', PARAM_URL);
-$huburl = rtrim($huburl, "/");
-
-if ($huburl == HUB_MOODLEORGHUBURL) { // register to Moodle.org
-    admin_externalpage_setup('registrationmoodleorg');
-} else { //register to a hub
-    admin_externalpage_setup('registrationhub');
-}
-
-$password = optional_param('password', '', PARAM_TEXT);
-$hubname = optional_param('hubname', '', PARAM_TEXT);
-
-$registrationmanager = new registration_manager();
-
-$registeredhub = $registrationmanager->get_registeredhub($huburl);
-
-$siteregistrationform = new site_registration_form('',
-                array('alreadyregistered' => !empty($registeredhub->token),
-                    'huburl' => $huburl, 'hubname' => $hubname,
-                    'password' => $password));
-$fromform = $siteregistrationform->get_data();
-
-if (!empty($fromform) and confirm_sesskey()) {
-    //save the settings
-    $cleanhuburl = clean_param($huburl, PARAM_ALPHANUMEXT);
-    set_config('site_name_' . $cleanhuburl, $fromform->name, 'hub');
-    set_config('site_description_' . $cleanhuburl, $fromform->description, 'hub');
-    set_config('site_contactname_' . $cleanhuburl, $fromform->contactname, 'hub');
-    set_config('site_contactemail_' . $cleanhuburl, $fromform->contactemail, 'hub');
-    set_config('site_contactphone_' . $cleanhuburl, $fromform->contactphone, 'hub');
-    set_config('site_imageurl_' . $cleanhuburl, $fromform->imageurl, 'hub');
-    set_config('site_privacy_' . $cleanhuburl, $fromform->privacy, 'hub');
-    set_config('site_address_' . $cleanhuburl, $fromform->address, 'hub');
-    set_config('site_region_' . $cleanhuburl, $fromform->regioncode, 'hub');
-    set_config('site_country_' . $cleanhuburl, $fromform->countrycode, 'hub');
-    set_config('site_language_' . $cleanhuburl, $fromform->language, 'hub');
-    set_config('site_geolocation_' . $cleanhuburl, $fromform->geolocation, 'hub');
-    set_config('site_contactable_' . $cleanhuburl, $fromform->contactable, 'hub');
-    set_config('site_emailalert_' . $cleanhuburl, $fromform->emailalert, 'hub');
-    set_config('site_coursesnumber_' . $cleanhuburl, $fromform->courses, 'hub');
-    set_config('site_usersnumber_' . $cleanhuburl, $fromform->users, 'hub');
-    set_config('site_roleassignmentsnumber_' . $cleanhuburl, $fromform->roleassignments, 'hub');
-    set_config('site_postsnumber_' . $cleanhuburl, $fromform->posts, 'hub');
-    set_config('site_questionsnumber_' . $cleanhuburl, $fromform->questions, 'hub');
-    set_config('site_resourcesnumber_' . $cleanhuburl, $fromform->resources, 'hub');
-    set_config('site_modulenumberaverage_' . $cleanhuburl, $fromform->modulenumberaverage, 'hub');
-    set_config('site_participantnumberaverage_' . $cleanhuburl, $fromform->participantnumberaverage, 'hub');
-}
-
-/////// UPDATE ACTION ////////
-
-// update the hub registration
-$update = optional_param('update', 0, PARAM_INT);
-if ($update and confirm_sesskey()) {
-
-    //update the registration
-    $function = 'hub_update_site_info';
-    $siteinfo = $registrationmanager->get_site_info($huburl);
-    $params = array('siteinfo' => $siteinfo);
-    $serverurl = $huburl . "/local/hub/webservice/webservices.php";
-    require_once($CFG->dirroot . "/webservice/xmlrpc/lib.php");
-    $xmlrpcclient = new webservice_xmlrpc_client($serverurl, $registeredhub->token);
-    try {
-        $result = $xmlrpcclient->call($function, $params);
-    } catch (Exception $e) {
-        $error = $OUTPUT->notification(get_string('errorregistration', 'hub', $e->getMessage()));
-    }
-}
-
-/////// FORM REGISTRATION ACTION //////
-
-if (!empty($fromform) and empty($update) and confirm_sesskey()) {
-
-    if (!empty($fromform) and confirm_sesskey()) { // if the register button has been clicked
-        $params = (array) $fromform; //we are using the form input as the redirection parameters (token, url and name)
-
-        $unconfirmedhub = $registrationmanager->get_unconfirmedhub($huburl);
-        if (empty($unconfirmedhub)) {
-            //we save the token into the communication table in order to have a reference
-            $unconfirmedhub = new stdClass();
-            $unconfirmedhub->token = $registrationmanager->get_site_secret_for_hub($huburl);
-            $unconfirmedhub->secret = $unconfirmedhub->token;
-            $unconfirmedhub->huburl = $huburl;
-            $unconfirmedhub->hubname = $hubname;
-            $unconfirmedhub->confirmed = 0;
-            $unconfirmedhub->id = $registrationmanager->add_registeredhub($unconfirmedhub);
-        }
-
-        $params['token'] = $unconfirmedhub->token;
-        $params['url'] = $CFG->wwwroot;
-        redirect(new moodle_url($huburl . '/local/hub/siteregistration.php', $params));
-    }
-}
-
-/////// OUTPUT SECTION /////////////
-
-echo $OUTPUT->header();
-//Display update notification result
-if (!empty($registeredhub->confirmed)) {
-    if (!empty($result)) {
-        echo $OUTPUT->notification(get_string('siteregistrationupdated', 'hub'), 'notifysuccess');
-    }
-}
-
-if (!empty($error)) {
-    echo $error;
-}
-
-//some Moodle.org resitration explanation
-if ($huburl == HUB_MOODLEORGHUBURL) {
-    echo $OUTPUT->heading(get_string('registerwithmoodleorg', 'admin'));
-    $renderer = $PAGE->get_renderer('core', 'register');
-    echo $renderer->moodleorg_registration_message();
-}
-
-$siteregistrationform->display();
-echo $OUTPUT->footer();

admin/registration/renderer.php

@@ -1,95 +0,0 @@
-<?php
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// This file is part of Moodle - http://moodle.org/                      //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//                                                                       //
-// 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/>.       //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/**
- * Registration renderer.
- * @package   moodle
- * @subpackage registration
- * @copyright 2010 Moodle Pty Ltd (http://moodle.com)
- * @author    Jerome Mouneyrac
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class core_register_renderer extends plugin_renderer_base {
-
-    /**
-     * Display Moodle.org registration message about benefit to register on Moodle.org
-     *
-     * @return string
-     */
-    public function moodleorg_registration_message() {
-        $moodleorgurl = html_writer::link('http://moodle.org', 'Moodle.org');
-        $moodleorgstatsurl = html_writer::link('http://moodle.org/stats', get_string('statsmoodleorg', 'admin'));
-        $moochurl = html_writer::link(HUB_MOODLEORGHUBURL, 'MOOCH');
-        $moodleorgregmsg = get_string('registermoodleorg', 'admin', $moodleorgurl);
-        $items = array(get_string('registermoodleorgli1', 'admin'),
-            get_string('registermoodleorgli2', 'admin', $moodleorgstatsurl),
-            get_string('registermoodleorgli3', 'admin', $moochurl));
-        $moodleorgregmsg .= html_writer::alist($items);
-        return $moodleorgregmsg;
-    }
-
-    /**
-     * Display a box message confirming a site registration (add or update)
-     * @param string $confirmationmessage
-     * @return string
-     */
-    public function registration_confirmation($confirmationmessage) {
-        $linktositelist = html_writer::tag('a', get_string('sitelist', 'hub'),
-                        array('href' => new moodle_url('/local/hub/index.php')));
-        $message = $confirmationmessage . html_writer::empty_tag('br') . $linktositelist;
-        return $this->output->box($message);
-    }
-
-    /**
-     * Display the listing of registered on hub
-     */
-    public function registeredonhublisting($hubs) {
-        global $CFG;
-        $table = new html_table();
-        $table->head = array(get_string('hub', 'hub'), get_string('operation', 'hub'));
-        $table->size = array('80%', '20%');
-
-        foreach ($hubs as $hub) {
-            if ($hub->huburl == HUB_MOODLEORGHUBURL) {
-                $hub->hubname = get_string('registeredmoodleorg', 'hub', $hub->hubname);
-            }
-            $hublink = html_writer::tag('a', $hub->hubname, array('href' => $hub->huburl));
-            $hublinkcell = html_writer::tag('div', $hublink, array('class' => 'registeredhubrow'));
-
-            $unregisterhuburl = new moodle_url("/" . $CFG->admin . "/registration/index.php",
-                            array('sesskey' => sesskey(), 'huburl' => $hub->huburl,
-                                'unregistration' => 1));
-            $unregisterbutton = new single_button($unregisterhuburl,
-                            get_string('unregister', 'hub'));
-            $unregisterbutton->class = 'centeredbutton';
-            $unregisterbuttonhtml = $this->output->render($unregisterbutton);
-
-            //add button cells
-            $cells = array($hublinkcell, $unregisterbuttonhtml);
-            $row = new html_table_row($cells);
-            $table->data[] = $row;
-        }
-
-        return html_writer::table($table);
-    }
-
-}

admin/registration/renewregistration.php

@@ -1,76 +0,0 @@
-<?php
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// This file is part of Moodle - http://moodle.org/                      //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//                                                                       //
-// Moodle is free software: you can redistribute it and/or modify        //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation, either version 3 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// Moodle is distributed in the hope that it will be useful,             //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details.                          //
-//                                                                       //
-// You should have received a copy of the GNU General Public License     //
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.       //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/*
- * @package    moodle
- * @subpackage registration
- * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
- * @copyright  (C) 1999 onwards Martin Dougiamas  http://dougiamas.com
- *
- * The administrator is redirect to this page from the hub to renew a registration
- * process because
- */
-
-require('../../config.php');
-require_once($CFG->libdir . '/adminlib.php');
-require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
-
-$url = optional_param('url', '', PARAM_URL);
-$hubname = optional_param('hubname', '', PARAM_TEXT);
-$token = optional_param('token', '', PARAM_TEXT);
-
-admin_externalpage_setup('registrationhubs');
-
-//check that we are waiting a confirmation from this hub, and check that the token is correct
-$registrationmanager = new registration_manager();
-$registeredhub = $registrationmanager->get_unconfirmedhub($url);
-if (!empty($registeredhub) and $registeredhub->token == $token) {
-
-    echo $OUTPUT->header();
-    echo $OUTPUT->heading(get_string('renewregistration', 'hub'), 3, 'main');
-    $hublink = html_writer::tag('a', $hubname, array('href' => $url));
-
-    $registrationmanager->delete_registeredhub($url);
-
-    //Mooch case, need to recreate the siteidentifier
-    if ($url == HUB_MOODLEORGHUBURL) {
-        $CFG->siteidentifier = null;
-        get_site_identifier();
-    }
-
-    $deletedregmsg = get_string('previousregistrationdeleted', 'hub', $hublink);
-
-    $button = new single_button(new moodle_url('/admin/registration/index.php'),
-                    get_string('restartregistration', 'hub'));
-    $button->class = 'restartregbutton';
-
-    echo html_writer::tag('div', $deletedregmsg . $OUTPUT->render($button),
-            array('class' => 'mdl-align'));
-
-    echo $OUTPUT->footer();
-} else {
-    throw new moodle_exception('wrongtoken', 'hub',
-            $CFG->wwwroot . '/' . $CFG->admin . '/registration/index.php');
-}
-
-

admin/replace.php

@@ -0,0 +1,78 @@
+<?php /// $Id$
+      /// Search and replace strings throughout all texts in the whole database
+
+require_once('../config.php');
+require_once($CFG->dirroot.'/course/lib.php');
+require_once($CFG->libdir.'/adminlib.php');
+$adminroot = admin_get_root();
+admin_externalpage_setup('replace', $adminroot);
+
+$search  = optional_param('search', '', PARAM_RAW);
+$replace = optional_param('replace', '', PARAM_RAW);
+
+require_login();
+
+require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+
+###################################################################
+admin_externalpage_print_header($adminroot);
+
+print_heading('Search and replace text throughout the whole database');
+
+
+if (!data_submitted() or !$search or !$replace or !confirm_sesskey()) {   /// Print a form
+
+    print_simple_box_start('center');
+    echo '<div align="center">';
+    echo '<form action="replace.php" method="post">';
+    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'">';
+    echo 'Search whole database for: <input type="text" name="search"><br />';
+    echo 'Replace with this string: <input type="text" name="replace"><br /></br />';
+    echo '<input type="submit" value="Yes, do it now"><br />';
+    echo '</form>';
+    echo '</div>';
+    print_simple_box_end();
+    admin_externalpage_print_footer($adminroot);
+    die;
+}
+
+
+if (!$tables = $db->Metatables() ) {    // No tables yet at all.
+    error("no tables");
+}
+
+print_simple_box_start('center');
+
+/// Turn off time limits, sometimes upgrades can be slow.
+
+@set_time_limit(0);
+@ob_implicit_flush(true);
+while(@ob_end_flush());
+
+foreach ($tables as $table) {
+    if (in_array($table, array($CFG->prefix.'config'))) {      // Don't process these
+        continue;
+    }
+    if ($columns = $db->MetaColumns($table, false)) {
+        foreach ($columns as $column => $data) {
+            if (in_array($data->type, array('text','mediumtext','longtext','varchar'))) {  // Text stuff only
+                $db->debug = true;
+                execute_sql("UPDATE $table SET $column = REPLACE($column, '$search', '$replace');");
+                $db->debug = false;
+            }
+        }
+    }
+}
+
+print_simple_box_end();
+
+/// Rebuild course cache which might be incorrect now
+notify('Rebuilding course cache...');
+rebuild_course_cache();
+notify('...finished');
+
+print_continue('index.php');
+
+admin_externalpage_print_footer($adminroot);
+
+?>

admin/report/courseoverview/index.php

@@ -0,0 +1,120 @@
+<?php
+
+    require_once('../../../config.php');
+    require_once($CFG->dirroot.'/lib/statslib.php');
+    require_once($CFG->libdir.'/adminlib.php');
+
+    $adminroot = admin_get_root();
+
+    admin_externalpage_setup('reportcourseoverview', $adminroot);
+
+    admin_externalpage_print_header($adminroot);
+
+    $report     = optional_param('report', STATS_REPORT_ACTIVE_COURSES, PARAM_INT);
+    $time       = optional_param('time', 0, PARAM_INT);
+    $numcourses = optional_param('numcourses', 20, PARAM_INT);
+
+    require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM, SITEID));  // needed?
+
+    if (empty($CFG->enablestats)) {
+        redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=stats", get_string('mustenablestats', 'admin'));
+    }
+
+
+    $course = get_site();
+    stats_check_uptodate($course->id);
+
+    $strreports = get_string('reports');
+    $strcourseoverview = get_string('courseoverview');
+
+    $reportoptions = stats_get_report_options($course->id,STATS_MODE_RANKED);
+
+    $tableprefix = $CFG->prefix.'stats_';
+
+    $earliestday = get_field_sql('SELECT timeend FROM '.$tableprefix.'daily ORDER BY timeend');
+    $earliestweek = get_field_sql('SELECT timeend FROM '.$tableprefix.'weekly ORDER BY timeend');
+    $earliestmonth = get_field_sql('SELECT timeend FROM '.$tableprefix.'monthly ORDER BY timeend');
+
+    if (empty($earliestday)) $earliestday = time();
+    if (empty($earliestweek)) $earliestweek = time();
+    if (empty($earliestmonth)) $earliestmonth = time();
+
+    $now = stats_get_base_daily();
+    $lastweekend = stats_get_base_weekly();
+    $lastmonthend = stats_get_base_monthly();
+
+    $timeoptions = stats_get_time_options($now,$lastweekend,$lastmonthend,$earliestday,$earliestweek,$earliestmonth);
+
+    if (empty($timeoptions)) {
+        error(get_string('nostatstodisplay'), $CFG->wwwroot.'/course/view.php?id='.$course->id);
+    }
+
+    echo '<form action="index.php" method="post">'."\n";
+
+    $table->width = '*';
+
+    $table->align = array('left','left','left','left','left','left');
+    $table->data[] = array(get_string('statsreporttype'),choose_from_menu($reportoptions,'report',$report,'','','',true),
+                           get_string('statstimeperiod'),choose_from_menu($timeoptions,'time',$time,'','','',true),
+                           '<input type="text" name="numcourses" size="3" maxlength="2" value="'.$numcourses.'" />',
+                           '<input type="submit" value="'.get_string('view').'" />') ;
+
+    print_table($table);
+    echo '</form>';
+
+    if (!empty($report) && !empty($time)) {
+        $param = stats_get_parameters($time,$report,SITEID,STATS_MODE_RANKED);
+
+        if (!empty($param->sql)) {
+            $sql = $param->sql;
+        } else {
+            $sql = "SELECT courseid,".$param->fields." FROM ".$CFG->prefix.'stats_'.$param->table
+                ." WHERE timeend >= ".$param->timeafter.' AND stattype = \'activity\''
+                ." GROUP BY courseid "
+                .$param->extras
+                ." ORDER BY ".$param->orderby;
+        }
+        error_log($sql);
+
+        $courses = get_records_sql($sql, 0, $numcourses);
+
+        if (empty($courses)) {
+            notify(get_string('statsnodata'));
+
+        } else {
+            if (empty($CFG->gdversion)) {
+                echo '<div align="center">(' . get_string("gdneed") .')</div>';
+            } else {
+                echo '<div align="center"><img src="'.$CFG->wwwroot.'/'.$CFG->admin.'/report/courseoverview/reportsgraph.php?time='.$time.'&report='.$report.'&numcourses='.$numcourses.'" /></div>';
+            }
+
+            $table = new StdClass;
+            $table->align = array('left','center','center','center');
+            $table->head = array(get_string('course'),$param->line1);
+            if (!empty($param->line2)) {
+                $table->head[] = $param->line2;
+            }
+            if (!empty($param->line3)) {
+                $table->head[] = $param->line3;
+            }
+
+            foreach  ($courses as $c) {
+                $a = array();
+                $a[] = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$c->courseid.'">'.get_field('course','shortname','id',$c->courseid).'</a>';
+
+                $a[] = $c->line1;
+                if (isset($c->line2)) {
+                    $a[] = $c->line2;
+                }
+                if (isset($c->line3)) {
+                    $a[] = round($c->line3,2);
+                }
+                $table->data[] = $a;
+            }
+            print_table($table);
+        }
+    }
+
+    admin_externalpage_print_footer($adminroot);
+
+?>

admin/report/courseoverview/reportsgraph.php

@@ -0,0 +1,57 @@
+<?php // $Id$
+
+    require_once('../../../config.php');
+    require_once($CFG->dirroot.'/lib/statslib.php');
+    require_once($CFG->dirroot.'/lib/graphlib.php');
+
+    $report     = required_param('report', PARAM_INT);
+    $time       = required_param('time', PARAM_INT);
+    $numcourses = required_param('numcourses', PARAM_INT);
+
+    require_login();
+
+    require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM, SITEID));
+
+    stats_check_uptodate($course->id);
+
+    $param = stats_get_parameters($time,$report,SITEID,STATS_MODE_RANKED);
+
+    if (!empty($param->sql)) {
+        $sql = $param->sql;
+    } else {
+        $sql = "SELECT courseid,".$param->fields." FROM ".$CFG->prefix.'stats_'.$param->table
+            ." WHERE timeend >= ".$param->timeafter.' AND stattype = \'activity\''
+            ." GROUP BY courseid "
+            .$param->extras
+            ." ORDER BY ".$param->orderby;
+    }
+
+    $courses = get_records_sql($sql, 0, $numcourses);
+
+    if (empty($courses)) {
+        error(get_string('statsnodata'),$CFG->wwwroot.'/'.$CFG->admin.'/report/course/index.php');
+    }
+
+
+    $graph = new graph(750,400);
+
+    $graph->parameter['legend'] = 'outside-right';
+    $graph->parameter['legend_size'] = 10;
+    $graph->parameter['x_axis_angle'] = 90;
+    $graph->parameter['title'] = false; // moodle will do a nicer job.
+    $graph->y_tick_labels = null;
+    $graph->offset_relation = null;
+    if ($report != STATS_REPORT_ACTIVE_COURSES) {
+        $graph->parameter['y_decimal_left'] = 2;
+    }
+
+    foreach ($courses as $c) {
+        $graph->x_data[] = get_field('course','shortname','id',$c->courseid);
+        $graph->y_data['bar1'][] = $c->{$param->graphline};
+    }
+    $graph->y_order = array('bar1');
+    $graph->y_format['bar1'] = array('colour' => 'blue','bar' => 'fill','legend' => $param->{$param->graphline});
+
+    $graph->draw_stack();
+
+?>

admin/report/log/index.php

@@ -0,0 +1,31 @@
+<?php // $Id$
+
+    require_once('../../../config.php');
+    require_once($CFG->dirroot.'/course/lib.php');
+    require_once($CFG->dirroot.'/course/report/log/lib.php');
+    require_once($CFG->libdir.'/adminlib.php');
+
+    $adminroot = admin_get_root();
+
+    admin_externalpage_setup('reportlog', $adminroot);
+
+    admin_externalpage_print_header($adminroot);
+
+
+    $course = get_site();
+
+    print_heading(get_string('chooselogs') .':');
+
+    print_log_selector_form($course);
+
+    echo '<br />';
+    print_heading(get_string('chooselivelogs') .':');
+
+    echo '<center><h3>';
+    link_to_popup_window('/course/report/log/live.php?id='. $course->id,'livelog', get_string('livelogs'), 500, 800);
+    echo '</h3></center>';
+
+
+    admin_externalpage_print_footer($adminroot);
+
+?>

admin/report/simpletest/ex_reporter.php

@@ -0,0 +1,195 @@
+<?php
+/**
+ * A SimpleTest report format for Moodle.
+ *
+ * @copyright &copy; 2006 The Open University
+ * @author N.D.Freear@open.ac.uk, T.J.Hunt@open.ac.uk
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @version $Id$
+ * @package SimpleTestEx
+ */
+
+/** */
+require_once(dirname(__FILE__) . '/../../../config.php');
+require_once($CFG->libdir . '/moodlelib.php');
+require_once($CFG->libdir . '/simpletestlib/reporter.php');
+
+/**
+ * Extended in-browser test displayer. HtmlReporter generates
+ * only failure messages and a pass count. ExHtmlReporter also
+ * generates pass messages and a time-stamp.
+ *
+ * @package SimpleTestEx
+ */
+class ExHtmlReporter extends HtmlReporter {
+
+    // Options set when the class is created.
+    var $showpasses;
+
+    // Lang strings. Set in the constructor.
+    var $strrunonlyfolder;
+    var $strrunonlyfile;
+
+    var $strseparator;
+
+    /**
+     * Constructor.
+     *
+     * @param bool $showpasses Whether this reporter should output anything for passes.
+     */
+    function ExHtmlReporter($showpasses) {
+        global $CFG;
+
+        $this->HtmlReporter();
+        $this->showpasses = $showpasses;
+
+        $this->strrunonlyfolder = $this->get_string('runonlyfolder');
+        $this->strrunonlyfile = $this->get_string('runonlyfile');
+        $this->strseparator = ' <img src="' . $CFG->pixpath . '/a/r_breadcrumb.gif" class="resize" alt="" /> ';
+    }
+
+    /**
+     * Called when a pass needs to be output.
+     */
+    function paintPass($message) {
+        //(Implicitly call grandparent, as parent not implemented.)
+        parent::paintPass($message);
+        if ($this->showpasses) {
+            $this->_paintPassFail('pass', $message);
+        }
+    }
+
+    /**
+     * Called when a fail needs to be output.
+     */
+    function paintFail($message) {
+        // Explicitly call grandparent, not parent::paintFail.
+        SimpleScorer::paintFail($message);
+        $this->_paintPassFail('fail', $message);
+    }
+
+    /**
+     * Called when an error (uncaught exception or PHP error) needs to be output.
+     */
+    function paintError($message) {
+        // Explicitly call grandparent, not parent::paintFail.
+        SimpleScorer::paintError($message);
+        $this->_paintPassFail('exception', $message);
+    }
+
+    /**
+     * Private method. Used by printPass/Fail/Error.
+     */
+    function _paintPassFail($passorfail, $message) {
+        global $FULLME, $CFG;
+
+        print_simple_box_start('', '100%', '', 5, $passorfail . ' generalbox');
+        $url = $this->_htmlEntities($this->_stripParameterFromUrl($FULLME, 'path'));
+        echo '<b class="', $passorfail, '">', $this->get_string($passorfail), '</b>: ';
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        $file = array_shift($breadcrumb);
+        $pathbits = preg_split('/\/|\\\\/', substr($file, strlen($CFG->dirroot) + 1));
+        $file = array_pop($pathbits);
+        $folder = '';
+        foreach ($pathbits as $pathbit) {
+            $folder .= $pathbit . '/';
+            echo "<a href=\"{$url}path=$folder\" title=\"$this->strrunonlyfolder\">$pathbit</a>/";
+        }
+        echo "<a href=\"{$url}path=$folder$file\" title=\"$this->strrunonlyfile\">$file</a>";
+        echo $this->strseparator, implode($this->strseparator, $breadcrumb);
+        echo $this->strseparator, '<br />', $this->_htmlEntities($message), "\n\n";
+        print_simple_box_end();
+        flush();
+    }
+
+    /**
+     * Called when a notice needs to be output.
+     */
+    function paintNotice($message) {
+        $this->paintMessage($this->_htmlEntities($message));
+    }
+
+    /**
+     * Paints a simple supplementary message.
+     * @param string $message Text to display.
+     */
+    function paintMessage($message) {
+        if ($this->showpasses) {
+            print_simple_box_start('', '100%');
+            echo '<span class="notice">', $this->get_string('notice'), '</span>: ';
+            $breadcrumb = $this->getTestList();
+            array_shift($breadcrumb);
+            echo implode($this->strseparator, $breadcrumb);
+            echo $this->strseparator, '<br />', $message, "\n";
+            print_simple_box_end();
+            flush();
+        }
+    }
+
+    /**
+     * Output anything that should appear above all the test output.
+     */
+    function paintHeader($test_name) {
+        // We do this the moodle way instead.
+    }
+
+    /**
+     * Output anything that should appear below all the test output, e.g. summary information.
+     */
+    function paintFooter($test_name) {
+        $summarydata = new stdClass;
+        $summarydata->run = $this->getTestCaseProgress();
+        $summarydata->total = $this->getTestCaseCount();
+        $summarydata->passes = $this->getPassCount();
+        $summarydata->fails = $this->getFailCount();
+        $summarydata->exceptions = $this->getExceptionCount();
+
+        if ($summarydata->fails == 0 && $summarydata->exceptions == 0) {
+            $status = "pass";
+        } else {
+            $status = "fail";
+        }
+        echo '<div class="unittestsummary ', $status, '">';
+        echo $this->get_string('summary', $summarydata);
+        echo '</div>';
+
+        echo '<div class="performanceinfo">',
+                $this->get_string('runat', date('<b>d-m-Y H:i T</b>')),
+                $this->get_string('version', SimpleTestOptions::getVersion()),
+                '</div>';
+    }
+
+    /**
+     * Strip a specified parameter from the query string of a URL, if present.
+     * Adds a separator to the end of the URL, so that a new parameter
+     * can easily be appended. For example (assuming $param = 'frog'):
+     *
+     * http://example.com/index.php               -> http://example.com/index.php?
+     * http://example.com/index.php?frog=1        -> http://example.com/index.php?
+     * http://example.com/index.php?toad=1        -> http://example.com/index.php?toad=1&
+     * http://example.com/index.php?frog=1&toad=1 -> http://example.com/index.php?toad=1&
+     *
+     * @param string $url the URL to modify.
+     * @param string $param the parameter to strip from the URL, if present.
+     *
+     * @return string The modified URL.
+     */
+    function _stripParameterFromUrl($url, $param) {
+        $url = preg_replace('/(\?|&)' . $param . '=[^&]*&?/', '$1', $url);
+        if (strpos($url, '?') === false) {
+            $url = $url . '?';
+        } else {
+            $url = $url . '&';
+        }
+        return $url;
+    }
+
+    /**
+     * Look up a lang string in the appropriate file.
+     */
+    function get_string($identifier, $a = NULL) {
+        return get_string($identifier, 'simpletest', $a);
+    }
+}
+?>

admin/report/simpletest/ex_simple_test.php

@@ -0,0 +1,208 @@
+<?php
+/**
+ * A SimpleTest GroupTest that automatically finds all the
+ * test files in a directory tree according to certain rules.
+ *
+ * @copyright &copy; 2006 The Open University
+ * @author N.D.Freear@open.ac.uk, T.J.Hunt@open.ac.uk
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @version $Id$
+ * @package SimpleTestEx
+ */
+
+/** */
+require_once(dirname(__FILE__) . '/../../../config.php');
+require_once($CFG->libdir . '/simpletestlib/test_case.php');
+
+/**
+ * This is a composite test class for finding test cases and
+ * other RunnableTest classes in a directory tree and combining
+ * them into a group test.
+ * @package SimpleTestEx
+ */
+class AutoGroupTest extends GroupTest {
+
+    var $thorough;
+    var $showsearch;
+
+    function AutoGroupTest($showsearch, $thorough, $test_name = null) {
+        $this->GroupTest($test_name);
+        $this->showsearch = $showsearch;
+        $this->thorough = $thorough;
+    }
+
+    function setLabel($test_name) {
+        //:HACK: there is no GroupTest::setLabel, so access parent::_label.
+        $this->_label = $test_name;
+    }
+
+    function addIgnoreFolder($ignorefolder) {
+        $this->ignorefolders[]=$ignorefolder;
+    }
+
+    function _recurseFolders($path) {
+        if ($this->showsearch) {
+            echo '<li>' . basename(realpath($path)) . '<ul>';
+        }
+
+        $files = scandir($path);
+        static $s_count = 0;
+
+        foreach ($files as $file) {
+            if ($file == '.' || $file == '..') {
+                continue;
+            }
+            $file_path = $path . '/' . $file;
+            if (is_dir($file_path)) {
+                if ($file != 'CVS' && !in_array($file_path, $this->ignorefolders)) {
+                    $this->_recurseFolders($file_path);
+                }
+            } elseif (preg_match('/simpletest(\/|\\\\)test.*\.php$/', $file_path) ||
+                    ($this->thorough && preg_match('/simpletest(\/|\\\\)slowtest.*\.php$/', $file_path))) {
+
+                $s_count++;
+                // OK, found: this shows as a 'Notice' for any 'simpletest/test*.php' file.
+                $this->addTestCase(new FindFileNotice($file_path, 'Found unit test file, '. $s_count));
+
+                // addTestFile: Unfortunately this doesn't return fail/success (bool).
+                $this->addTestFile($file_path, true);
+            }
+        }
+
+        if ($this->showsearch) {
+            echo '</ul></li>';
+        }
+        return $s_count;
+    }
+
+    function findTestFiles($dir) {
+        if ($this->showsearch) {
+            echo '<p>Searching folder: ' . realpath($dir) . '</p><ul>';
+        }
+        $path = $dir;
+        $count = $this->_recurseFolders($path);
+        if ($count <= 0) {
+            $this->addTestCase(new BadAutoGroupTest($path, 'Search complete. No unit test files found'));
+        } else {
+            $this->addTestCase(new AutoGroupTestNotice($path, 'Search complete. Total unit test files found: '. $count));
+        }
+        if ($this->showsearch) {
+                echo '</ul>';
+        }
+        return $count;
+    }
+
+    function addTestFile($file, $internalcall = false) {
+        if ($this->showsearch) {
+            if ($internalcall) {
+                echo '<li><b>' . basename($file) . '</b></li>';
+            } else {
+                echo '<p>Adding test file: ' . realpath($file) . '</p>';
+            }
+            // Make sure that syntax errors show up suring the search, otherwise you often
+            // get blank screens because evil people turn down error_reporting elsewhere.
+            error_reporting(E_ALL);
+        }
+        if(!is_file($file) ){
+            parent::addTestCase(new BadTest($file, 'Not a file or does not exist'));
+        }
+        parent::addTestFile($file);
+    }
+}
+
+
+/* ======================================================================= */
+// get_class_ex: Insert spaces to prettify the class-name.
+function get_class_ex($object) {
+    return preg_replace('/(.?)([A-Z])/', '${1} ${2}', get_class($object));
+}
+
+
+/**
+ * A failing test base-class for when a test suite has NOT loaded properly.
+ * See class, simple_test.php: BadGroupTest.
+ * @package SimpleTestEx
+ */
+class BadTest {
+
+    var $label;
+    var $error;
+
+    function BadTest($label, $error) {
+        $this->label = $label;
+        $this->error = $error;
+    }
+
+    function getLabel() {
+        return $this->label;
+    }
+
+    function run(&$reporter) {
+        $reporter->paintGroupStart(basename(__FILE__), $this->getSize());
+        $reporter->paintFail(get_class_ex($this) .' [' . $this->getLabel() .
+                '] with error [' . $this->error . ']');
+        $reporter->paintGroupEnd($this->getLabel());
+        return $reporter->getStatus();
+    }
+
+    /**
+     * @return int the number of test cases starting.
+     */
+    function getSize() {
+        return 0;
+  }
+}
+
+/**
+ * An informational notice base-class for when a test suite is being processed.
+ * See class, simple_test.php: BadGroupTest.
+ * @package SimpleTestEx
+ */
+class Notice {
+
+    var $label;
+    var $status;
+
+    function Notice($label, $error) {
+        $this->label = $label;
+        $this->status = $error;
+    }
+
+    function getLabel() {
+        return $this->label;
+    }
+
+    function run(&$reporter) {
+        $reporter->paintGroupStart(basename(__FILE__), $this->getSize());
+        $reporter->paintNotice(get_class_ex($this) .
+                ' ['. $this->getLabel() .'] with status [' . $this->status . ']');
+        $reporter->paintGroupEnd($this->getLabel());
+        return $reporter->getStatus();
+    }
+
+    function getSize() {
+        return 0;
+    }
+}
+
+/**
+ * A failing folder test for when the test-user specifies an invalid directory
+ * (run.php?folder=woops).
+ * @package SimpleTestEx
+ */
+class BadFolderTest extends BadTest { }
+
+/**
+ * A failing auto test for when no unit test files are found.
+ * @package SimpleTestEx
+ */
+class BadAutoGroupTest extends BadTest { }
+
+/**
+ * Auto group test notices - 1. Search complete. 2. A test file has been found.
+ * @package SimpleTestEx
+ */
+class AutoGroupTestNotice extends Notice { }
+
+class FindFileNotice extends Notice { }
+?>

admin/report/simpletest/index.php

@@ -0,0 +1,109 @@
+<?php
+/**
+ * Run the unit tests.
+ *
+ * @copyright &copy; 2006 The Open University
+ * @author N.D.Freear@open.ac.uk, T.J.Hunt@open.ac.uk
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @version $Id$
+ * @package SimpleTestEx
+ */
+
+/** */
+require_once(dirname(__FILE__) . '/../../../config.php');
+require_once($CFG->libdir . '/moodlelib.php');
+require_once($CFG->libdir.'/adminlib.php');
+require_once('ex_simple_test.php');
+require_once('ex_reporter.php');
+
+require_login();
+require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+
+/* The UNITTEST constant can be checked elsewhere if you need to know
+ * when your code is being run as part of a unit test. */
+define('UNITTEST', true);
+$langfile = 'simpletest';
+
+// CGI arguments
+$path = optional_param('path', null, PARAM_PATH);
+$showpasses = optional_param('showpasses', false, PARAM_BOOL);
+$showsearch = optional_param('showsearch', false, PARAM_BOOL);
+$thorough = optional_param('thorough', false, PARAM_BOOL);
+
+// Print the header.
+$adminroot = admin_get_root();
+admin_externalpage_setup('reportsimpletest', $adminroot);
+$strtitle = get_string('unittests', $langfile);
+admin_externalpage_print_header($adminroot);
+
+if (!is_null($path)) {
+    // Create the group of tests.
+    $test =& new AutoGroupTest($showsearch, $thorough);
+
+    // OU specific. We use the _nonproject folder for stuff we want to
+    // keep in CVS, but which is not really relevant. It does no harm
+    // to leave this here.
+    $test->addIgnoreFolder($CFG->dirroot . '/_nonproject');
+
+    // Make the reporter, which is what displays the results.
+    $reporter = new ExHtmlReporter($showpasses);
+
+    if ($showsearch) {
+        print_heading('Searching for test cases');
+    }
+    flush();
+
+    // Work out what to test.
+    if (substr($path, 0, 1) == '/') {
+        $path = substr($path, 1);
+    }
+    $path = $CFG->dirroot . '/' . $path;
+    if (substr($path, -1) == '/') {
+        $path = substr($path, 0, -1);
+    }
+    $displaypath = substr($path, strlen($CFG->dirroot) + 1);
+    $ok = true;
+    if (is_file($path)) {
+        $test->addTestFile($path);
+    } else if (is_dir($path)){
+        $test->findTestFiles($path);
+    } else {
+        print_simple_box(get_string('pathdoesnotexist', $langfile, $path), '', '', '', '', 'errorbox');
+        $ok = false;
+    }
+
+    // If we have something to test, do it.
+    if ($ok) {
+        if ($path == $CFG->dirroot) {
+            $title = get_string('moodleunittests', $langfile, get_string('all', $langfile));
+        } else {
+            $title = get_string('moodleunittests', $langfile, $displaypath);
+        }
+        print_heading($title);
+        $test->run($reporter);
+    }
+
+    $formheader = get_string('retest', $langfile);
+} else {
+    $displaypath = '';
+    $formheader = get_string('rununittests', $langfile);
+}
+// Print the form for adjusting options.
+print_simple_box_start('center', '70%');
+echo '<form method="GET" action="index.php">';
+print_heading($formheader);
+echo '<p>'; print_checkbox('showpasses', 1, $showpasses, get_string('showpasses', $langfile)); echo '</p>';
+echo '<p>'; print_checkbox('showsearch', 1, $showsearch, get_string('showsearch', $langfile)); echo '</p>';
+echo '<p>'; print_checkbox('thorough', 1, $thorough, get_string('thorough', $langfile)); echo '</p>';
+echo '<p>';
+    echo '<label for="path">', get_string('onlytest', $langfile), '</label> ';
+    echo '<input type="text" id="path" name="path" value="', $displaypath, '" size="60" />';
+echo '</p>';
+echo '<input type="submit" value="' . get_string('runtests', $langfile) . '" />';
+echo '</form>';
+print_simple_box_end();
+
+// Footer.
+admin_externalpage_print_footer($adminroot);
+
+?>

admin/report/stats/index.php

@@ -0,0 +1,77 @@
+<?php  // $Id$
+
+    require_once('../../../config.php');
+    require_once($CFG->dirroot.'/lib/statslib.php');
+    require_once($CFG->dirroot.'/course/report/stats/lib.php');
+
+    require_once($CFG->libdir.'/adminlib.php');
+
+    $adminroot = admin_get_root();
+
+    admin_externalpage_setup('reportstats', $adminroot);
+
+    admin_externalpage_print_header($adminroot);
+
+
+    $courseid = optional_param('course', SITEID, PARAM_INT);
+    $report   = optional_param('report', 0, PARAM_INT);
+    $time     = optional_param('time', 0, PARAM_INT);
+    $mode     = optional_param('mode', STATS_MODE_GENERAL, PARAM_INT);
+    $userid   = optional_param('userid', 0, PARAM_INT);
+    $roleid   = 0;
+
+    if ($report > 50) {
+        $roleid = substr($report,1);
+        $report = 5;
+    }
+
+    if ($report == STATS_REPORT_USER_LOGINS) {
+        $courseid = SITEID; //override
+    }
+
+    if ($mode == STATS_MODE_RANKED) {
+        redirect($CFG->wwwroot.'/'.$CFG->admin.'/report/stats/index.php?time='.$time);
+    }
+
+    if (!$course = get_record("course","id",$courseid)) {
+        error("That's an invalid course id");
+    }
+
+    if (!empty($userid)) {
+        if (!$user = get_record('user','id',$userid)) {
+            error("That's an invalid user id");
+        }
+    }
+
+    require_login();
+
+    if (empty($CFG->enablestats)) {
+        redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=stats", get_string('mustenablestats', 'admin'));
+    }
+
+    require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_COURSE, $course->id));
+
+    add_to_log($course->id, "course", "report stats", "report/stats/index.php?course=$course->id", $course->id);
+
+    stats_check_uptodate($course->id);
+
+
+//    $strreports = get_string("reports");
+//    $strstats = get_string('stats');
+//
+//    $menu = report_stats_mode_menu($course, $mode, $time);
+//
+//
+//    $crumb = "<a href=\"{$CFG->wwwroot}/admin\">".get_string('administration')."</a> ->
+//             <a href=\"{$CFG->wwwroot}/admin/report.php\">$strreports</a> ->
+//             $strstats";
+
+//    print_header("$course->shortname: $strstats", "$course->fullname",
+//                  $crumb, '', '', true, '&nbsp;', $menu);
+
+
+    require_once($CFG->dirroot.'/course/report/stats/report.php');
+
+    admin_externalpage_print_footer($adminroot);
+
+?>

admin/reports.php

@@ -1,134 +0,0 @@
-<?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/>.
-
-/**
- * Provides an overview of installed reports
- *
- * Displays the list of found reports, their version (if found) and
- * a link to delete the report.
- *
- * The code is based on admin/localplugins.php by David Mudrak.
- *
- * @package   admin
- * @copyright 2011 Petr Skoda {@link http://skodak.org}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once(dirname(__FILE__) . '/../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->libdir.'/tablelib.php');
-
-admin_externalpage_setup('managereports');
-
-$delete  = optional_param('delete', '', PARAM_PLUGIN);
-$confirm = optional_param('confirm', '', PARAM_BOOL);
-
-/// If data submitted, then process and store.
-
-if (!empty($delete) and confirm_sesskey()) {
-    echo $OUTPUT->header();
-    echo $OUTPUT->heading(get_string('reports'));
-
-    if (!$confirm) {
-        if (get_string_manager()->string_exists('pluginname', 'report_' . $delete)) {
-            $strpluginname = get_string('pluginname', 'report_' . $delete);
-        } else {
-            $strpluginname = $delete;
-        }
-        echo $OUTPUT->confirm(get_string('reportsdeleteconfirm', 'admin', $strpluginname),
-                                new moodle_url($PAGE->url, array('delete' => $delete, 'confirm' => 1)),
-                                $PAGE->url);
-        echo $OUTPUT->footer();
-        die();
-
-    } else {
-        uninstall_plugin('report', $delete);
-        $a = new stdclass();
-        $a->name = $delete;
-        $pluginlocation = get_plugin_types();
-        $a->directory = $pluginlocation['report'] . '/' . $delete;
-        echo $OUTPUT->notification(get_string('plugindeletefiles', '', $a), 'notifysuccess');
-        echo $OUTPUT->continue_button($PAGE->url);
-        echo $OUTPUT->footer();
-        die();
-    }
-}
-
-echo $OUTPUT->header();
-echo $OUTPUT->heading(get_string('reports'));
-
-/// Print the table of all installed report plugins
-
-$table = new flexible_table('reportplugins_administration_table');
-$table->define_columns(array('name', 'version', 'delete'));
-$table->define_headers(array(get_string('plugin'), get_string('version'), get_string('delete')));
-$table->define_baseurl($PAGE->url);
-$table->set_attribute('id', 'reportplugins');
-$table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
-$table->setup();
-
-$plugins = array();
-foreach (get_plugin_list('report') as $plugin => $plugindir) {
-    if (get_string_manager()->string_exists('pluginname', 'report_' . $plugin)) {
-        $strpluginname = get_string('pluginname', 'report_' . $plugin);
-    } else {
-        $strpluginname = $plugin;
-    }
-    $plugins[$plugin] = $strpluginname;
-}
-collatorlib::asort($plugins);
-
-$like = $DB->sql_like('plugin', '?', true, true, false, '|');
-$params = array('report|_%');
-$installed = $DB->get_records_select('config_plugins', "$like AND name = 'version'", $params);
-$versions = array();
-foreach ($installed as $config) {
-    $name = preg_replace('/^report_/', '', $config->plugin);
-    $versions[$name] = $config->value;
-    if (!isset($plugins[$name])) {
-        $plugins[$name] = $name;
-    }
-}
-
-foreach ($plugins as $plugin => $name) {
-    $delete = new moodle_url($PAGE->url, array('delete' => $plugin, 'sesskey' => sesskey()));
-    $delete = html_writer::link($delete, get_string('delete'));
-
-    if (!isset($versions[$plugin])) {
-        if (file_exists("$CFG->dirroot/report/$plugin/version.php")) {
-            // not installed yet
-            $version = '?';
-        } else {
-            // no version info available
-            $version = '-';
-        }
-    } else {
-        $version = $versions[$plugin];
-        if (file_exists("$CFG->dirroot/report/$plugin")) {
-            $version = $versions[$plugin];
-        } else {
-            // somebody removed plugin without uninstall
-            $name = '<span class="notifyproblem">'.$name.' ('.get_string('missingfromdisk').')</span>';
-            $version = $versions[$plugin];
-        }
-    }
-
-    $table->add_data(array($name, $version, $delete));
-}
-
-$table->print_html();
-
-echo $OUTPUT->footer();

admin/repository.php

@@ -1,407 +0,0 @@
-<?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/>.
-
-require_once(dirname(dirname(__FILE__)) . '/config.php');
-require_once($CFG->dirroot . '/repository/lib.php');
-require_once($CFG->libdir . '/adminlib.php');
-
-$repository       = optional_param('repos', '', PARAM_ALPHANUMEXT);
-$action           = optional_param('action', '', PARAM_ACTION);
-$sure             = optional_param('sure', '', PARAM_ALPHA);
-$downloadcontents = optional_param('downloadcontents', false, PARAM_BOOL);
-
-$display = true; // fall through to normal display
-
-$pagename = 'managerepositories';
-
-if ($action == 'edit') {
-    $pagename = 'repositorysettings' . $repository;
-} else if ($action == 'delete') {
-    $pagename = 'repositorydelete';
-} else if (($action == 'newon') || ($action == 'newoff')) {
-    $pagename = 'repositorynew';
-}
-
-// Need to remember this for form
-$formaction = $action;
-
-// Check what visibility to show the new repository
-if ($action == 'newon') {
-    $action = 'new';
-    $visible = true;
-} else if ($action == 'newoff') {
-    $action = 'new';
-    $visible = false;
-}
-
-require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
-admin_externalpage_setup($pagename);
-
-$sesskeyurl = $CFG->wwwroot.'/'.$CFG->admin.'/repository.php?sesskey=' . sesskey();
-$baseurl    = $CFG->wwwroot.'/'.$CFG->admin.'/repository.php';
-
-$configstr  = get_string('manage', 'repository');
-
-$return = true;
-
-if (!empty($action)) {
-    require_sesskey();
-}
-
-/**
- * Helper function that generates a moodle_url object
- * relevant to the repository
- */
-function repository_action_url($repository) {
-    global $baseurl;
-    return new moodle_url($baseurl, array('sesskey'=>sesskey(), 'repos'=>$repository));
-}
-
-if (($action == 'edit') || ($action == 'new')) {
-    $pluginname = '';
-    if ($action == 'edit') {
-        $repositorytype = repository::get_type_by_typename($repository);
-        $classname = 'repository_' . $repositorytype->get_typename();
-        $configs = call_user_func(array($classname, 'get_type_option_names'));
-        $plugin = $repositorytype->get_typename();
-        // looking for instance to edit plugin name
-        $instanceoptions = call_user_func(array($classname, 'get_instance_option_names'));
-        if (empty($instanceoptions)) {
-            $params = array();
-            $params['type'] = $plugin;
-            $instances = repository::get_instances($params);
-            if ($instance = array_pop($instances)) {
-                // use the one form db record
-                $pluginname = $instance->instance->name;
-            }
-        }
-
-    } else {
-        $repositorytype = null;
-        $plugin = $repository;
-        $typeid = $repository;
-    }
-    $PAGE->set_pagetype('admin-repository-' . $plugin);
-    // display the edit form for this instance
-    $mform = new repository_type_form('', array('pluginname'=>$pluginname, 'plugin' => $plugin, 'instance' => $repositorytype, 'action' => $formaction));
-    $fromform = $mform->get_data();
-
-    //detect if we create a new type without config (in this case if don't want to display a setting page during creation)
-    $nosettings = false;
-    if ($action == 'new') {
-        $adminconfignames = repository::static_function($repository, 'get_type_option_names');
-        $nosettings = empty($adminconfignames);
-    }
-    // end setup, begin output
-
-    if ($mform->is_cancelled()){
-        redirect($baseurl);
-    } else if (!empty($fromform) || $nosettings) {
-        require_sesskey();
-        if ($action == 'edit') {
-            $settings = array();
-            foreach($configs as $config) {
-                if (!empty($fromform->$config)) {
-                    $settings[$config] = $fromform->$config;
-                } else {
-                    // if the config name is not appear in $fromform
-                    // empty this config value
-                    $settings[$config] = '';
-                }
-            }
-            $instanceoptionnames = repository::static_function($repository, 'get_instance_option_names');
-            if (!empty($instanceoptionnames)) {
-                if (array_key_exists('enablecourseinstances', $fromform)) {
-                    $settings['enablecourseinstances'] = $fromform->enablecourseinstances;
-                }
-                else {
-                    $settings['enablecourseinstances'] = 0;
-                }
-                if (array_key_exists('enableuserinstances', $fromform)) {
-                    $settings['enableuserinstances'] = $fromform->enableuserinstances;
-                }
-                else {
-                    $settings['enableuserinstances'] = 0;
-                }
-            }
-            $success = $repositorytype->update_options($settings);
-        } else {
-            $type = new repository_type($plugin, (array)$fromform, $visible);
-            $type->create();
-            $success = true;
-            $data = data_submitted();
-        }
-        if ($success) {
-            // configs saved
-            redirect($baseurl);
-        } else {
-            print_error('instancenotsaved', 'repository', $baseurl);
-        }
-        exit;
-    } else {
-        echo $OUTPUT->header();
-        echo $OUTPUT->heading(get_string('configplugin', 'repository_'.$plugin));
-        $displaysettingform = true;
-        if ($action == 'edit') {
-            $typeoptionnames = repository::static_function($repository, 'get_type_option_names');
-            $instanceoptionnames = repository::static_function($repository, 'get_instance_option_names');
-            if (empty($typeoptionnames) && empty($instanceoptionnames)) {
-                $displaysettingform = false;
-            }
-        }
-        if ($displaysettingform){
-            $OUTPUT->box_start();
-            $mform->display();
-            $OUTPUT->box_end();
-        }
-        $return = false;
-
-        // Display instances list and creation form
-        if ($action == 'edit') {
-            $instanceoptionnames = repository::static_function($repository, 'get_instance_option_names');
-            if (!empty($instanceoptionnames)) {
-                repository::display_instances_list(context_system::instance(), $repository);
-            }
-        }
-    }
-} else if ($action == 'show') {
-    if (!confirm_sesskey()) {
-        print_error('confirmsesskeybad', '', $baseurl);
-    }
-    $repositorytype = repository::get_type_by_typename($repository);
-    if (empty($repositorytype)) {
-        print_error('invalidplugin', 'repository', '', $repository);
-    }
-    $repositorytype->update_visibility(true);
-    $return = true;
-} else if ($action == 'hide') {
-    if (!confirm_sesskey()) {
-        print_error('confirmsesskeybad', '', $baseurl);
-    }
-    $repositorytype = repository::get_type_by_typename($repository);
-    if (empty($repositorytype)) {
-        print_error('invalidplugin', 'repository', '', $repository);
-    }
-    $repositorytype->update_visibility(false);
-    $return = true;
-} else if ($action == 'delete') {
-    $repositorytype = repository::get_type_by_typename($repository);
-    if ($sure) {
-        $PAGE->set_pagetype('admin-repository-' . $repository);
-        if (!confirm_sesskey()) {
-            print_error('confirmsesskeybad', '', $baseurl);
-        }
-
-        if ($repositorytype->delete($downloadcontents)) {
-            redirect($baseurl);
-        } else {
-            print_error('instancenotdeleted', 'repository', $baseurl);
-        }
-        exit;
-    } else {
-        echo $OUTPUT->header();
-
-        $message = get_string('confirmremove', 'repository', $repositorytype->get_readablename());
-
-        $output = $OUTPUT->box_start('generalbox', 'notice');
-        $output .= html_writer::tag('p', $message);
-
-        $removeurl = new moodle_url($sesskeyurl);
-        $removeurl->params(array(
-            'action' =>'delete',
-            'repos' => $repository,
-            'sure' => 'yes',
-        ));
-
-        $removeanddownloadurl = new moodle_url($sesskeyurl);
-        $removeanddownloadurl->params(array(
-            'action' =>'delete',
-            'repos'=> $repository,
-            'sure' => 'yes',
-            'downloadcontents' => 1,
-        ));
-
-        $output .= $OUTPUT->single_button($removeurl, get_string('continueuninstall', 'repository'));
-        $output .= $OUTPUT->single_button($removeanddownloadurl, get_string('continueuninstallanddownload', 'repository'));
-        $output .= $OUTPUT->single_button($baseurl, get_string('cancel'));
-        $output .= $OUTPUT->box_end();
-
-        echo $output;
-
-        $return = false;
-    }
-} else if ($action == 'moveup') {
-    $repositorytype = repository::get_type_by_typename($repository);
-    $repositorytype->move_order('up');
-} else if ($action == 'movedown') {
-    $repositorytype = repository::get_type_by_typename($repository);
-    $repositorytype->move_order('down');
-} else {
-    // If page is loaded directly
-    echo $OUTPUT->header();
-    echo $OUTPUT->heading(get_string('manage', 'repository'));
-
-    // Get strings that are used
-    $strshow = get_string('on', 'repository');
-    $strhide = get_string('off', 'repository');
-    $strdelete = get_string('disabled', 'repository');
-
-    $actionchoicesforexisting = array(
-        'show' => $strshow,
-        'hide' => $strhide,
-        'delete' => $strdelete
-    );
-
-    $actionchoicesfornew = array(
-        'newon' => $strshow,
-        'newoff' => $strhide,
-        'delete' => $strdelete
-    );
-
-    $output = '';
-    $output .= $OUTPUT->box_start('generalbox');
-
-    // Set strings that are used multiple times
-    $settingsstr = get_string('settings');
-    $disablestr = get_string('disable');
-
-    // Table to list plug-ins
-    $table = new html_table();
-    $table->head = array(get_string('name'), get_string('isactive', 'repository'), get_string('order'), $settingsstr);
-    $table->align = array('left', 'center', 'center', 'center', 'center');
-    $table->data = array();
-
-    // Get list of used plug-ins
-    $instances = repository::get_types();
-    if (!empty($instances)) {
-        // Array to store plugins being used
-        $alreadyplugins = array();
-        $totalinstances = count($instances);
-        $updowncount = 1;
-        foreach ($instances as $i) {
-            $settings = '';
-            $typename = $i->get_typename();
-            // Display edit link only if you can config the type or if it has multiple instances (e.g. has instance config)
-            $typeoptionnames = repository::static_function($typename, 'get_type_option_names');
-            $instanceoptionnames = repository::static_function($typename, 'get_instance_option_names');
-
-            if (!empty($typeoptionnames) || !empty($instanceoptionnames)) {
-                // Calculate number of instances in order to display them for the Moodle administrator
-                if (!empty($instanceoptionnames)) {
-                    $params = array();
-                    $params['context'] = array(context_system::instance());
-                    $params['onlyvisible'] = false;
-                    $params['type'] = $typename;
-                    $admininstancenumber = count(repository::static_function($typename, 'get_instances', $params));
-                    // site instances
-                    $admininstancenumbertext = get_string('instancesforsite', 'repository', $admininstancenumber);
-                    $params['context'] = array();
-                    $instances = repository::static_function($typename, 'get_instances', $params);
-                    $courseinstances = array();
-                    $userinstances = array();
-
-                    foreach ($instances as $instance) {
-                        if ($instance->context->contextlevel == CONTEXT_COURSE) {
-                            $courseinstances[] = $instance;
-                        } else if ($instance->context->contextlevel == CONTEXT_USER) {
-                            $userinstances[] = $instance;
-                        }
-                    }
-                    // course instances
-                    $instancenumber = count($courseinstances);
-                    $courseinstancenumbertext = get_string('instancesforcourses', 'repository', $instancenumber);
-
-                    // user private instances
-                    $instancenumber =  count($userinstances);
-                    $userinstancenumbertext = get_string('instancesforusers', 'repository', $instancenumber);
-                } else {
-                    $admininstancenumbertext = "";
-                    $courseinstancenumbertext = "";
-                    $userinstancenumbertext = "";
-                }
-
-                $settings .= '<a href="' . $sesskeyurl . '&amp;action=edit&amp;repos=' . $typename . '">' . $settingsstr .'</a>';
-
-                $settings .= $OUTPUT->container_start('mdl-left');
-                $settings .= '<br/>';
-                $settings .= $admininstancenumbertext;
-                $settings .= '<br/>';
-                $settings .= $courseinstancenumbertext;
-                $settings .= '<br/>';
-                $settings .= $userinstancenumbertext;
-                $settings .= $OUTPUT->container_end();
-            }
-            // Get the current visibility
-            if ($i->get_visible()) {
-                $currentaction = 'show';
-            } else {
-                $currentaction = 'hide';
-            }
-
-            $select = new single_select(repository_action_url($typename, 'repos'), 'action', $actionchoicesforexisting, $currentaction, null, 'applyto' . basename($typename));
-            $select->set_label(get_string('action'), array('class' => 'accesshide'));
-            // Display up/down link
-            $updown = '';
-            $spacer = $OUTPUT->spacer(array('height'=>15, 'width'=>15)); // should be done with CSS instead
-
-            if ($updowncount > 1) {
-                $updown .= "<a href=\"$sesskeyurl&amp;action=moveup&amp;repos=".$typename."\">";
-                $updown .= "<img src=\"" . $OUTPUT->pix_url('t/up') . "\" alt=\"up\" /></a>&nbsp;";
-            }
-            else {
-                $updown .= $spacer;
-            }
-            if ($updowncount < $totalinstances) {
-                $updown .= "<a href=\"$sesskeyurl&amp;action=movedown&amp;repos=".$typename."\">";
-                $updown .= "<img src=\"" . $OUTPUT->pix_url('t/down') . "\" alt=\"down\" /></a>";
-            }
-            else {
-                $updown .= $spacer;
-            }
-
-            $updowncount++;
-
-            $table->data[] = array($i->get_readablename(), $OUTPUT->render($select), $updown, $settings);
-
-            if (!in_array($typename, $alreadyplugins)) {
-                $alreadyplugins[] = $typename;
-            }
-        }
-    }
-
-    // Get all the plugins that exist on disk
-    $plugins = get_plugin_list('repository');
-    if (!empty($plugins)) {
-        foreach ($plugins as $plugin => $dir) {
-            // Check that it has not already been listed
-            if (!in_array($plugin, $alreadyplugins)) {
-                $select = new single_select(repository_action_url($plugin, 'repos'), 'action', $actionchoicesfornew, 'delete', null, 'applyto' . basename($plugin));
-                $select->set_label(get_string('action'), array('class' => 'accesshide'));
-                $table->data[] = array(get_string('pluginname', 'repository_'.$plugin), $OUTPUT->render($select), '', '');
-            }
-        }
-    }
-
-    $output .= html_writer::table($table);
-    $output .= $OUTPUT->box_end();
-    print $output;
-    $return = false;
-}
-
-if ($return) {
-    redirect($baseurl);
-}
-echo $OUTPUT->footer();

admin/repositoryinstance.php

@@ -1,160 +0,0 @@
-<?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/>.
-
-require_once(dirname(dirname(__FILE__)) . '/config.php');
-require_once($CFG->dirroot . '/repository/lib.php');
-require_once($CFG->libdir . '/adminlib.php');
-
-require_sesskey();
-
-// id of repository
-$edit    = optional_param('edit', 0, PARAM_INT);
-$new     = optional_param('new', '', PARAM_PLUGIN);
-$hide    = optional_param('hide', 0, PARAM_INT);
-$delete  = optional_param('delete', 0, PARAM_INT);
-$sure    = optional_param('sure', '', PARAM_ALPHA);
-$type    = optional_param('type', '', PARAM_PLUGIN);
-$downloadcontents = optional_param('downloadcontents', false, PARAM_BOOL);
-
-$context = context_system::instance();
-
-$pagename = 'repositorycontroller';
-
-if ($edit){
-    $pagename = 'repositoryinstanceedit';
-} else if ($delete) {
-    $pagename = 'repositorydelete';
-} else if ($new) {
-    $pagename = 'repositoryinstancenew';
-}
-
-admin_externalpage_setup($pagename, '', null, new moodle_url('/admin/repositoryinstance.php'));
-require_capability('moodle/site:config', $context);
-
-$baseurl = new moodle_url("/$CFG->admin/repositoryinstance.php", array('sesskey'=>sesskey()));
-
-$parenturl = new moodle_url("/$CFG->admin/repository.php", array(
-    'sesskey'=>sesskey(),
-    'action'=>'edit',
-));
-
-if ($new) {
-    $parenturl->param('repos', $new);
-} else {
-    $parenturl->param('repos', $type);
-}
-
-$return = true;
-
-if (!empty($edit) || !empty($new)) {
-    if (!empty($edit)) {
-        $instance = repository::get_instance($edit);
-        $instancetype = repository::get_type_by_id($instance->options['typeid']);
-        $classname = 'repository_' . $instancetype->get_typename();
-        $configs  = $instance->get_instance_option_names();
-        $plugin = $instancetype->get_typename();
-        $typeid = $instance->options['typeid'];
-    } else {
-        $plugin = $new;
-        $typeid = null;
-        $instance = null;
-    }
-
-    // display the edit form for this instance
-    $mform = new repository_instance_form('', array('plugin' => $plugin, 'typeid' => $typeid, 'instance' => $instance, 'contextid' => $context->id));
-    // end setup, begin output
-
-    if ($mform->is_cancelled()){
-        redirect($parenturl);
-        exit;
-    } else if ($fromform = $mform->get_data()){
-        if ($edit) {
-            $settings = array();
-            $settings['name'] = $fromform->name;
-            if (!$instance->readonly) {
-                foreach($configs as $config) {
-                    if (isset($fromform->$config)) {
-                        $settings[$config] = $fromform->$config;
-                    } else {
-                        $settings[$config] = null;
-                    }
-                }
-            }
-            $success = $instance->set_option($settings);
-        } else {
-            $success = repository::static_function($plugin, 'create', $plugin, 0, $context, $fromform);
-            $data = data_submitted();
-        }
-        if ($success) {
-            redirect($parenturl);
-        } else {
-            print_error('instancenotsaved', 'repository', $parenturl);
-        }
-        exit;
-    } else {
-        echo $OUTPUT->header();
-        echo $OUTPUT->heading(get_string('configplugin', 'repository_'.$plugin));
-        echo $OUTPUT->box_start();
-        $mform->display();
-        echo $OUTPUT->box_end();
-        $return = false;
-    }
-} else if (!empty($hide)) {
-    $instance = repository::get_type_by_typename($hide);
-    $instance->hide();
-    $return = true;
-} else if (!empty($delete)) {
-    $instance = repository::get_instance($delete);
-    //if you try to delete an instance set as readonly, display an error message
-    if ($instance->readonly) {
-            throw new repository_exception('readonlyinstance', 'repository');
-     }
-    if ($sure) {
-        if ($instance->delete($downloadcontents)) {
-            $deletedstr = get_string('instancedeleted', 'repository');
-            redirect($parenturl, $deletedstr, 3);
-        } else {
-            print_error('instancenotdeleted', 'repository', $parenturl);
-        }
-        exit;
-    }
-
-    echo $OUTPUT->header();
-    echo $OUTPUT->box_start('generalbox', 'notice');
-    $continueurl = new moodle_url($baseurl, array(
-        'type' => $type,
-        'delete' => $delete,
-        'sure' => 'yes',
-    ));
-    $continueanddownloadurl = new moodle_url($continueurl, array(
-        'downloadcontents' => 1
-    ));
-    $message = get_string('confirmdelete', 'repository', $instance->name);
-    echo html_writer::tag('p', $message);
-
-    echo $OUTPUT->single_button($continueurl, get_string('continueuninstall', 'repository'));
-    echo $OUTPUT->single_button($continueanddownloadurl, get_string('continueuninstallanddownload', 'repository'));
-    echo $OUTPUT->single_button($parenturl, get_string('cancel'));
-
-    echo $OUTPUT->box_end();
-
-    $return = false;
-}
-
-if (!empty($return)) {
-    redirect($parenturl);
-}
-echo $OUTPUT->footer();

admin/resetemoticons.php

@@ -1,45 +0,0 @@
-<?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/>.
-
-/**
- * Resets the emoticons mapping into the default value
- *
- * @package   core
- * @copyright 2010 David Mudrak <david@moodle.com>
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require(dirname(dirname(__FILE__)) . '/config.php');
-require_once($CFG->libdir.'/adminlib.php');
-
-admin_externalpage_setup('resetemoticons');
-
-$confirm = optional_param('confirm', false, PARAM_BOOL);
-
-if (!$confirm or !confirm_sesskey()) {
-    echo $OUTPUT->header();
-    echo $OUTPUT->heading(get_string('confirmation', 'admin'));
-    echo $OUTPUT->confirm(get_string('emoticonsreset', 'admin'),
-        new moodle_url($PAGE->url, array('confirm' => 1)),
-        new moodle_url('/admin/settings.php', array('section' => 'htmlsettings')));
-    echo $OUTPUT->footer();
-    die();
-}
-
-$manager = get_emoticon_manager();
-set_config('emoticons', $manager->encode_stored_config($manager->default_emoticons()));
-redirect(new moodle_url('/admin/settings.php', array('section' => 'htmlsettings')));

admin/roles/admins.php

@@ -1,158 +0,0 @@
-<?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/>.
-
-/**
- * Lets you site administrators
- *
- * @package    core
- * @subpackage role
- * @copyright  2010 Petr Skoda (skodak) http://skodak.org
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once(dirname(__FILE__) . '/../../config.php');
-require_once($CFG->dirroot . '/' . $CFG->admin . '/roles/lib.php');
-
-$confirmadd = optional_param('confirmadd', 0, PARAM_INT);
-$confirmdel = optional_param('confirmdel', 0, PARAM_INT);
-
-$PAGE->set_url('/admin/roles/admins.php');
-
-admin_externalpage_setup('admins');
-if (!is_siteadmin()) {
-    die;
-}
-
-$admisselector = new admins_existing_selector();
-$admisselector->set_extra_fields(array('username', 'email'));
-
-$potentialadmisselector = new admins_potential_selector();
-$potentialadmisselector->set_extra_fields(array('username', 'email'));
-
-if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) {
-    if ($userstoadd = $potentialadmisselector->get_selected_users()) {
-        $user = reset($userstoadd);
-        $username = fullname($user) . " ($user->username, $user->email)";
-        echo $OUTPUT->header();
-        echo $OUTPUT->confirm(get_string('confirmaddadmin', 'role', $username), new moodle_url('/admin/roles/admins.php', array('confirmadd'=>$user->id, 'sesskey'=>sesskey())), $PAGE->url);
-        echo $OUTPUT->footer();
-        die;
-    }
-
-} else if (optional_param('remove', false, PARAM_BOOL) and confirm_sesskey()) {
-    if ($userstoremove = $admisselector->get_selected_users()) {
-        $user = reset($userstoremove);
-        if ($USER->id == $user->id) {
-            //can not remove self
-        } else {
-            $username = fullname($user) . " ($user->username, $user->email)";
-            echo $OUTPUT->header();
-            echo $OUTPUT->confirm(get_string('confirmdeladmin', 'role', $username), new moodle_url('/admin/roles/admins.php', array('confirmdel'=>$user->id, 'sesskey'=>sesskey())), $PAGE->url);
-            echo $OUTPUT->footer();
-            die;
-        }
-    }
-
-} else if (optional_param('main', false, PARAM_BOOL) and confirm_sesskey()) {
-    if ($newmain = $admisselector->get_selected_users()) {
-        $newmain = reset($newmain);
-        $newmain = $newmain->id;
-        $admins = array();
-        foreach(explode(',', $CFG->siteadmins) as $admin) {
-            $admin = (int)$admin;
-            if ($admin) {
-                $admins[$admin] = $admin;
-            }
-        }
-
-        if (isset($admins[$newmain])) {
-            unset($admins[$newmain]);
-            array_unshift($admins, $newmain);
-            set_config('siteadmins', implode(',', $admins));
-            redirect($PAGE->url);
-        }
-    }
-
-} else if ($confirmadd and confirm_sesskey()) {
-    $admins = array();
-    foreach(explode(',', $CFG->siteadmins) as $admin) {
-        $admin = (int)$admin;
-        if ($admin) {
-            $admins[$admin] = $admin;
-        }
-    }
-    $admins[$confirmadd] = $confirmadd;
-    set_config('siteadmins', implode(',', $admins));
-    redirect($PAGE->url);
-
-} else if ($confirmdel and confirm_sesskey() and $confirmdel != $USER->id) {
-    $admins = array();
-    foreach(explode(',', $CFG->siteadmins) as $admin) {
-        $admin = (int)$admin;
-        if ($admin) {
-            $admins[$admin] = $admin;
-        }
-    }
-    unset($admins[$confirmdel]);
-    set_config('siteadmins', implode(',', $admins));
-    redirect($PAGE->url);
-}
-
-/// Print header
-echo $OUTPUT->header();
-?>
-
-<div id="addadmisform">
-    <h3 class="main"><?php print_string('manageadmins', 'role'); ?></h3>
-
-    <form id="assignform" method="post" action="<?php echo $PAGE->url ?>">
-    <div>
-    <input type="hidden" name="sesskey" value="<?php p(sesskey()); ?>" />
-
-    <table class="generaltable generalbox groupmanagementtable boxaligncenter" summary="">
-    <tr>
-      <td id='existingcell'>
-          <p>
-            <label for="removeselect"><?php print_string('existingadmins', 'role'); ?></label>
-          </p>
-          <?php $admisselector->display(); ?>
-          </td>
-      <td id='buttonscell'>
-        <p class="arrow_button">
-            <input name="add" id="add" type="submit" value="<?php echo $OUTPUT->larrow().'&nbsp;'.get_string('add'); ?>" title="<?php print_string('add'); ?>" /><br />
-            <input name="remove" id="remove" type="submit" value="<?php echo get_string('remove').'&nbsp;'.$OUTPUT->rarrow(); ?>" title="<?php print_string('remove'); ?>" />
-            <input name="main" id="main" type="submit" value="<?php echo get_string('mainadminset', 'role'); ?>" title="<?php print_string('mainadminset', 'role'); ?>" />
-        </p>
-      </td>
-      <td id='potentialcell'>
-          <p>
-            <label for="addselect"><?php print_string('users'); ?></label>
-          </p>
-          <?php $potentialadmisselector->display(); ?>
-      </td>
-    </tr>
-    </table>
-    </div>
-    </form>
-</div>
-
-<?php
-
-//this must be after calling display() on the selectors so their setup JS executes first
-//////$PAGE->requires->js_function_call('init_add_remove_admis_page');
-
-echo $OUTPUT->footer();

admin/roles/allow.php

@@ -1,74 +0,0 @@
-<?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/>.
-
-/**
- * Allow overriding of roles by other roles
- *
- * @package    core
- * @subpackage role
- * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once(dirname(__FILE__) . '/../../config.php');
-require_once($CFG->libdir . '/adminlib.php');
-require_once($CFG->dirroot . '/' . $CFG->admin . '/roles/lib.php');
-
-$mode = required_param('mode', PARAM_ACTION);
-$classformode = array(
-    'assign' => 'role_allow_assign_page',
-    'override' => 'role_allow_override_page',
-    'switch' => 'role_allow_switch_page'
-);
-if (!isset($classformode[$mode])) {
-    print_error('invalidmode', '', '', $mode);
-}
-
-$baseurl = new moodle_url('/admin/roles/allow.php', array('mode'=>$mode));
-admin_externalpage_setup('defineroles', '', array(), $baseurl);
-
-$syscontext = get_context_instance(CONTEXT_SYSTEM);
-require_capability('moodle/role:manage', $syscontext);
-
-$controller = new $classformode[$mode]();
-
-if (optional_param('submit', false, PARAM_BOOL) && data_submitted() && confirm_sesskey()) {
-    $controller->process_submission();
-    mark_context_dirty($syscontext->path);
-    add_to_log(SITEID, 'role', 'edit allow ' . $mode, str_replace($CFG->wwwroot . '/', '', $baseurl), '', '', $USER->id);
-    redirect($baseurl);
-}
-
-$controller->load_current_settings();
-
-// Display the editing form.
-echo $OUTPUT->header();
-
-$currenttab = $mode;
-require('managetabs.php');
-
-$table = $controller->get_table();
-
-echo $OUTPUT->box($controller->get_intro_text());
-
-echo '<form action="' . $baseurl . '" method="post">';
-echo '<input type="hidden" name="sesskey" value="' . sesskey() . '" />';
-echo html_writer::table($table);
-echo '<div class="buttons"><input type="submit" name="submit" value="'.get_string('savechanges').'"/>';
-echo '</div></form>';
-
-echo $OUTPUT->footer();

admin/roles/allowassign.php

@@ -0,0 +1,102 @@
+<?php
+/**
+ * this page defines what roles can access (grant user that role and override that roles'
+ * capabilities in different context. For example, we can say that Teachers can only grant
+ * student role or modify student role's capabilities. Note that you need both the right
+ * capability moodle/role:assign or moodle/role:manage and this database table roles_deny_grant
+ * to be able to grant roles. If a user has moodle/role:manage at site level assignment
+ * then he can modify the roles_allow_assign table via this interface.
+ */
+    require_once('../../config.php');
+/// check capabilities here
+
+    require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('defineroles', $adminroot);
+
+
+    $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+    require_capability('moodle/role:manage', $sitecontext);
+
+/// form processiong here
+
+/// get all roles
+
+    $roles = get_all_roles();
+
+    if ($grant = data_submitted()) {
+
+        foreach ($grant as $grole => $val) {
+            if ($grole == 'dummy') {
+                continue;
+            }
+
+            $string = explode('_', $grole);
+            $temp[$string[1]][$string[2]] = 1; // if set, means can access
+        }
+
+// if current assignment is in data_submitted, ignore, else, write deny into db
+        foreach ($roles as $srole) {
+            foreach ($roles as $trole) {
+                if (isset($temp[$srole->id][$trole->id])) { // if set, need to write to db
+                    if (!$record = get_record('role_allow_assign', 'roleid', $srole->id, 'allowassign', $trole->id)) {
+                        allow_assign($srole->id, $trole->id);
+                    }
+                } else { //if set, means can access, attempt to remove it from db
+                    delete_records('role_allow_assign', 'roleid', $srole->id, 'allowassign', $trole->id);
+                }
+            }
+        }
+    }
+/// displaying form here
+
+    admin_externalpage_print_header($adminroot);
+
+    $currenttab='allowassign';
+    require_once('managetabs.php');
+
+    $table->tablealign = 'center';
+    $table->cellpadding = 5;
+    $table->cellspacing = 0;
+    $table->width = '90%';
+    $table->align[] = 'right';
+
+/// get all the roles identifier
+    foreach ($roles as $role) {
+        $rolesname[] = format_string($role->name);
+        $roleids[] = $role->id;
+        $table->align[] = 'center';
+        $table->wrap[] = 'nowrap';
+    }
+
+    $table->head = array_merge(array(''), $rolesname);
+
+    foreach ($roles as $role) {
+        $beta = get_box_list($role->id, $roleids);
+        $table->data[] = array_merge(array(format_string($role->name)), $beta);
+    }
+
+    print_simple_box(get_string('configallowassign', 'admin'), 'center');
+
+    echo '<form action="allowassign.php" method="post">';
+    print_table($table);
+    echo '<div class="singlebutton"><input type="submit" value="'.get_string('savechanges').'"/></div>';
+    echo '<input type="hidden" name="dummy" value="1" />'; // this is needed otherwise we do not know a form has been submitted
+    echo '</form>';
+
+    admin_externalpage_print_footer($adminroot);
+
+
+
+function get_box_list($roleid, $arraylist){
+
+    foreach ($arraylist as $targetid) {
+        if (get_record('role_allow_assign', 'roleid', $roleid, 'allowassign', $targetid)) {
+            $array[] = '<input type="checkbox" name="s_'.$roleid.'_'.$targetid.'" value="1" checked="checked"/>';
+        } else {
+            $array[] = '<input type="checkbox" name="s_'.$roleid.'_'.$targetid.'" value="1" />';
+        }
+    }
+    return $array;
+}
+?>

admin/roles/allowoverride.php

@@ -0,0 +1,99 @@
+<?php
+/**
+ * this page defines what roles can override (override roles in different context. For example,
+ * we can say that Admin can override teacher roles in a course
+ * To be able to override roles. If a user has moodle/role:override at context level
+ * and be in the roles_allow_override table.
+ */
+    require_once('../../config.php');
+/// check capabilities here
+
+    require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('defineroles', $adminroot);
+
+
+    $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+    require_capability('moodle/role:manage', $sitecontext);
+
+/// form processiong here
+
+/// get all roles
+
+    $roles = get_all_roles();
+
+    if ($grant = data_submitted()) {
+
+        foreach ($grant as $grole => $val) {
+            if ($grole == 'dummy') {
+                continue;
+            }
+
+            $string = explode('_', $grole);
+            $temp[$string[1]][$string[2]] = 1; // if set, means can access
+        }
+
+// if current assignment is in data_submitted, ignore, else, write deny into db
+        foreach ($roles as $srole) {
+            foreach ($roles as $trole) {
+                if (isset($temp[$srole->id][$trole->id])) { // if set, need to write to db
+                    if (!$record = get_record('role_allow_override', 'roleid', $srole->id, 'allowoverride', $trole->id)) {
+                        allow_override($srole->id, $trole->id);
+                    }
+                } else { //if set, means can access, attempt to remove it from db
+                    delete_records('role_allow_override', 'roleid', $srole->id, 'allowoverride', $trole->id);
+                }
+            }
+        }
+    }
+/// displaying form here
+
+    admin_externalpage_print_header($adminroot);
+
+    $currenttab='allowoverride';
+    require_once('managetabs.php');
+
+    $table->tablealign = 'center';
+    $table->cellpadding = 5;
+    $table->cellspacing = 0;
+    $table->width = '90%';
+    $table->align[] = 'right';
+
+/// get all the roles identifier
+    foreach ($roles as $role) {
+        $rolesname[] = format_string($role->name);
+        $roleids[] = $role->id;
+        $table->align[] = 'center';
+        $table->wrap[] = 'nowrap';
+    }
+
+    $table->head = array_merge(array(''), $rolesname);
+
+    foreach ($roles as $role) {
+        $beta = get_box_list($role->id, $roleids);
+        $table->data[] = array_merge(array(format_string($role->name)), $beta);
+    }
+
+    print_simple_box(get_string('configallowoverride', 'admin'), 'center');
+
+    echo '<form action="allowoverride.php" method="post">';
+    print_table($table);
+    echo '<div class="singlebutton"><input type="submit" value="'.get_string('savechanges').'"/></div>';
+    echo '<input type="hidden" name="dummy" value="1" />'; // this is needed otherwise we do not know a form has been submitted
+    echo '</form>';
+
+    admin_externalpage_print_footer($adminroot);
+
+// returns array
+function get_box_list($roleid, $arraylist){
+
+    foreach ($arraylist as $targetid) {
+        if (get_record('role_allow_override', 'roleid', $roleid, 'allowoverride', $targetid)) {
+            $array[] = '<input type="checkbox" name="s_'.$roleid.'_'.$targetid.'" value="1" checked="checked"/>';
+        } else {
+            $array[] = '<input type="checkbox" name="s_'.$roleid.'_'.$targetid.'" value="1" />';
+        }
+    }
+    return $array;
+}
+?>

admin/roles/assign.html

@@ -0,0 +1,110 @@
+
+<form name="assignform" id="assignform" method="post" action="">
+<input type="hidden" name="previoussearch" value="<?php p($previoussearch) ?>" />
+<input type="hidden" name="userid" value="<?php p($userid) ?>" />
+<input type="hidden" name="courseid" value="<?php p($courseid) ?>" />
+<input type="hidden" name="sesskey" value="<?php p(sesskey()) ?>" />
+<input type="hidden" name="contextid" value="<?php p($contextid) ?>" />
+<input type="hidden" name="roleid" value="<?php p($roleid) ?>" />
+  <table align="center" border="0" cellpadding="5" cellspacing="0">
+    <tr>
+      <td valign="top">
+          <?php print_string('existingusers', 'role', count($contextusers)); ?>
+      </td>
+      <td></td>
+      <td valign="top">
+          <?php print_string('potentialusers', 'role', $usercount); ?>
+      </td>
+    </tr>
+    <tr>
+      <td valign="top">
+          <select name="removeselect[]" size="20" id="removeselect" multiple
+                  onFocus="document.assignform.add.disabled=true;
+                           document.assignform.remove.disabled=false;
+                           document.assignform.addselect.selectedIndex=-1;" />
+          <?php
+            $i = 0;
+            foreach ($contextusers as $contextuser) {
+                $fullname = fullname($contextuser, true);
+                if ($contextuser->hidden) {
+                    $hidden=' ('.get_string('hiddenassign').') ';
+                } else {
+                    $hidden="";
+                }
+                echo "<option value=\"$contextuser->id\">".$fullname.", ".$contextuser->email.$hidden."</option>\n";
+                $i++;    
+            }
+            if ($i==0) {
+                echo '<option/>'; // empty select breaks xhtml strict
+            }
+          ?>
+
+          </select></td>
+      <td valign="top">
+        <label title="<?php print_string('hiddenassign') ?>">
+            <input type="checkbox" name="hidden" value="1" />
+            <img src="<?php echo $CFG->pixpath; ?>/t/hide.gif" alt="<?php print_string('hiddenassign') ?>" class="hide-show-image" />            <? 
+            helpbutton ('hiddenassign', get_string('hiddenassign'));
+            ?>
+        </label>
+        <br />
+        <input name="add" type="submit" id="add" value="&larr;" />
+        <br />
+        <input name="remove" type="submit" id="remove" value="&rarr;" />
+        <br />
+      </td>
+      <td valign="top">
+          <select name="addselect[]" size="20" id="addselect" multiple
+                  onFocus="document.assignform.add.disabled=false;
+                           document.assignform.remove.disabled=true;
+                           document.assignform.removeselect.selectedIndex=-1;">
+          <?php
+
+              if (!empty($searchtext)) {
+                  echo "<optgroup label=\"$strsearchresults (" . $availableusers->_numOfRows . ")\">\n";
+                  while ($user = rs_fetch_next_record($availableusers)) {
+                      if (!isset($contextusers[$user->id])) {
+                          $fullname = fullname($user, true);
+                          echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
+                      }
+                  }
+                  echo "</optgroup>\n";
+
+              } else {
+                  if ($usercount > MAX_USERS_PER_PAGE) {
+                      echo '<optgroup label="'.get_string('toomanytoshow').'"><option></option></optgroup>'."\n"
+                          .'<optgroup label="'.get_string('trysearching').'"><option></option></optgroup>'."\n";
+                  } else {
+                      while ($user = rs_fetch_next_record($availableusers)) {
+                          if (!isset($contextusers[$user->id])) {
+                              $fullname = fullname($user, true);
+                              echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
+                          }
+                      }
+                  }
+              }
+          ?>
+         </select>
+         <br />
+         <input type="text" name="searchtext" size="30" value="<?php p($searchtext, true) ?>"
+                  onFocus ="document.assignform.add.disabled=true;
+                            document.assignform.remove.disabled=true;
+                            document.assignform.removeselect.selectedIndex=-1;
+                            document.assignform.addselect.selectedIndex=-1;"
+                  onkeydown = "var keyCode = event.which ? event.which : event.keyCode;
+                               if (keyCode == 13) {
+                                    document.assignform.previoussearch.value=1;
+                                    document.assignform.submit();
+                               } " />
+         <input name="search" id="search" type="submit" value="<?php p($strsearch) ?>" />
+         <?php
+              if (!empty($searchusers)) {
+                  echo '<input name="showall" id="showall" type="submit" value="'.$strshowall.'" />'."\n";
+              }
+         ?>
+       </td>
+    </tr>
+  </table>
+</form>
+
+

admin/roles/assign.php

@@ -1,312 +1,289 @@
-<?php
+<?php // $Id$
+      // Script to assign users to contexts
 
-// 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/>.
+    require_once('../../config.php');
+    require_once($CFG->dirroot.'/mod/forum/lib.php');
+    require_once($CFG->libdir.'/adminlib.php');
 
-/**
- * Lets you assign roles to users in a particular context.
- *
- * @package    core
- * @subpackage role
- * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+    define("MAX_USERS_PER_PAGE", 5000);
 
-require_once(dirname(__FILE__) . '/../../config.php');
-require_once($CFG->dirroot . '/' . $CFG->admin . '/roles/lib.php');
+    $contextid      = required_param('contextid',PARAM_INT); // context id
+    $roleid         = optional_param('roleid', 0, PARAM_INT); // required role id
+    $add            = optional_param('add', 0, PARAM_BOOL);
+    $remove         = optional_param('remove', 0, PARAM_BOOL);
+    $showall        = optional_param('showall', 0, PARAM_BOOL);
+    $searchtext     = optional_param('searchtext', '', PARAM_RAW); // search string
+    $previoussearch = optional_param('previoussearch', 0, PARAM_BOOL);
+    $hidden         = optional_param('hidden', 0, PARAM_BOOL); // whether this assignment is hidden
+    $timestart      = optional_param('timestart', 0, PARAM_INT);
+    $timeend        = optional_param('timened', 0, PARAM_INT);
+    $userid         = optional_param('userid', 0, PARAM_INT); // needed for user tabs
+    $courseid       = optional_param('courseid', 0, PARAM_INT); // needed for user tabs
 
-define("MAX_USERS_TO_LIST_PER_ROLE", 10);
-
-$contextid      = required_param('contextid',PARAM_INT);
-$roleid         = optional_param('roleid', 0, PARAM_INT);
-
-list($context, $course, $cm) = get_context_info_array($contextid);
-
-$url = new moodle_url('/admin/roles/assign.php', array('contextid' => $contextid));
-
-if ($course) {
-    $isfrontpage = ($course->id == SITEID);
-} else {
-    $isfrontpage = false;
-    if ($context->contextlevel == CONTEXT_USER) {
-        $course = $DB->get_record('course', array('id'=>optional_param('courseid', SITEID, PARAM_INT)), '*', MUST_EXIST);
-        $user = $DB->get_record('user', array('id'=>$context->instanceid), '*', MUST_EXIST);
-        $url->param('courseid', $course->id);
-        $url->param('userid', $user->id);
-    } else {
-        $course = $SITE;
-    }
-}
-
-
-// security
-require_login($course, false, $cm);
-require_capability('moodle/role:assign', $context);
-$PAGE->set_url($url);
-$PAGE->set_context($context);
-
-$contextname = print_context_name($context);
-$courseid = $course->id;
-
-// These are needed early because of tabs.php
-list($assignableroles, $assigncounts, $nameswithcounts) = get_assignable_roles($context, ROLENAME_BOTH, true);
-$overridableroles = get_overridable_roles($context, ROLENAME_BOTH);
-
-// Make sure this user can assign this role
-if ($roleid && !isset($assignableroles[$roleid])) {
-    $a = new stdClass;
-    $a->roleid = $roleid;
-    $a->context = $contextname;
-    print_error('cannotassignrolehere', '', get_context_url($context), $a);
-}
-
-// Work out an appropriate page title.
-if ($roleid) {
-    $a = new stdClass;
-    $a->role = $assignableroles[$roleid];
-    $a->context = $contextname;
-    $title = get_string('assignrolenameincontext', 'role', $a);
-} else {
-    if ($isfrontpage) {
-        $title = get_string('frontpageroles', 'admin');
-    } else {
-        $title = get_string('assignrolesin', 'role', $contextname);
-    }
-}
-
-// Process any incoming role assignments before printing the header.
-if ($roleid) {
-
-    // Create the user selector objects.
-    $options = array('context' => $context, 'roleid' => $roleid);
-
-    $potentialuserselector = roles_get_potential_user_selector($context, 'addselect', $options);
-    $currentuserselector = new existing_role_holders('removeselect', $options);
-
-    // Process incoming role assignments
     $errors = array();
-    if (optional_param('add', false, PARAM_BOOL) && confirm_sesskey()) {
-        $userstoassign = $potentialuserselector->get_selected_users();
-        if (!empty($userstoassign)) {
 
-            foreach ($userstoassign as $adduser) {
-                $allow = true;
+    $previoussearch = ($searchtext != '') or ($previoussearch) ? 1:0;
 
-                if ($allow) {
-                    role_assign($roleid, $adduser->id, $context->id);
-                }
-            }
+    $baseurl = 'assign.php?contextid='.$contextid;
+    if (!empty($userid)) {
+        $baseurl .= '&amp;userid='.$userid;
+    }
+    if (!empty($courseid)) {
+        $baseurl .= '&amp;courseid='.$courseid;
+    }
 
-            $potentialuserselector->invalidate_selected_users();
-            $currentuserselector->invalidate_selected_users();
+    if (! $context = get_context_instance_by_id($contextid)) {
+        error("Context ID was incorrect (can't find it)");
+    }
 
-            $rolename = $assignableroles[$roleid];
-            add_to_log($course->id, 'role', 'assign', 'admin/roles/assign.php?contextid='.$context->id.'&roleid='.$roleid, $rolename, '', $USER->id);
-            // Counts have changed, so reload.
-            list($assignableroles, $assigncounts, $nameswithcounts) = get_assignable_roles($context, ROLENAME_BOTH, true);
+
+    $inmeta = 0;
+    if ($context->contextlevel == CONTEXT_COURSE) {
+        $courseid = $context->instanceid;
+        if ($course = get_record('course', 'id', $courseid)) {
+            $inmeta = $course->metacourse;
+        } else {
+            error('Invalid course id');
+        }
+    } else if (!empty($courseid)){ // we need this for user tabs in user context
+        if (!$course = get_record('course', 'id', $courseid)) {
+            error('Invalid course id');
+        }
+    } else {
+        $courseid = SITEID;
+        $course = get_site();
+    }
+
+    if ($context->contextlevel == CONTEXT_COURSE) {
+        require_login($context->instanceid);
+    } else {
+        require_login();
+    }
+
+    require_capability('moodle/role:assign', $context);
+
+    $assignableroles = get_assignable_roles($context);
+
+/// Get some language strings
+
+    $strassignusers = get_string('assignusers', 'role');
+    $strpotentialusers = get_string('potentialusers', 'role');
+    $strexistingusers = get_string('existingusers', 'role');
+    $straction = get_string('assignroles', 'role');
+    $strroletoassign = get_string('roletoassign', 'role');
+    $strcurrentcontext = get_string('currentcontext', 'role');
+    $strsearch = get_string('search');
+    $strshowall = get_string('showall');
+    $strparticipants = get_string('participants');
+    $strsearchresults = get_string('searchresults');
+
+
+
+/// Make sure this user can assign that role
+
+    if ($roleid) {
+        if (!user_can_assign($context, $roleid)) {
+            error ('you can not override this role in this context');
         }
     }
 
-    // Process incoming role unassignments
-    if (optional_param('remove', false, PARAM_BOOL) && confirm_sesskey()) {
-        $userstounassign = $currentuserselector->get_selected_users();
-        if (!empty($userstounassign)) {
-
-            foreach ($userstounassign as $removeuser) {
-                //unassign only roles that are added manually, no messing with other components!!!
-                role_unassign($roleid, $removeuser->id, $context->id, '');
-            }
-
-            $potentialuserselector->invalidate_selected_users();
-            $currentuserselector->invalidate_selected_users();
-
-            $rolename = $assignableroles[$roleid];
-            add_to_log($course->id, 'role', 'unassign', 'admin/roles/assign.php?contextid='.$context->id.'&roleid='.$roleid, $rolename, '', $USER->id);
-            // Counts have changed, so reload.
-            list($assignableroles, $assigncounts, $nameswithcounts) = get_assignable_roles($context, ROLENAME_BOTH, true);
-        }
-    }
-}
-
-$PAGE->set_pagelayout('admin');
-$PAGE->set_title($title);
-
-switch ($context->contextlevel) {
-    case CONTEXT_SYSTEM:
-        admin_externalpage_setup('assignroles', '', array('contextid' => $contextid, 'roleid' => $roleid));
-        break;
-    case CONTEXT_USER:
+    if ($userid) {
+        $user = get_record('user', 'id', $userid);
         $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $context));
-        $PAGE->set_heading($fullname);
+    }
+
+
+/// Print the header and tabs
+
+    if ($context->contextlevel == CONTEXT_USER) {
+        /// course header
+        if ($courseid != SITEID) {
+            print_header("$fullname", "$fullname",
+                     "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->
+                      <a href=\"$CFG->wwwroot/user/index.php?id=$course->id\">$strparticipants</a> -> <a href=\"$CFG->wwwroot/user/view.php?id=$userid&course=$courseid\">$fullname</a> ->".$straction,
+                      "", "", true, "&nbsp;", navmenu($course));
+
+        /// site header
+        } else {
+            print_header("$course->fullname: $fullname", "$course->fullname",
+                        "<a href=\"$CFG->wwwroot/user/view.php?id=$userid&course=$courseid\">$fullname</a> -> $straction", "", "", true, "&nbsp;", navmenu($course));
+        }
+
         $showroles = 1;
-        break;
-    case CONTEXT_COURSECAT:
-        $PAGE->set_heading("$SITE->fullname: ".get_string("categories"));
-        break;
-    case CONTEXT_COURSE:
-        if ($isfrontpage) {
-            admin_externalpage_setup('frontpageroles', '', array('contextid' => $contextid, 'roleid' => $roleid));
-        } else {
-            $PAGE->set_heading($course->fullname);
-        }
-        break;
-    case CONTEXT_MODULE:
-        $PAGE->set_heading(print_context_name($context, false));
-        $PAGE->set_cacheable(false);
-        break;
-    case CONTEXT_BLOCK:
-        $PAGE->set_heading($PAGE->course->fullname);
-        break;
-}
-
-echo $OUTPUT->header();
-
-// Print heading.
-echo $OUTPUT->heading_with_help($title, 'assignroles', 'role');
-
-if ($roleid) {
-    // Show UI for assigning a particular role to users.
-    // Print a warning if we are assigning system roles.
-    if ($context->contextlevel == CONTEXT_SYSTEM) {
-        echo $OUTPUT->box(get_string('globalroleswarning', 'role'));
+        $currenttab = 'assign';
+        include_once($CFG->dirroot.'/user/tabs.php');
+    } else if ($context->contextlevel == CONTEXT_SYSTEM) {
+        $adminroot = admin_get_root();
+        admin_externalpage_setup('assignroles', $adminroot);
+        admin_externalpage_print_header($adminroot);
+    } else {
+        $currenttab = '';
+        $tabsmode = 'assign';
+        include_once('tabs.php');
     }
 
-    // Print the form.
-$assignurl = new moodle_url($PAGE->url, array('roleid'=>$roleid));
-?>
-<form id="assignform" method="post" action="<?php echo $assignurl ?>"><div>
-  <input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />
 
-  <table summary="" class="roleassigntable generaltable generalbox boxaligncenter" cellspacing="0">
-    <tr>
-      <td id="existingcell">
-          <p><label for="removeselect"><?php print_string('extusers', 'role'); ?></label></p>
-          <?php $currentuserselector->display() ?>
-      </td>
-      <td id="buttonscell">
-          <div id="addcontrols">
-              <input name="add" id="add" type="submit" value="<?php echo $OUTPUT->larrow().'&nbsp;'.get_string('add'); ?>" title="<?php print_string('add'); ?>" /><br />
-          </div>
+/// Process incoming role assignment
 
-          <div id="removecontrols">
-              <input name="remove" id="remove" type="submit" value="<?php echo get_string('remove').'&nbsp;'.$OUTPUT->rarrow(); ?>" title="<?php print_string('remove'); ?>" />
-          </div>
-      </td>
-      <td id="potentialcell">
-          <p><label for="addselect"><?php print_string('potusers', 'role'); ?></label></p>
-          <?php $potentialuserselector->display() ?>
-      </td>
-    </tr>
-  </table>
-</div></form>
+    if ($frm = data_submitted()) {
 
-<?php
-    $PAGE->requires->js_init_call('M.core_role.init_add_assign_page');
+        if ($add and !empty($frm->addselect) and confirm_sesskey()) {
 
-    if (!empty($errors)) {
-        $msg = '<p>';
-        foreach ($errors as $e) {
-            $msg .= $e.'<br />';
-        }
-        $msg .= '</p>';
-        echo $OUTPUT->box_start();
-        echo $OUTPUT->notification($msg);
-        echo $OUTPUT->box_end();
-    }
+            $timemodified = time();
 
-    // Print a form to swap roles, and a link back to the all roles list.
-    echo '<div class="backlink">';
-
-    $select = new single_select($PAGE->url, 'roleid', $nameswithcounts, $roleid, null);
-    $select->label = get_string('assignanotherrole', 'role');
-    echo $OUTPUT->render($select);
-    $backurl = new moodle_url('/admin/roles/assign.php', array('contextid' => $contextid));
-    echo '<p><a href="' . $backurl->out() . '">' . get_string('backtoallroles', 'role') . '</a></p>';
-    echo '</div>';
-
-} else if (empty($assignableroles)) {
-    // Print a message that there are no roles that can me assigned here.
-    echo $OUTPUT->heading(get_string('notabletoassignroleshere', 'role'), 3);
-
-} else {
-    // Show UI for choosing a role to assign.
-
-    // Print a warning if we are assigning system roles.
-    if ($context->contextlevel == CONTEXT_SYSTEM) {
-        echo $OUTPUT->box(get_string('globalroleswarning', 'role'));
-    }
-
-    // Print instruction
-    echo $OUTPUT->heading(get_string('chooseroletoassign', 'role'), 3);
-
-    // Get the names of role holders for roles with between 1 and MAX_USERS_TO_LIST_PER_ROLE users,
-    // and so determine whether to show the extra column.
-    $roleholdernames = array();
-    $strmorethanmax = get_string('morethan', 'role', MAX_USERS_TO_LIST_PER_ROLE);
-    $showroleholders = false;
-    foreach ($assignableroles as $roleid => $notused) {
-        $roleusers = '';
-        if (0 < $assigncounts[$roleid] && $assigncounts[$roleid] <= MAX_USERS_TO_LIST_PER_ROLE) {
-            $roleusers = get_role_users($roleid, $context, false, 'u.id, u.lastname, u.firstname');
-            if (!empty($roleusers)) {
-                $strroleusers = array();
-                foreach ($roleusers as $user) {
-                    $strroleusers[] = '<a href="' . $CFG->wwwroot . '/user/view.php?id=' . $user->id . '" >' . fullname($user) . '</a>';
+            foreach ($frm->addselect as $adduser) {
+                if (!$adduser = clean_param($adduser, PARAM_INT)) {
+                    continue;
+                }
+                $allow = true;
+                if ($inmeta) {
+                    if (has_capability('moodle/course:managemetacourse', $context, $adduser)) {
+                        //ok
+                    } else {
+                        $managerroles = get_roles_with_capability('moodle/course:managemetacourse', CAP_ALLOW, $context);
+                        if (!empty($managerroles) and !array_key_exists($roleid, $managerroles)) {
+                            $erruser = get_record('user', 'id', $adduser, '','','','', 'id, firstname, lastname');
+                            $errors[] = get_string('metaassignerror', 'role', fullname($erruser));
+                            $allow = false;
+                        }
+                    }
+                }
+                if ($allow) {
+                    if (! role_assign($roleid, $adduser, 0, $context->id, $timestart, $timeend, $hidden)) {
+                        $errors[] = "Could not add user with id $adduser to this role!";
+                    }
                 }
-                $roleholdernames[$roleid] = implode('<br />', $strroleusers);
-                $showroleholders = true;
             }
-        } else if ($assigncounts[$roleid] > MAX_USERS_TO_LIST_PER_ROLE) {
-            $assignurl = new moodle_url($PAGE->url, array('roleid'=>$roleid));
-            $roleholdernames[$roleid] = '<a href="'.$assignurl.'">'.$strmorethanmax.'</a>';
-        } else {
-            $roleholdernames[$roleid] = '';
+
+        } else if ($remove and !empty($frm->removeselect) and confirm_sesskey()) {
+
+            $sitecontext = get_context_instance(CONTEXT_SYSTEM);
+            $topleveladmin = false;
+   
+            // we only worry about this if the role has doanything capability at site level
+            if ($context->id == $sitecontext->id && $adminroles = get_roles_with_capability('moodle/site:doanything', CAP_ALLOW, $sitecontext)) {
+                foreach ($adminroles as $adminrole) {
+                    if ($adminrole->id == $roleid) {
+                        $topleveladmin = true;
+                    }
+                }
+            }
+ 
+            foreach ($frm->removeselect as $removeuser) {
+                $removeuser = clean_param($removeuser, PARAM_INT);
+
+                if ($topleveladmin && ($removeuser == $USER->id)) {   // Prevent unassigning oneself from being admin
+                    continue;
+                }
+
+                if (! role_unassign($roleid, $removeuser, 0, $context->id)) {
+                    $errors[] = "Could not remove user with id $removeuser from this role!";
+                } else if ($inmeta) {
+                    sync_metacourse($courseid);
+                    $newroles = get_user_roles($context, $removeuser, false);
+                    if (!empty($newroles) and !array_key_exists($roleid, $newroles)) {
+                        $erruser = get_record('user', 'id', $removeuser, '','','','', 'id, firstname, lastname');
+                        $errors[] = get_string('metaunassignerror', 'role', fullname($erruser));
+                        $allow = false;
+                    }
+                }
+            }
+
+        } else if ($showall) {
+            $searchtext = '';
+            $previoussearch = 0;
         }
     }
 
-    // Print overview table
-    $table = new html_table();
-    $table->tablealign = 'center';
-    $table->width = '60%';
-    $table->head = array(get_string('role'), get_string('description'), get_string('userswiththisrole', 'role'));
-    $table->wrap = array('nowrap', '', 'nowrap');
-    $table->align = array('left', 'left', 'center');
-    if ($showroleholders) {
-        $table->headspan = array(1, 1, 2);
-        $table->wrap[] = 'nowrap';
-        $table->align[] = 'left';
+
+    print_heading_with_help(get_string('assignroles', 'role'), 'assignroles');
+
+    if ($context->contextlevel==CONTEXT_SYSTEM) {
+        print_simple_box(get_string('globalroleswarning', 'role'));
     }
 
-    foreach ($assignableroles as $roleid => $rolename) {
-        $description = format_string($DB->get_field('role', 'description', array('id'=>$roleid)));
-        $assignurl = new moodle_url($PAGE->url, array('roleid'=>$roleid));
-        $row = array('<a href="'.$assignurl.'">'.$rolename.'</a>',
-                $description, $assigncounts[$roleid]);
-        if ($showroleholders) {
-            $row[] = $roleholdernames[$roleid];
+    if ($roleid) {        /// prints a form to swap roles
+
+    /// Get all existing participants in this context.
+        // Why is this not done with get_users???
+
+        if (!$contextusers = get_role_users($roleid, $context, false, 'u.id, u.firstname, u.lastname, u.email, r.hidden')) {
+            $contextusers = array();
         }
-        $table->data[] = $row;
+
+        $select  = "username <> 'guest' AND username <> 'changeme' AND deleted = 0 AND confirmed = 1";
+    
+        $usercount = count_records_select('user', $select) - count($contextusers);
+
+        $searchtext = trim($searchtext);
+
+        if ($searchtext !== '') {   // Search for a subset of remaining users
+            $LIKE      = sql_ilike();
+            $FULLNAME  = sql_fullname();
+
+            $select  .= " AND ($FULLNAME $LIKE '%$searchtext%' OR email $LIKE '%$searchtext%') ";
+        }
+
+        $availableusers = get_recordset_sql('SELECT id, firstname, lastname, email 
+                                               FROM '.$CFG->prefix.'user 
+                                              WHERE '.$select.'
+                                            ORDER BY lastname ASC, firstname ASC');
+
+        /// In the .html file below we loop through these results and exclude any in $contextusers
+    
+        echo '<form name="rolesform" action="assign.php" method="post">';
+        echo '<div align="center">'.$strcurrentcontext.': '.print_context_name($context).'<br/>';
+        if ($userid) {
+            echo '<input type="hidden" name="userid" value="'.$userid.'" />';
+        }
+        echo '<input type="hidden" name="courseid" value="'.$courseid.'" />';
+        echo '<input type="hidden" name="contextid" value="'.$context->id.'" />'.$strroletoassign.': ';
+        choose_from_menu ($assignableroles, 'roleid', $roleid, get_string('listallroles', 'role').'...', $script='rolesform.submit()');
+        echo '</div></form>';
+
+        print_simple_box_start('center');
+        include('assign.html');
+        print_simple_box_end();
+
+        if (!empty($errors)) {
+            $msg = '<p>';
+            foreach ($errors as $e) {
+                $msg .= $e.'<br />';
+            }
+            $msg .= '</p>';
+            print_simple_box_start('center');
+            notify($msg);
+            print_simple_box_end();
+        }
+
+    } else {   // Print overview table
+
+        // sync metacourse enrolments if needed
+        if ($inmeta) {
+            sync_metacourse($course);
+        }
+
+        $table->tablealign = 'center';
+        $table->cellpadding = 5;
+        $table->cellspacing = 0;
+        $table->width = '60%';
+        $table->head = array(get_string('roles', 'role'), get_string('description'), get_string('users'));
+        $table->wrap = array('nowrap', '', 'nowrap');
+        $table->align = array('right', 'left', 'center');
+
+        foreach ($assignableroles as $roleid => $rolename) {
+            $countusers = count_role_users($roleid, $context);
+            $description = format_string(get_field('role', 'description', 'id', $roleid));
+            $table->data[] = array('<a href="'.$baseurl.'&amp;roleid='.$roleid.'">'.$rolename.'</a>',$description, $countusers);
+        }
+
+        print_table($table);
     }
 
-    echo html_writer::table($table);
-
-    if ($context->contextlevel > CONTEXT_USER) {
-        echo html_writer::start_tag('div', array('class'=>'backlink'));
-        echo html_writer::tag('a', get_string('backto', '', $contextname), array('href'=>get_context_url($context)));
-        echo html_writer::end_tag('div');
+    if ($context->contextlevel == CONTEXT_SYSTEM) {
+        admin_externalpage_print_footer($adminroot);
+    } else {
+        print_footer($course);
     }
-}
 
-echo $OUTPUT->footer();
+?>

admin/roles/check.php

@@ -1,185 +0,0 @@
-<?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/>.
-
-/**
- * Shows the result of has_capability for every capability for a user in a context.
- *
- * @package    core
- * @subpackage role
- * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once(dirname(__FILE__) . '/../../config.php');
-require_once($CFG->dirroot . '/' . $CFG->admin . '/roles/lib.php');
-
-$contextid = required_param('contextid',PARAM_INT);
-
-list($context, $course, $cm) = get_context_info_array($contextid);
-
-$url = new moodle_url('/admin/roles/check.php', array('contextid' => $contextid));
-
-if ($course) {
-    $isfrontpage = ($course->id == SITEID);
-} else {
-    $isfrontpage = false;
-    if ($context->contextlevel == CONTEXT_USER) {
-        $course = $DB->get_record('course', array('id'=>optional_param('courseid', SITEID, PARAM_INT)), '*', MUST_EXIST);
-        $user = $DB->get_record('user', array('id'=>$context->instanceid), '*', MUST_EXIST);
-        $url->param('courseid', $course->id);
-        $url->param('userid', $user->id);
-    } else {
-        $course = $SITE;
-    }
-}
-
-// security first
-require_login($course, false, $cm);
-if (!has_any_capability(array('moodle/role:assign', 'moodle/role:safeoverride', 'moodle/role:override', 'moodle/role:manage'), $context)) {
-    print_error('nopermissions', 'error', '', get_string('checkpermissions', 'role'));
-}
-$PAGE->set_url($url);
-$PAGE->set_context($context);
-
-$courseid = $course->id;
-$contextname = print_context_name($context);
-
-// Get the user_selector we will need.
-// Teachers within a course just get to see the same list of people they can
-// assign roles to. Admins (people with moodle/role:manage) can run this report for any user.
-$options = array('context' => $context, 'roleid' => 0);
-if (has_capability('moodle/role:manage', $context)) {
-    $userselector = new potential_assignees_course_and_above('reportuser', $options);
-} else {
-    $userselector = roles_get_potential_user_selector($context, 'reportuser', $options);
-}
-$userselector->set_multiselect(false);
-$userselector->set_rows(10);
-
-// Work out an appropriate page title.
-$title = get_string('checkpermissionsin', 'role', $contextname);
-
-$PAGE->set_pagelayout('admin');
-$PAGE->set_title($title);
-
-switch ($context->contextlevel) {
-    case CONTEXT_SYSTEM:
-        admin_externalpage_setup('checkpermissions', '', array('contextid' => $contextid));
-        break;
-    case CONTEXT_USER:
-        $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $context));
-        $PAGE->set_heading($fullname);
-        $showroles = 1;
-        break;
-    case CONTEXT_COURSECAT:
-        $PAGE->set_heading("$SITE->fullname: ".get_string("categories"));
-        break;
-    case CONTEXT_COURSE:
-        if ($isfrontpage) {
-            admin_externalpage_setup('frontpageroles', '', array('contextid' => $contextid), $CFG->wwwroot . '/' . $CFG->admin . '/roles/check.php');
-        } else {
-            $PAGE->set_heading($course->fullname);
-        }
-        break;
-    case CONTEXT_MODULE:
-        $PAGE->set_heading(print_context_name($context, false));
-        $PAGE->set_cacheable(false);
-        break;
-    case CONTEXT_BLOCK:
-        $PAGE->set_heading($PAGE->course->fullname);
-        break;
-}
-
-// Get the list of the reported-on user's role assignments - must be after
-// the page setup code above, or the language might be wrong.
-$reportuser = $userselector->get_selected_user();
-if (!is_null($reportuser)) {
-    $roleassignments = get_user_roles_with_special($context, $reportuser->id);
-    $rolenames = role_get_names($context);
-}
-
-echo $OUTPUT->header();
-
-// Print heading.
-echo $OUTPUT->heading($title);
-
-// If a user has been chosen, show all the permissions for this user.
-if (!is_null($reportuser)) {
-    echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide');
-
-    if (!empty($roleassignments)) {
-        echo $OUTPUT->heading(get_string('rolesforuser', 'role', fullname($reportuser)), 3);
-        echo html_writer::start_tag('ul');
-
-        $systemcontext = context_system::instance();
-        foreach ($roleassignments as $ra) {
-            $racontext = context::instance_by_id($ra->contextid);
-            $link = html_writer::link($racontext->get_url(), $racontext->get_context_name());
-
-            $rolename = $rolenames[$ra->roleid]->localname;
-            if (has_capability('moodle/role:manage', $systemcontext)) {
-                $rolename = html_writer::link(new moodle_url('/admin/roles/define.php',
-                        array('action' => 'view', 'roleid' => $ra->roleid)), $rolename);
-            }
-
-            echo html_writer::tag('li', get_string('roleincontext', 'role',
-                    array('role' => $rolename, 'context' => $link)));
-        }
-        echo html_writer::end_tag('ul');
-    }
-
-    echo $OUTPUT->heading(get_string('permissionsforuser', 'role', fullname($reportuser)), 3);
-    $table = new check_capability_table($context, $reportuser, $contextname);
-    $table->display();
-    echo $OUTPUT->box_end();
-
-    $selectheading = get_string('selectanotheruser', 'role');
-} else {
-    $selectheading = get_string('selectauser', 'role');
-}
-
-// Show UI for choosing a user to report on.
-echo $OUTPUT->box_start('generalbox boxwidthnormal boxaligncenter', 'chooseuser');
-echo '<form method="get" action="' . $CFG->wwwroot . '/' . $CFG->admin . '/roles/check.php" >';
-
-// Hidden fields.
-echo '<input type="hidden" name="contextid" value="' . $context->id . '" />';
-if (!empty($user->id)) {
-    echo '<input type="hidden" name="userid" value="' . $user->id . '" />';
-}
-if ($isfrontpage) {
-    echo '<input type="hidden" name="courseid" value="' . $courseid . '" />';
-}
-
-// User selector.
-echo $OUTPUT->heading('<label for="reportuser">' . $selectheading . '</label>', 3);
-$userselector->display();
-
-// Submit button and the end of the form.
-echo '<p id="chooseusersubmit"><input type="submit" value="' . get_string('showthisuserspermissions', 'role') . '" /></p>';
-echo '</form>';
-echo $OUTPUT->box_end();
-
-// Appropriate back link.
-if ($context->contextlevel > CONTEXT_USER) {
-    echo html_writer::start_tag('div', array('class'=>'backlink'));
-    echo html_writer::tag('a', get_string('backto', '', $contextname), array('href'=>get_context_url($context)));
-    echo html_writer::end_tag('div');
-}
-
-echo $OUTPUT->footer();
-

admin/roles/define.php

@@ -1,182 +0,0 @@
-<?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/>.
-
-/**
- * Lets the user edit role definitions.
- *
- * Responds to actions:
- *   add       - add a new role
- *   duplicate - like add, only initialise the new role by using an existing one.
- *   edit      - edit the definition of a role
- *   view      - view the definition of a role
- *
- * @package    core
- * @subpackage role
- * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-    require_once(dirname(__FILE__) . '/../../config.php');
-    require_once($CFG->dirroot . '/' . $CFG->admin . '/roles/lib.php');
-
-    $action = required_param('action', PARAM_ALPHA);
-    if (!in_array($action, array('add', 'duplicate', 'edit', 'view'))) {
-        throw new moodle_exception('invalidaccess');
-    }
-    if ($action != 'add') {
-        $roleid = required_param('roleid', PARAM_INTEGER);
-    } else {
-        $roleid = 0;
-    }
-
-/// Get the base URL for this and related pages into a convenient variable.
-    $manageurl = $CFG->wwwroot . '/' . $CFG->admin . '/roles/manage.php';
-    $defineurl = $CFG->wwwroot . '/' . $CFG->admin . '/roles/define.php';
-    if ($action == 'duplicate') {
-        $baseurl = $defineurl . '?action=add';
-    } else {
-        $baseurl = $defineurl . '?action=' . $action;
-        if ($roleid) {
-            $baseurl .= '&amp;roleid=' . $roleid;
-        }
-    }
-
-/// Check access permissions.
-    $systemcontext = get_context_instance(CONTEXT_SYSTEM);
-    require_login();
-    require_capability('moodle/role:manage', $systemcontext);
-    admin_externalpage_setup('defineroles', '', array('action' => $action, 'roleid' => $roleid), $defineurl);
-
-/// Handle the cancel button.
-    if (optional_param('cancel', false, PARAM_BOOL)) {
-        redirect($manageurl);
-    }
-
-/// Handle the toggle advanced mode button.
-    $showadvanced = get_user_preferences('definerole_showadvanced', false);
-    if (optional_param('toggleadvanced', false, PARAM_BOOL)) {
-        $showadvanced = !$showadvanced;
-        set_user_preference('definerole_showadvanced', $showadvanced);
-    }
-
-/// Get some basic data we are going to need.
-    $roles = get_all_roles();
-    $rolenames = role_fix_names($roles, $systemcontext, ROLENAME_ORIGINAL);
-    $rolescount = count($roles);
-
-/// Create the table object.
-    if ($action == 'view') {
-        $definitiontable = new view_role_definition_table($systemcontext, $roleid);
-    } else if ($showadvanced) {
-        $definitiontable = new define_role_table_advanced($systemcontext, $roleid);
-    } else {
-        $definitiontable = new define_role_table_basic($systemcontext, $roleid);
-    }
-    $definitiontable->read_submitted_permissions();
-    if ($action == 'duplicate') {
-        $definitiontable->make_copy();
-    }
-
-/// Process submission in necessary.
-    if (optional_param('savechanges', false, PARAM_BOOL) && confirm_sesskey() && $definitiontable->is_submission_valid()) {
-        $definitiontable->save_changes();
-        add_to_log(SITEID, 'role', $action, 'admin/roles/define.php?action=view&roleid=' .
-                $definitiontable->get_role_id(), $definitiontable->get_role_name(), '', $USER->id);
-        redirect($manageurl);
-    }
-
-/// Print the page header and tabs.
-    echo $OUTPUT->header();
-
-    $currenttab = 'manage';
-    include('managetabs.php');
-
-    if ($action == 'add') {
-        $title = get_string('addinganewrole', 'role');
-    } else if ($action == 'duplicate') {
-        $title = get_string('addingrolebycopying', 'role', $rolenames[$roleid]->localname);
-    } else if ($action == 'view') {
-        $title = get_string('viewingdefinitionofrolex', 'role', $rolenames[$roleid]->localname);
-    } else if ($action == 'edit') {
-        $title = get_string('editingrolex', 'role', $rolenames[$roleid]->localname);
-    }
-    echo $OUTPUT->heading_with_help($title, 'roles', 'role');
-
-/// Work out some button labels.
-    if ($action == 'add' || $action == 'duplicate') {
-        $submitlabel = get_string('createthisrole', 'role');
-    } else {
-        $submitlabel = get_string('savechanges');
-    }
-
-/// On the view page, show some extra controls at the top.
-    if ($action == 'view') {
-        echo $OUTPUT->container_start('buttons');
-        $options = array();
-        $options['roleid'] = $roleid;
-        $options['action'] = 'edit';
-        echo $OUTPUT->single_button(new moodle_url($defineurl, $options), get_string('edit'));
-        $options['action'] = 'reset';
-        if ($definitiontable->get_archetype()) {
-            echo $OUTPUT->single_button(new moodle_url($manageurl, $options), get_string('resetrole', 'role'));
-        } else {
-            echo $OUTPUT->single_button(new moodle_url($manageurl, $options), get_string('resetrolenolegacy', 'role'));
-        }
-        $options['action'] = 'duplicate';
-        echo $OUTPUT->single_button(new moodle_url($defineurl, $options), get_string('duplicaterole', 'role'));
-        echo $OUTPUT->single_button(new moodle_url($manageurl), get_string('listallroles', 'role'));
-        echo $OUTPUT->container_end();
-    }
-
-    // Start the form.
-    echo $OUTPUT->box_start('generalbox');
-    if ($action == 'view') {
-        echo '<div class="mform">';
-    } else {
-    ?>
-<form id="rolesform" class="mform" action="<?php echo $baseurl; ?>" method="post"><div>
-<input type="hidden" name="sesskey" value="<?php p(sesskey()) ?>" />
-<div class="submit buttons">
-    <input type="submit" name="savechanges" value="<?php echo $submitlabel; ?>" />
-    <input type="submit" name="cancel" value="<?php print_string('cancel'); ?>" />
-</div>
-    <?php
-    }
-
-    // Print the form controls.
-    $definitiontable->display();
-
-/// Close the stuff we left open above.
-    if ($action == 'view') {
-        echo '</div>';
-    } else {
-        ?>
-<div class="submit buttons">
-    <input type="submit" name="savechanges" value="<?php echo $submitlabel; ?>" />
-    <input type="submit" name="cancel" value="<?php print_string('cancel'); ?>" />
-</div>
-</div></form>
-        <?php
-    }
-    echo $OUTPUT->box_end();
-
-/// Print a link back to the all roles list.
-    echo '<div class="backlink">';
-    echo '<p><a href="' . $manageurl . '">' . get_string('backtoallroles', 'role') . '</a></p>';
-    echo '</div>';
-
-    echo $OUTPUT->footer();