Bump!

http://moodle.org/mod/forum/discuss.php?d=18662

.gitignore

@@ -1,27 +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

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,29 +1,35 @@
-QUICK INSTALL
-=============
-
-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.
-
-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
-   be taken to the install.php script, which will lead
-   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
-   every five minutes or so.
-
-
-For more information, see the INSTALL DOCUMENTATION:
-
-   http://docs.moodle.org/en/Installing_Moodle
-
-
-Good luck and have fun!
-Martin Dougiamas, Lead Developer
-
+README     $Id$
+------
+
+QUICK INSTALL
+=============
+
+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. 
+
+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 
+   be taken to the install.php script, which will lead
+   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
+   every five minutes or so.
+
+
+For more information, see the INSTALL DOCUMENTATION:
+
+   http://moodle.org/doc
+
+If you have real trouble, please visit the Moodle course 
+"Using Moodle" on moodle.org.
+
+
+Good luck and have fun!
+Martin Dougiamas, Lead Developer
+

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/admin.html

@@ -0,0 +1,97 @@
+
+<form name="adminform" id="adminform" method="post" action="admin.php">
+<input type="hidden" name="previoussearch" value="<?php echo $previoussearch ?>">
+<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
+  <table align="center" border="0" cellpadding="5" cellspacing="0">
+    <tr>
+      <td valign="top">
+          <?php
+              $a->count = count($admins);
+              $a->items = $strexistingadmins;
+              print_string('counteditems', '', $a);
+          ?>
+      </td>
+      <td></td>
+      <td valign="top">
+          <?php
+              $a->count = $usercount;
+              $a->items = $strpotentialadmins;
+              print_string('counteditems', '', $a);
+          ?>
+      </td>
+    </tr>
+    <tr>
+      <td valign="top">
+          <select name="removeselect[]" size="20" id="removeselect" multiple
+                  onFocus="document.adminform.add.disabled=true;
+                           document.adminform.remove.disabled=false;
+                           document.adminform.addselect.selectedIndex=-1;">
+          <?php 
+              if (count($admins) == 1) {
+                  $disabled = 'disabled';
+                  $removebuttontype = 'hidden';
+              } else {
+                  $disabled = '';
+                  $removebuttontype = 'submit';
+              }
+
+              foreach ($admins as $admin) {
+                  $fullname = fullname($admin, true);
+                  echo "<option value=\"$admin->id\" $disabled>".$fullname.", ".$admin->email."</option>\n";
+              }
+          ?>
+          
+          </select></td>
+      <td valign="top">
+        <br />
+        <input name="add" type="submit" id="add" value="&larr;" />
+        <br />
+        <input name="remove" type="<?php echo $removebuttontype ?>" id="remove" value="&rarr;" />
+        <br />
+      </td>
+      <td valign="top">
+          <select name="addselect[]" size="20" id="addselect" multiple
+                  onFocus="document.adminform.add.disabled=false;
+                           document.adminform.remove.disabled=true;
+                           document.adminform.removeselect.selectedIndex=-1;">
+          <?php
+              if (!empty($searchusers)) {
+                  echo "<optgroup label=\"$strsearchresults (" . count($searchusers) . ")\">\n";
+                  foreach ($searchusers as $user) {
+                      $fullname = fullname($user, true);
+                      echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
+                  }
+                  echo "</optgroup>\n";
+              }
+              if (!empty($users)) {
+                  foreach ($users as $user) {
+                      $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 echo $searchtext ?>" 
+                  onFocus ="document.adminform.add.disabled=true;
+                            document.adminform.remove.disabled=true;
+                            document.adminform.removeselect.selectedIndex=-1;
+                            document.adminform.addselect.selectedIndex=-1;"
+                  onkeydown = "var keyCode = event.which ? event.which : event.keyCode;
+                               if (keyCode == 13) {
+                                   document.adminform.previoussearch.value=1;
+                                   document.adminform.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/admin.php

@@ -0,0 +1,122 @@
+<?PHP // $Id$
+      // Admin-only script to assign administrative rights to users
+
+    require_once("../config.php");
+    
+    define("MAX_USERS_PER_PAGE", 50);
+
+    optional_variable($add, "");
+    optional_variable($remove, "");
+    optional_variable($search, "");
+
+    if (! $site = get_site()) {
+        redirect("$CFG->wwwroot/$CFG->admin/index.php");
+    }
+
+    require_login();
+
+    if (!isadmin()) {
+        error("You must be an administrator to use this page.");
+    }
+
+    if (!confirm_sesskey()) {
+        error(get_string('confirmsesskeybad', 'error'));
+    }
+
+    $primaryadmin = get_admin();
+
+/// If you want any administrator to have the ability to assign admin
+/// rights, then comment out the following if statement
+    if ($primaryadmin->id != $USER->id) {
+        error("You must be the primary administrator to use this page.");
+    }
+
+/// assign all of the configurable language strings
+    $stringstoload = array (
+        "assignadmins",
+        "administration",
+        "existingadmins",
+        "potentialadmins",
+        "search",
+        "users",
+        "searchresults",
+        "showall"
+        );
+
+    foreach ($stringstoload as $stringtoload){
+        $strstringtoload = "str" . $stringtoload;
+        $$strstringtoload = get_string($stringtoload);
+    }
+
+    print_header("$site->shortname: $strassignadmins", 
+                 "$site->fullname", 
+                 "<a href=\"index.php\">$stradministration</a> -> <a href=\"users.php\">$strusers</a> -> $strassignadmins", "adminform.searchtext");
+
+
+    if (!$frm = data_submitted()) {
+        print_simple_box("<center>".get_string("adminhelpassignadmins")."</center>", "center", "50%");
+
+/// A form was submitted so process the input
+    
+    } else {
+        if (!empty($frm->add) and !empty($frm->addselect)) {
+            foreach ($frm->addselect as $addadmin) {
+                if (! add_admin($addadmin)) {
+                    error("Could not add admin with user id $addadmin!");
+                }
+            }
+        } else if (!empty($frm->remove) and !empty($frm->removeselect)) {
+            $admins = get_admins();
+            if (count($admins) > count($frm->removeselect)) {
+                foreach ($frm->removeselect as $removeadmin) {
+                    if (! remove_admin($removeadmin)) {
+                        error("Could not remove admin with user id $removeadmin!");
+                    }
+                }
+            }
+        } else if (!empty($frm->showall)) {
+            unset($frm->searchtext);
+            $frm->previoussearch = 0;
+        }
+    }
+
+/// Is there a current search?
+    $previoussearch = (!empty($frm->search) or ($frm->previoussearch == 1)) ;
+
+/// Get all existing admins
+    $admins = get_admins();
+
+
+    $adminarray = array();
+    foreach ($admins as $admin) {
+        $adminarray[] = $admin->id;
+    }
+    $adminlist = implode(',', $adminarray);
+
+    unset($adminarray);
+
+
+/// Get search results excluding any current admins
+    if (!empty($frm->searchtext) and $previoussearch) {
+        $searchusers = get_users(true, $frm->searchtext, true, $adminlist, 'firstname ASC, lastname ASC',
+                                      '', '', 0, 99999, 'id, firstname, lastname, email');
+        $usercount = get_users(false, '', true, $adminlist);
+    }
+
+/// If no search results then get potential users excluding current admins
+    if (empty($searchusers)) {
+        if (!$users = get_users(true, '', true, $adminlist, 'firstname ASC, lastname ASC', '', '',
+                                0, 99999, 'id, firstname, lastname, email') ) {
+            $users = array();
+        }
+        $usercount = count($users);
+    }
+
+    $searchtext = (isset($frm->searchtext)) ? $frm->searchtext : "";
+    $previoussearch = ($previoussearch) ? '1' : '0';
+
+    include('./admin.html');
+
+    print_footer();
+
+?>

admin/auth.php

@@ -1,103 +1,293 @@
-<?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
- *
- */
+    include("../config.php");
+    require_login();
 
-require_once('../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->libdir.'/tablelib.php');
+    if (!$site = get_site()) {
+        redirect("index.php");
+    }
 
-require_login();
-require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
+    if (!isadmin()) {
+        error("Only the admin can use this page");
+    }
 
-$returnurl = new moodle_url('/admin/settings.php', array('section'=>'manageauths'));
+    if (!confirm_sesskey()) {
+        error(get_string('confirmsesskeybad', 'error'));
+    }
 
-$PAGE->set_url($returnurl);
+/// If data submitted, then process and store.
 
-$action = optional_param('action', '', PARAM_ACTION);
-$auth   = optional_param('auth', '', PARAM_SAFEDIR);
+    if ($config = data_submitted()) {
 
-get_enabled_auth_plugins(true); // fix the list of enabled auths
-if (empty($CFG->auth)) {
-    $authsenabled = array();
-} else {
-    $authsenabled = explode(',', $CFG->auth);
+        $config = (array)$config;
+        validate_form($config, $err);
+
+        // 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");
+        }
+
+        if (count($err) == 0) {
+            print_header();
+            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");
+    foreach ($modules as $module) {
+        $options[$module] = get_string("auth_$module"."title", "auth");
+    }
+    asort($options);
+    if (isset($_GET['auth']) && in_array($_GET['auth'], $modules)) {
+        $auth = $_GET['auth'];
+    } else {
+        $auth = $config->auth;
+    }
+    $auth = clean_filename($auth);
+    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 = "";
+    }
+    $user_fields = array("firstname", "lastname", "email", "phone1", "phone2", "department", "address", "city", "country", "description", "idnumber", "lang");
+
+    if (empty($focus)) {
+        $focus = "";
+    }
+
+    $guestoptions[0] = get_string("hide");
+    $guestoptions[1] = get_string("show");
+
+    $createoptions[0] = get_string("no");
+    $createoptions[1] = get_string("yes");
+
+    $stradministration        = get_string("administration");
+    $strauthentication        = get_string("authentication");
+    $strauthenticationoptions = get_string("authenticationoptions","auth");
+    $strsettings = get_string("settings");
+    $strusers = get_string("users");
+
+    print_header("$site->shortname: $strauthenticationoptions", "$site->fullname",
+                  "<a href=\"index.php\">$stradministration</a> -> <a href=\"users.php\">$strusers</a> -> $strauthenticationoptions", "$focus");
+
+    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");
+
+    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>";
+
+    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");
+    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") {
+        echo "<tr valign=\"top\">";
+        echo "<td align=\"right\" nowrap=\"nowrap\">";
+        print_string("changepassword", "auth");
+        echo ":</td>";
+        echo "<td>";
+        echo "<input type=\"text\" name=\"changepassword\" size=\"40\" value=\"$config->changepassword\" />";
+        echo "</td>";
+        echo "<td>";
+        print_string("changepasswordhelp","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();
+
+    print_footer();
+    exit;
+
+/// Functions /////////////////////////////////////////////////////////////////
+
+function validate_form(&$form, &$err) {
+
+   // if (empty($form->fullname))
+   //     $err["fullname"] = get_string("missingsitename");
+
+    return;
 }
 
-if (!empty($auth) and !exists_auth_plugin($auth)) {
-    print_error('pluginnotinstalled', 'auth', $returnurl, $auth);
+//
+// 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
+        optional_variable($pluginconfig->{"field_map_$field"}, '');
+        optional_variable($pluginconfig->{"field_updatelocal_$field"}, '');
+        optional_variable($pluginconfig->{"field_updateremote_$field"}, '');
+        optional_variable($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>';
+    }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// 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_SAFEDIR);
-$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/backup.php

@@ -0,0 +1,133 @@
+<?PHP  // $Id$
+       // backup.php - allows admin to edit all configuration variables for scheduled backups
+
+    require_once("../config.php");
+    require_once("../backup/lib.php");
+    require_once("../backup/backup_scheduled.php");
+
+    require_login();
+
+    if (!isadmin()) {
+        error("Only an admin can use this page");
+    }
+
+    if (!$site = get_site()) {
+        error("Site isn't defined!");
+    }
+
+    //Initialise error variables
+    $error = false;
+    $sche_destination_error = "";
+
+    /// If data submitted, then process and store.
+
+    if (($config = data_submitted()) && confirm_sesskey()) {
+
+        //First of all we check that everything is correct
+        //Check for trailing slash and backslash in backup_sche_destination
+        if (!empty($backup_sche_destination) and 
+            (substr($backup_sche_destination,-1) == "/" or substr($backup_sche_destination,-1) == "\\")) {
+            $error = true;
+            $sche_destination_error = get_string("pathslasherror");
+        //Now check that backup_sche_destination dir exists
+        } else if (!empty($backup_sche_destination) and
+            !is_dir($backup_sche_destination)) {
+            $error = true;
+            $sche_destination_error = get_string("pathnotexists");
+        }
+
+        //We need to do some weekdays conversions prior to continue
+        $i = 0;
+        $temp = "";
+        $a_config = (array)$config;
+        while ($i<7) {
+            $tocheck = "dayofweek_".$i;
+            if (isset($a_config[$tocheck])) {
+                $temp .= "1";
+            } else {
+                $temp .= "0"; 
+            }
+            unset($a_config[$tocheck]);
+            $i++;
+        }
+        $a_config['backup_sche_weekdays'] = $temp;
+        $config = (object)$a_config;
+        //weekdays conversions done. Continue
+
+        print_header();
+        foreach ($config as $name => $value) {
+            backup_set_config($name, $value);
+        }
+
+        //And now, we execute schedule_backup_next_execution() for each course in the server to have the next
+        //execution time updated automatically everytime it's changed.
+        $status = true;
+        //get admin
+        $admin = get_admin();
+        if (!$admin) {
+            $status = false;
+        }
+        //get backup config
+        if (! $backup_config =  backup_get_config()) {
+            $status = false;
+        }
+        if ($status) {
+            //get courses
+            if ($courses = get_records('course', '', '', '', 'id,shortname')) {
+                //For each course, we check (insert, update) the backup_course table
+                //with needed data
+                foreach ($courses as $course) {
+                    //We check if the course exists in backup_course
+                    $backup_course = get_record("backup_courses","courseid",$course->id);
+                    //If it doesn't exist, create 
+                    if (!$backup_course) {
+                        $temp_backup_course->courseid = $course->id;
+                        $newid = insert_record("backup_courses",$temp_backup_course);
+                        //And get it from db
+                        $backup_course = get_record("backup_courses","id",$newid);
+                    }
+                    //Now, calculate next execution of the course
+                    $nextstarttime = schedule_backup_next_execution ($backup_course,$backup_config,time(),$admin->timezone);
+                    //Save it to db
+                    set_field("backup_courses","nextstarttime",$nextstarttime,"courseid",$backup_course->courseid);
+                }
+            }
+        }
+
+        if (!$error) {
+            redirect("$CFG->wwwroot/$CFG->admin/index.php", get_string("changessaved"), 1);
+            exit;
+        }
+    }
+
+/// Otherwise print the form.
+
+    $stradmin = get_string("administration");
+    $strconfiguration = get_string("configuration");
+    $strbackup = get_string("backup");
+
+    print_header("$site->shortname: $strconfiguration: $strbackup", $site->fullname,
+                  "<a href=\"index.php\">$stradmin</a> -> ".
+                  "<a href=\"configure.php\">$strconfiguration</a> -> ".
+                  $strbackup);
+
+    echo "<p align=\"right\"><a href=\"../backup/log.php\">".get_string("logs")."</a></p>";
+
+    print_heading($strbackup);
+
+    print_simple_box("<center>".get_string("adminhelpbackup")."</center>", "center", "50%");
+    echo "<br />";
+
+    print_simple_box_start("center");
+
+    //Check for required functions...
+    if (!function_exists('utf8_encode')) {
+        notify("You need to add XML support to your PHP installation");
+    } 
+    include ("$CFG->dirroot/backup/config.html");
+
+    print_simple_box_end();
+
+    print_footer();
+
+?>

admin/block.php

@@ -1,28 +1,35 @@
-<?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');
+    require_once($CFG->libdir.'/blocklib.php');
 
-    $blockid = required_param('block', PARAM_INT);
+    require_login();
 
-    if(!$blockrecord = blocks_get_record($blockid)) {
-        print_error('blockdoesnotexist', 'error');
+    if (!isadmin()) {
+        error('Only an admin can use this page');
+    }
+    if (!$site = get_site()) {
+        error("Site isn't defined!");
     }
 
-    admin_externalpage_setup('blocksetting'.$blockrecord->name);
+    $blockid = required_param( 'block',PARAM_INT );
+   
+    if(($blockrecord = blocks_get_record($blockid)) === false) {
+        error('This block does not exist');
+    }
 
     $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,33 +37,36 @@
     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) {
             unset($config->$item);
         }
         $block->config_save($config);
+        print_header();
         redirect("$CFG->wwwroot/$CFG->admin/blocks.php", get_string("changessaved"), 1);
         exit;
     }
 
     /// Otherwise print the form.
 
+    $stradmin = get_string('administration');
+    $strconfiguration = get_string('configuration');
     $strmanageblocks = get_string('manageblocks');
     $strblockname = $block->get_title();
 
-    echo $OUTPUT->header();
+    print_header($site->shortname.': '.$strblockname.": $strconfiguration", $site->fullname,
+                  "<a href=\"index.php\">$stradmin</a> -> ".
+                  "<a href=\"configure.php\">$strconfiguration</a> -> ".
+                  "<a href=\"blocks.php\">$strmanageblocks</a> -> ".$strblockname);
 
-    echo $OUTPUT->heading($strblockname);
+    print_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.');
-
-    echo $OUTPUT->box(get_string('configwarning', 'admin'), 'generalbox boxwidthnormal boxaligncenter');
+    print_simple_box('<center>'.get_string('configwarning', 'admin').'</center>', 'center', '50%');
     echo '<br />';
 
     echo '<form method="post" action="block.php">';
@@ -65,12 +75,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();
-
+    print_footer();
 
+?>

admin/blocks.php

@@ -1,22 +1,32 @@
-<?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');
 
-    admin_externalpage_setup('manageblocks');
-
-    $confirm  = optional_param('confirm', 0, PARAM_BOOL);
+    $confirm  = optional_param('confirm', 0, PARAM_INT);
     $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);
+
+    require_login();
+
+    if (!isadmin()) {
+        error("Only administrators can use this page!");
+    }
+
+    if (!$site = get_site()) {
+        error("Site isn't defined!");
+    }
+
 
 /// Print headings
 
+    $stradministration = get_string('administration');
+    $strconfiguration = get_string('configuration');
     $strmanageblocks = get_string('manageblocks');
     $strdelete = get_string('delete');
     $strversion = get_string('version');
@@ -25,106 +35,84 @@
     $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');
+
+    print_header("$site->shortname: $strmanageblocks", "$site->fullname",
+                 "<a href=\"index.php\">$stradministration</a> -> ".
+                 "<a href=\"configure.php\">$strconfiguration</a> -> $strmanageblocks");
+
+    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');
+            print_footer();
             exit;
 
         } else {
-            // Inform block it's about to be deleted
-            if (file_exists("$CFG->dirroot/blocks/$block->name/block_$block->name.php")) {
-                $blockobject = block_instance($block->name);
-                if ($blockobject) {
-                    $blockobject->before_delete();  //only if we can create instance, block might have been already removed
-                }
+            // Delete block
+            if (!delete_records('block', 'id', $block->id)) {
+                notify("Error occurred while deleting the $strblockname record from blocks table");
             }
 
-            // First delete instances and then block
-            $instances = $DB->get_records('block_instances', array('blockname' => $block->name));
+            $instances = get_records('block_instance', 'blockid', $block->id);
             if(!empty($instances)) {
                 foreach($instances as $instance) {
                     blocks_delete_instance($instance);
                 }
             }
 
-            // Delete block
-            $DB->delete_records('block', array('id'=>$block->id));
+            // Then the tables themselves
 
-            drop_plugin_tables($block->name, "$CFG->dirroot/blocks/$block->name/db/install.xml", false); // old obsoleted table names
-            drop_plugin_tables('block_'.$block->name, "$CFG->dirroot/blocks/$block->name/db/install.xml", false);
-
-            // Delete the capabilities that were defined by this block
-            capabilities_cleanup('block/'.$block->name);
-
-            // Remove event handlers and dequeue pending events
-            events_uninstall('block/'.$block->name);
+            if ($tables = $db->Metatables()) {
+                $prefix = $CFG->prefix.$block->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");
+                        }
+                    }
+                }
+            }
 
             $a->block = $strblockname;
             $a->directory = $CFG->dirroot.'/blocks/'.$block->name;
@@ -132,153 +120,121 @@
         }
     }
 
-    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 Mooodle 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_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
-    $table->set_attribute('class', 'compatibleblockstable blockstable generaltable');
+    $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.'/admin/blocks.php');
+
+    $table->set_attribute('cellspacing', '0');
+    $table->set_attribute('id', 'blocks');
+    $table->set_attribute('class', 'generaltable generalbox');
+
     $table->setup();
-    $tablerows = array();
 
-    foreach ($blocks as $blockid=>$block) {
-        $blockname = $block->name;
+    foreach ($blockbyname as $blockname => $blockid) {
 
-        if (!file_exists("$CFG->dirroot/blocks/$blockname/block_$blockname.php")) {
-            $blockobject  = false;
-            $strblockname = '<span class="notifyproblem">'.$blockname.' ('.get_string('missingfromdisk').')</span>';
-            $plugin = new stdClass();
-            $plugin->version = $block->version;
+        $blockobject = $blockobjects[$blockid];
 
-        } 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;
-            }
-            $strblockname = get_string('pluginname', 'block_'.$blockname);
-        }
-
-        $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
-        );
-        $tablerows[] = array(strip_tags($strblockname), $row); // first element will be used for sorting
-    }
-
-    textlib_get_instance()->asort($tablerows);
-    foreach ($tablerows as $row) {
-        $table->add_data($row[1]);
+        ));
     }
 
     $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');
-
+        
         $table->define_columns(array('block', 'delete'));
         $table->define_headers(array($strname, $strdelete));
-        $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
-
-        $table->set_attribute('class', 'incompatibleblockstable generaltable');
-
+        $table->define_baseurl($CFG->wwwroot.'/admin/blocks.php');
+    
+        $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();
-
+    print_footer();
 
+?>

admin/bloglevelupgrade.php

@@ -1,152 +0,0 @@
-<?php
-      /// Create "blog" forums in each course and copy blog entries from these courses' participants in these forums
-
-define('NO_OUTPUT_BUFFERING', true);
-
-require_once('../config.php');
-require_once($CFG->dirroot.'/course/lib.php');
-require_once($CFG->dirroot.'/blog/lib.php');
-require_once($CFG->dirroot.'/mod/forum/lib.php');
-require_once($CFG->libdir.'/adminlib.php');
-
-admin_externalpage_setup('bloglevelupgrade');
-$PAGE->set_pagelayout('maintenance');
-
-$go = optional_param('go', 0, PARAM_BOOL);
-
-echo $OUTPUT->header();
-echo $OUTPUT->heading(get_string('bloglevelupgrade', 'admin'));
-
-$strbloglevelupgrade = get_string('bloglevelupgradeinfo', 'admin');
-
-if (!$go or !data_submitted() or !confirm_sesskey()) {   /// Print a form
-    $optionsyes = array('go'=>1, 'sesskey'=>sesskey());
-    echo $OUTPUT->confirm($strbloglevelupgrade, new moodle_url('bloglevelupgrade.php', $optionsyes), 'index.php');
-    echo $OUTPUT->footer();
-    die;
-}
-
-echo $OUTPUT->box_start();
-
-/// Turn off time limits, sometimes upgrades can be slow.
-
-set_time_limit(0);
-
-$i = 0;
-
-// If $CFG->bloglevel is set to BLOG_GROUP_LEVEL or BLOG_COURSE_LEVEL, create a new "blog" forum in each course
-// whose enrolled students have written blog entries, copy these entries in that forum and switch off blogs at site level
-
-if ($CFG->bloglevel == BLOG_COURSE_LEVEL || $CFG->bloglevel == BLOG_GROUP_LEVEL) {
-    $pbar = new progress_bar('bloglevelupgrade', 500, true);
-
-    $bloggers = $DB->get_records_sql("SELECT userid FROM {post} WHERE module = 'blog' GROUP BY userid");
-    require_once($CFG->dirroot.'/mod/forum/lib.php');
-
-    $a = new stdClass();
-    $a->userscount = 0;
-    $a->blogcount = 0;
-
-    foreach ($bloggers as $blogger) {
-        $courses = enrol_get_users_courses($blogger->userid, true, 'groupmode,groupmodeforce');
-        $blogentries = $DB->get_records('post', array('module' => 'blog', 'userid' => $blogger->userid));
-
-        foreach ($courses as $course) {
-            $forum = forum_get_course_forum($course->id, 'blog');
-            $cm = get_coursemodule_from_instance('forum', $forum->id);
-
-            if ($CFG->bloglevel == BLOG_GROUP_LEVEL && $course->groupmode != NOGROUPS) {
-                // Unless the course is set to separate groups forced, force the forum to Separate groups
-                if (!($course->groupmode == SEPARATEGROUPS && $course->groupmodeforce)) {
-                    $cm->groupmode = SEPARATEGROUPS;
-                    $DB->update_record('course_modules', $cm);
-                }
-
-                $groups = groups_get_user_groups($course->id, $blogger->userid);
-                foreach ($groups[0] as $groupid) { // [0] is for all groupings combined
-                    $a->blogcount += bloglevelupgrade_entries($blogentries, $forum, $cm, $groupid);
-                }
-            } else {
-                $a->blogcount += bloglevelupgrade_entries($blogentries, $forum, $cm);
-            }
-        }
-
-        $a->userscount = $i . '/' .  count($bloggers);
-        $pbar->update($i, count($bloggers), get_string('bloglevelupgradeprogress', 'admin', $a));
-        $i++;
-    }
-}
-
-function bloglevelupgrade_entries($blogentries, $forum, $cm, $groupid=-1) {
-    $count = 0;
-
-    $forumcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
-    $sitecontext = get_context_instance(CONTEXT_SYSTEM);
-
-    foreach ($blogentries as $blogentry) {
-        $discussion = new stdClass();
-        $discussion->course = $forum->course;
-        $discussion->forum = $forum->id;
-        $discussion->name = $blogentry->subject;
-        $discussion->assessed = $forum->assessed;
-        $discussion->message = $blogentry->summary;
-        $discussion->messageformat = $blogentry->summaryformat;
-        $discussion->messagetrust = 0;
-        $discussion->attachments = 0;
-        $discussion->mailnow = false;
-        $discussion->timemodified = $blogentry->created;
-        $discussion->itemid = null;
-        $discussion->groupid = $groupid;
-        $message = '';
-
-        $discussionid = forum_add_discussion($discussion, null, $message);
-
-        // Copy file attachment records
-        $fs = get_file_storage();
-        $files = $fs->get_area_files($sitecontext->id, 'blog', 'attachment', $blogentry->id);
-
-        if (!empty($files)) {
-            foreach ($files as $storedfile) {
-                $newfile = new stdClass();
-                $newfile->component = 'mod_forum';
-                $newfile->filearea = 'attachment';
-                $newfile->itemid = $discussion->firstpost;
-                $newfile->contextid = $forumcontext->id;
-                $fs->create_file_from_storedfile($newfile, $storedfile->get_id());
-            }
-        }
-
-        $files = $fs->get_area_files($sitecontext->id, 'blog', 'post', $blogentry->id);
-
-        if (!empty($files)) {
-            foreach ($files as $storedfile) {
-                $newfile = new stdClass();
-                $newfile->component = 'mod_forum';
-                $newfile->filearea = 'post';
-                $newfile->itemid = $discussion->firstpost;
-                $newfile->contextid = $forumcontext->id;
-                $fs->create_file_from_storedfile($newfile, $storedfile->get_id());
-            }
-        }
-        $count++;
-    }
-    return $count;
-}
-// END OF LOOP
-
-// set conversion flag - switches to new plugin automatically
-set_config('bloglevel_upgrade_complete', 1);
-// Finally switch bloglevel to 0 (disabled)
-set_config('bloglevel', 0);
-
-echo $OUTPUT->box_end();
-
-/// Rebuild course cache which might be incorrect now
-echo $OUTPUT->notification('Rebuilding course cache...', 'notifysuccess');
-rebuild_course_cache();
-echo $OUTPUT->notification('...finished', 'notifysuccess');
-
-echo $OUTPUT->continue_button('index.php');
-
-echo $OUTPUT->footer();
-die;

admin/calendar.html

@@ -0,0 +1,68 @@
+
+<form method="post" action="calendar.php">
+<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
+<table class="formtable">
+    <tr>
+      <th>adminseesall:</th>
+      <td>
+        <div><?php print_string('helpadminseesall', 'admin'); ?></div>
+        <p>
+        <select name="adminseesallcourses">
+          <option value="0" <?php if(empty($CFG->calendar_adminseesall)) echo "selected='selected'"; ?>><?php print_string('adminseesownevents', 'admin'); ?></option>
+          <option value="1" <?php if(!empty($CFG->calendar_adminseesall)) echo "selected='selected'"; ?>><?php print_string('adminseesallevents', 'admin'); ?></option>
+        </select>
+        </p>
+      </td>
+    </tr>
+    <tr>
+      <th>startwday:</th>
+      <td>
+        <div><?php print_string('helpstartofweek', 'admin'); ?></div>
+        <p><?php choose_from_menu($weekdays, 'startwday', empty($CFG->calendar_startwday) ? 0 : $CFG->calendar_startwday, ''); ?></p>
+      </td>
+    </tr>
+    <tr>
+      <th>weekenddays:</th>
+      <td>
+        <div><?php print_string('helpweekenddays', 'admin'); ?></div>
+        <p>
+        <span style="white-space: nowrap;"><input type="checkbox" name="weekend[]" value="1" id="weekend1" <?php if(CALENDAR_WEEKEND &  2) echo 'checked="checked"'; ?> /> <label for="weekend1"><?php print_string('monday', 'calendar'); ?></label></span>
+        <span style="white-space: nowrap;"><input type="checkbox" name="weekend[]" value="2" id="weekend2" <?php if(CALENDAR_WEEKEND &  4) echo 'checked="checked"'; ?> /> <label for="weekend2"><?php print_string('tuesday', 'calendar'); ?></label></span>
+        <span style="white-space: nowrap;"><input type="checkbox" name="weekend[]" value="3" id="weekend3" <?php if(CALENDAR_WEEKEND &  8) echo 'checked="checked"'; ?> /> <label for="weekend3"><?php print_string('wednesday', 'calendar'); ?></label></span>
+        <span style="white-space: nowrap;"><input type="checkbox" name="weekend[]" value="4" id="weekend4" <?php if(CALENDAR_WEEKEND & 16) echo 'checked="checked"'; ?> /> <label for="weekend4"><?php print_string('thursday', 'calendar'); ?></label></span>
+        <span style="white-space: nowrap;"><input type="checkbox" name="weekend[]" value="5" id="weekend5" <?php if(CALENDAR_WEEKEND & 32) echo 'checked="checked"'; ?> /> <label for="weekend5"><?php print_string('friday', 'calendar'); ?></label></span>
+        <br />
+        <span style="white-space: nowrap;"><input type="checkbox" name="weekend[]" value="6" id="weekend6" <?php if(CALENDAR_WEEKEND & 64) echo 'checked="checked"'; ?> /> <label for="weekend6"><?php print_string('saturday', 'calendar'); ?></label></span>
+        <span style="white-space: nowrap;"><input type="checkbox" name="weekend[]" value="0" id="weekend0" <?php if(CALENDAR_WEEKEND &  1) echo 'checked="checked"'; ?> /> <label for="weekend0"><?php print_string('sunday', 'calendar'); ?></label></span>
+        </p>
+      </td>
+    </tr>
+    <tr>
+      <th>upcoming_lookahead:</th>
+      <td>
+        <div><?php print_string('helpupcominglookahead', 'admin'); ?></div>
+        <p><input type="text" name="lookahead" size="3" value="<?php echo CALENDAR_UPCOMING_DAYS; ?>" /></p>
+      </td>
+    </tr>
+    <tr>
+      <th>upcoming_maxevents:</th>
+      <td>
+        <div><?php print_string('helpupcomingmaxevents', 'admin'); ?></div>
+        <p><input type="text" name="maxevents" size="3" value="<?php echo CALENDAR_UPCOMING_MAXEVENTS; ?>" /></p>
+      </td>
+    </tr>
+    <tr>
+      <th>timezones:</th>
+      <td>
+        <div><?php print_string('helpforcetimezone', 'admin'); ?></div>
+        <p><?php choose_from_menu($timezones, 'forcetimezone', $CFG->forcetimezone, get_string('timezonenotforced', 'admin'), '', '99'); ?></p>
+        <p><a href="timezoneimport.php"><?php print_string('importtimezones', 'admin'); ?>...</a></p>
+      </td>
+    </tr>
+    <tr>
+      <td colspan="2" align="center">
+          <input type="submit" value="<?php print_string('savechanges'); ?>" />
+      </td>
+    </tr>
+</table>
+</form>

admin/calendar.php

@@ -0,0 +1,99 @@
+<?PHP // $Id$
+
+    // Allows the admin to configure calendar and date/time stuff
+
+    require_once('../config.php');
+
+    require_login();
+
+    if (!isadmin()) {
+        error('Only administrators can use this page!');
+    }
+
+    if (!$site = get_site()) {
+        error('Site isn\'t defined!');
+    }
+
+/// Print headings
+
+    $stradministration = get_string('administration');
+    $strconfiguration = get_string('configuration');
+    $strcalendarsettings = get_string('calendarsettings', 'admin');
+
+    print_header("$site->shortname: $strcalendarsettings", "$site->fullname",
+                 "<a href=\"index.php\">$stradministration</a> -> ".
+                 "<a href=\"configure.php\">$strconfiguration</a> -> $strcalendarsettings");
+
+    print_heading($strcalendarsettings);
+
+/// If data submitted, process and store
+
+    if (($form = data_submitted()) && confirm_sesskey()) {
+        if(isset($form->adminseesallcourses)) {
+            set_config('calendar_adminseesall', intval($form->adminseesallcourses) != 0);
+            unset($SESSION->cal_courses_shown);
+        }
+        if(isset($form->forcetimezone)) {
+            // To protect from SQL injections ...
+            $form->forcetimezone = str_replace(';', '', $form->forcetimezone);
+            $form->forcetimezone = str_replace('\'', '', $form->forcetimezone);
+            set_config('forcetimezone', $form->forcetimezone);
+        }
+        if(isset($form->startwday)) {
+            $startwday = intval($form->startwday);
+            if($startwday >= 0 && $startwday <= 6) {
+                set_config('calendar_startwday', $startwday);
+            }
+        }
+        if(isset($form->weekend)) {
+            if(is_array($form->weekend)) {
+                // Creating a packed bitfield; look at /calendar/lib.php if you can't figure it out
+                $bitfield = 0;
+                foreach($form->weekend as $day) {
+                    $bitfield |= (1 << (intval($day) % 7));
+                }
+                if($bitfield > 0) {
+                    set_config('calendar_weekend', $bitfield);
+                }
+            }
+        }
+        if(isset($form->lookahead)) {
+            $lookahead = intval($form->lookahead);
+            if($lookahead > 0) {
+                set_config('calendar_lookahead', $lookahead);
+            }
+        }
+        if(isset($form->maxevents)) {
+            $maxevents = intval($form->maxevents);
+            if($maxevents > 0) {
+                set_config('calendar_maxevents', $maxevents);
+            }
+        }
+        redirect('index.php');
+    }
+
+    // Include the calendar library AFTER modifying the data, so we read the latest values
+    require_once($CFG->dirroot.'/calendar/lib.php');
+
+    // Populate some variables we 're going to need in calendar.html
+    $timezones = get_list_of_timezones();
+
+    $weekdays = array(
+        0 => get_string('sunday', 'calendar'),
+        1 => get_string('monday', 'calendar'),
+        2 => get_string('tuesday', 'calendar'),
+        3 => get_string('wednesday', 'calendar'),
+        4 => get_string('thursday', 'calendar'),
+        5 => get_string('friday', 'calendar'),
+        6 => get_string('saturday', 'calendar')
+    );
+
+    // Main display starts here
+
+    print_simple_box_start("center", "80%");
+    include('./calendar.html');
+    print_simple_box_end();
+
+    print_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,651 +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:
- * - environment check is not present yet
- * - 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
-
-
-// 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";
-    }
-
-    cli_error(get_string('clialreadyinstalled', 'install'));
-}
-
-$olddir = getcwd();
-
-// change directory so that includes bellow 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->dataroot             = str_replace('\\', '/', dirname(dirname(dirname(dirname(__FILE__)))).'/moodledata');
-$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'             => '2777',
-        'lang'              => $CFG->lang,
-        'wwwroot'           => '',
-        'dataroot'          => $CFG->dataroot,
-        'dbtype'            => $defaultdb,
-        'dbhost'            => 'localhost',
-        'dbname'            => 'moodle',
-        'dbuser'            => 'root',
-        '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('Data directories permission'); // todo localize
-    $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
-if (!empty($options['dataroot'])) {
-    $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));
-    }
-}
-
-// 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_error(get_string('maturitycorewarning', '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']);
-        $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;
-
-install_cli_database($options, $interactive);
-
-echo get_string('cliinstallfinished', 'install')."\n";
-exit(0); // 0 means success

admin/cli/install_database.php

@@ -1,151 +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            Name of the site
---shortname           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);
-
-
-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_engine.php

@@ -1,115 +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),
-                                               array('h'=>'help', 'l'=>'list'));
-
-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
--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'])) {
-    $engine = clean_param($options['engine'], PARAM_ALPHA);
-
-    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;
-    foreach ($rs as $table) {
-        if ($table->engine === $engine) {
-            echo str_pad($table->name, 40). " - NO CONVERSION NEEDED\n";
-            $skipped++;
-            continue;
-        }
-        echo str_pad($table->name, 40). " - ";
-
-        $DB->change_database_structure("ALTER TABLE {$table->name} TYPE = $engine");
-        echo "DONE\n";
-        $converted++;
-    }
-    $rs->close();
-    echo "Converted: $converted, skipped: $skipped\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 {
-    echo $help;
-    die;
-}

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,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/>.
-
-/**
- * This script creates config.php file and prepares database.
- *
- * This script is not intended for beginners!
- * Potential problems:
- * - environment check is not present yet
- * - 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');
-
-
-// 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 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)";
-
-// test environment first
-if (!check_moodle_environment(normalize_version($release), $environment_results, false, ENV_SELECT_RELEASE)) {
-    $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);
-}
-
-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_error(get_string('maturitycorewarning', 'admin', $maturitylevel));
-        }
-    }
-}
-
-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);
-
-// 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,181 @@
+<?php  // $Id$
+       // config.php - allows admin to edit all configuration variables
+
+    require_once('../config.php');
+
+    if ($site = get_site()) {   // If false then this is a new installation
+        require_login();
+        if (!isadmin()) {
+            error('Only the admin can use this page');
+        }
+    }
+
+/// 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) {
+            print_header();
+            foreach ($config as $name => $value) {
+                if ($name == "sessioncookie") {
+                    $value = eregi_replace("[^a-zA-Z]", "", $value);
+                }
+                unset($conf);
+                $conf->name  = $name;
+                $conf->value = $value;
+                if ($current = get_record('config', 'name', $name)) {
+                    $conf->id = $current->id;
+                    if (! update_record('config', $conf)) {
+                        notify("Could not update $name to $value");
+                    }
+                } else {
+                    if (! insert_record('config', $conf)) {
+                        notify("Error: could not add new variable $name !");
+                    }
+                }
+            }
+            redirect('index.php', 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;
+        if (!$config->locale = get_field('config', 'value', 'name', 'locale')) {
+            $config->locale = $CFG->lang;
+        }
+    }
+    if (empty($focus)) {
+        $focus = '';
+    }
+
+    $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
+    include('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";
+
+    print_simple_box_start('center');
+    
+    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>';
+    
+    print_simple_box_end();
+
+
+    
+
+    /// 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/configure.php

@@ -0,0 +1,56 @@
+<?php // $Id$
+
+    require_once('../config.php');
+
+    require_login();
+
+    if (!isadmin()) {
+        error('Only admins can access this page');
+    }
+
+    if (!$site = get_site()) {
+        redirect('index.php');
+    }
+
+    $stradministration   = get_string('administration');
+    $strconfiguration  = get_string('configuration');
+
+    print_header("$site->shortname: $stradministration: $strconfiguration", "$site->fullname", 
+                 '<a href="index.php">'. "$stradministration</a> -> $strconfiguration");
+
+    print_heading($strconfiguration);
+
+    $table->align = array ('right', 'left');
+
+    $table->data[] = array("<strong><a href=\"config.php\">". get_string('configvariables', 'admin') .'</a></strong>',
+                           get_string('adminhelpconfigvariables'));
+    $table->data[] = array("<strong><a href=\"site.php\">". get_string('sitesettings') .'</a></strong>',
+                           get_string('adminhelpsitesettings'));
+    $table->data[] = array("<strong><a href=\"../theme/index.php\">". get_string('themes') .'</a></strong>',
+                           get_string('adminhelpthemes'));
+    $table->data[] = array("<strong><a href=\"lang.php\">". get_string('language') .'</a></strong>',
+                           get_string('adminhelplanguage'));
+    $table->data[] = array("<strong><a href=\"modules.php\">".get_string('managemodules'). ' </a></strong>',
+                           get_string('adminhelpmanagemodules'));
+    $table->data[] = array("<strong><a href=\"blocks.php\">". get_string('manageblocks') .'</a></strong>',
+                           get_string('adminhelpmanageblocks'));
+    $table->data[] = array("<strong><a href=\"filters.php\">". get_string('managefilters') .'</a></strong>',
+                           get_string('adminhelpmanagefilters'));
+    if (!isset($CFG->disablescheduledbackups)) {
+        $table->data[] = array("<strong><a href=\"backup.php\">".get_string("backup")."</a></strong>",
+                               get_string('adminhelpbackup'));
+    }
+
+    $table->data[]= array("<strong><a href=\"editor.php\">". get_string('editorsettings') ."</a></strong>",
+                    get_string('adminhelpeditorsettings'));
+    $table->data[]= array("<strong><a href=\"calendar.php\">". get_string('calendarsettings', 'admin') ."</a></strong>",
+                    get_string('helpcalendarsettings', 'admin'));
+    $table->data[]= array("<strong><a href=\"maintenance.php\">". get_string('sitemaintenancemode', 'admin') ."</a></strong>",
+                    get_string('helpsitemaintenance', 'admin'));
+    print_table($table);
+    
+    print_footer($site);
+
+?>
+
+

admin/configvars.php

@@ -0,0 +1,484 @@
+<?php // $Id$
+      // Shane Elliott
+
+/// 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[7]  = $strno;
+    $options[15] = $stryes;
+
+    $misc['debug'] = new configvar (get_string('configdebug', 'admin'),
+        choose_from_menu ($options, 'debug', $config->debug, '', '', '', 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>' );
+
+
+
+
+////////////////////////////////////////////////////////////////////
+/// 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" />' );
+
+/// 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" />' );
+
+/// slasharguments
+    unset($options);
+    $options[0] = "file.php?file=/pic.jpg";
+    $options[1] = "file.php/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) );
+
+
+
+////////////////////////////////////////////////////////////////////
+/// 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="10" value="'.s($config->locale).'" alt="locale" />' );
+
+/// 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) );
+
+
+
+
+
+////////////////////////////////////////////////////////////////////
+/// 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" />' );
+
+
+
+
+
+
+////////////////////////////////////////////////////////////////////
+
+    $configvars['interface']       = $interface;
+    $configvars['security']        = $security;
+    $configvars['operatingsystem'] = $operatingsystem;
+    $configvars['maintenance']     = $maintenance;
+    $configvars['mail']            = $mail;
+    $configvars['user']            = $user;
+    $configvars['permissions']     = $permissions;
+    $configvars['misc']            = $misc;
+
+?>

admin/creators.html

@@ -0,0 +1,91 @@
+
+<form name="creatorsform" id="creatorsform" method="post" action="creators.php">
+<input type="hidden" name="previoussearch" value="<?php echo $previoussearch ?>">
+<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
+  <table align="center" border="0" cellpadding="5" cellspacing="0">
+    <tr>
+      <td valign="top">
+          <?php
+              $a->count = count($creators);
+              $a->items = $strexistingcreators;
+              print_string('counteditems', '', $a);
+          ?>
+      </td>
+      <td></td>
+      <td valign="top">
+          <?php
+              $a->count = $usercount;
+              $a->items = $strpotentialcreators;
+              print_string('counteditems', '', $a);
+          ?>
+      </td>
+    </tr>
+    <tr>
+      <td valign="top">
+          <select name="removeselect[]" size="20" id="removeselect" multiple
+                  onFocus="document.creatorsform.add.disabled=true;
+                           document.creatorsform.remove.disabled=false;
+                           document.creatorsform.addselect.selectedIndex=-1;">
+          <?php 
+              foreach ($creators as $creator) {
+                  $fullname = fullname($creator, true);
+                  echo "<option value=\"$creator->id\">".$fullname.", ".$creator->email."</option>\n";
+              }
+          ?>
+          
+          </select></td>
+      <td valign="top">
+        <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.creatorsform.add.disabled=false;
+                           document.creatorsform.remove.disabled=true;
+                           document.creatorsform.removeselect.selectedIndex=-1;">
+          <?php
+              if (!empty($searchusers)) {
+                  echo "<optgroup label=\"$strsearchresults (" . count($searchusers) . ")\">\n";
+                  foreach ($searchusers as $user) {
+                      $fullname = fullname($user, true);
+                      echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
+                  }
+                  echo "</optgroup>\n";
+              }
+              if (!empty($users)) {
+                  foreach ($users as $user) {
+                      $fullname = fullname($user, true);
+                      echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
+                  }
+              }
+          ?>
+         </select>
+         <br />
+         <script type="text/javascript">
+            function
+         </script>
+         <input type="text" name="searchtext" size="30" value="<?php echo $searchtext ?>" 
+                  onFocus ="document.creatorsform.add.disabled=true;
+                            document.creatorsform.remove.disabled=true;
+                            document.creatorsform.removeselect.selectedIndex=-1;
+                            document.creatorsform.addselect.selectedIndex=-1;"
+                  onkeydown = "var keyCode = event.which ? event.which : event.keyCode;
+                               if (keyCode == 13) {
+                                    document.creatorsform.previoussearch.value=1;
+                                    document.creatorsform.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/creators.php

@@ -0,0 +1,116 @@
+<?PHP // $Id$
+      // Admin only script to assign course creator rights to users
+
+    require_once("../config.php");
+
+    define("MAX_USERS_PER_PAGE", 50);
+
+    optional_variable($search, "");
+    optional_variable($add, "");
+    optional_variable($remove, "");
+
+    if (! $site = get_site()) {
+        redirect("$CFG->wwwroot/$CFG->admin/index.php");
+    }
+
+    require_login();
+
+    if (!isadmin()) {
+        error("You must be an administrator to use this page.");
+    }
+
+    if (!confirm_sesskey()) {
+        error(get_string('confirmsesskeybad', 'error'));
+    }
+
+    $primaryadmin = get_admin();
+
+/// assign all of the configurable language strings
+    $stringstoload = array (
+        "assigncreators",
+        "administration",
+        "existingcreators",
+        "potentialcreators",
+        "search",
+        "users",
+        "searchresults",
+        "showall"
+        );
+
+    foreach ($stringstoload as $stringtoload){
+        $strstringtoload = "str" . $stringtoload;
+        $$strstringtoload = get_string($stringtoload);
+    }
+
+    print_header("$site->shortname: $strassigncreators", 
+                 "$site->fullname", 
+                 "<a href=\"index.php\">$stradministration</a> -> <a href=\"users.php\">$strusers</a> ->
+                  $strassigncreators", "creatorsform.searchtext");
+
+
+    if (!$frm = data_submitted()) {
+        print_simple_box("<center>".get_string("adminhelpassigncreators")."</center>", "center", "50%");
+
+/// A form was submitted so process the input
+
+    } else {
+        if (!empty($frm->add) and !empty($frm->addselect)) {
+            foreach ($frm->addselect as $addcreator) {
+                if (! add_creator($addcreator)) {
+                    error("Could not add course creator with user id $addcreator!");
+                }
+            }
+        } else if (!empty($frm->remove) and !empty($frm->removeselect)) {
+            foreach ($frm->removeselect as $removecreator) {
+                if (! remove_creator($removecreator)) {
+                    error("Could not remove course creator with user id $removecreator!");
+                }
+            }
+        } else if (!empty($frm->showall)) {
+            unset($frm->searchtext);
+            $frm->previoussearch = 0;
+        }
+    }
+
+/// Is there a current search?
+    $previoussearch = (!empty($frm->search) or ($frm->previoussearch == 1)) ;
+
+
+/// Get all existing creators
+    if (! $creators = get_creators()) {
+        $creators = array();
+    }
+
+    $creatorsarray = array();
+    foreach ($creators as $creator) {
+        $creatorsarray[] = $creator->id;
+    }
+    $creatorlist = implode(',', $creatorsarray);
+
+    unset($creatorarray);
+
+
+/// Get search results excluding any current admins
+    if (!empty($frm->searchtext) and $previoussearch) {
+        $searchusers = get_users(true, $frm->searchtext, true, $creatorlist, 'firstname ASC, lastname ASC',
+                                      '', '', 0, 99999, 'id, firstname, lastname, email');
+        $usercount = get_users(false, '', true, $creatorlist);
+    }
+
+/// If no search results then get potential users excluding current creators
+    if (empty($searchusers)) {
+        if (!$users = get_users(true, '', true, $creatorlist, 'firstname ASC, lastname ASC', '', '',
+                                0, 99999, 'id, firstname, lastname, email') ) {
+            $users = array();
+        }
+        $usercount = count($users);
+    }
+
+    $searchtext = (isset($frm->searchtext)) ? $frm->searchtext : "";
+    $previoussearch = ($previoussearch) ? '1' : '0';
+
+    include('./creators.html');
+
+    print_footer();
+
+?>

admin/cron.php

@@ -1,92 +1,191 @@
-<?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("../config.php");
 
-// execute the cron
-cron_run();
+    if (!$alreadyadmin = isadmin()) {
+        unset($_SESSION['USER']);
+        unset($USER);
+        unset($_SESSION['SESSION']);
+        unset($SESSION);
+        $USER = get_admin();      /// Temporarily, to provide environment for this script
+    }
 
-// finish the IE hack
-if (check_browser_version('MSIE')) {
-    echo "</xmp>";
-}
+    //unset test cookie, user must login again anyway
+    setcookie('MoodleSessionTest'.$CFG->sessioncookie, '', time() - 3600, '/');
+
+/// Start output log
+
+    $timenow  = time();
+
+    mtrace("<pre>");
+    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");
+
+    if (!empty($CFG->langcache)) {
+        mtrace('Updating languages cache');
+        get_list_of_languages();
+    }
 
 
+/// 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 ($students = get_users_longtimenosee($longtime)) {
+                foreach ($students as $student) {
+                    if (unenrol_student($student->userid, $student->course)) {
+                        mtrace("Deleted student enrolment for user $student->userid from course $student->course");
+                    }
+                }
+            }
+        }
+    
+    
+        /// Delete users who haven't confirmed within required period
+
+        $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 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;
+            delete_records_select("cache_text", "timemodified < '$cachelifetime'");
+        }
+        flush();
+
+        if (!empty($CFG->notifyloginfailures)) {
+            notify_login_failures();
+        }
+        flush();
+
+        sync_metacourses();
+
+    } // End of occasional clean-up tasks
+
+
+    if (!isset($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("128M");
+        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("ERORR: 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
+    require_once("$CFG->dirroot/enrol/$CFG->enrol/enrol.php");
+    $enrol = new enrolment_plugin();
+    $enrol->cron();
+    if (!empty($enrol->log)) {
+        mtrace($enrol->log);
+    }
+
+    //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"); 
+
+?>

admin/dbperformance.php

@@ -1,32 +1,36 @@
-<?PHP
-// dbperformance.php - shows latest ADOdb stats for the current server
+<?PHP  // $Id$
+       // dbperformance.php - shows latest ADOdb stats for the current server
 
-// disable moodle specific debug messages and any errors in output
-define('NO_DEBUG_DISPLAY', true);
-
-require_once('../config.php');
-
-error('TODO: rewrite db perf code'); // TODO: rewrite
-
-
-    $topframe    = optional_param('topframe', 0, PARAM_BOOL);
-    $bottomframe = optional_param('bottomframe', 0, PARAM_BOOL);
-    $do          = optional_param('do', '', PARAM_ALPHA);
+    require_once("../config.php");
 
     require_login();
 
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
+    if (!isadmin()) {
+        error("Only the admin can use this page");
+    }
 
     $strdatabaseperformance = get_string("databaseperformance");
     $stradministration = get_string("administration");
     $site = get_site();
 
-    if (!empty($topframe)) {
-        $PAGE->set_url('/admin/dbperformance.php');
-        $PAGE->navbar->add($stradministration, new moodle_url('/admin/index.php'));
-        $PAGE->navbar->add($strdatabaseperformance);
-        $PAGE->set_title("$site->shortname: $strdatabaseperformance");
-        $PAGE->set_heading($site->fullname);
-        echo $OUTPUT->header();
+    if (isset($topframe)) {
+        print_header("$site->shortname: $strdatabaseperformance", "$site->fullname", 
+                     "<a target=\"$CFG->framename\" href=\"index.php\">$stradministration</a> -> Database performance");
         exit;
     }
+
+    if (isset($bottomframe) or isset($_GET['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/dbtransfer/database_export_form.php

@@ -1,19 +0,0 @@
-<?php
-
-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 database_export_form extends moodleform {
-
-    function definition() {
-        $mform = $this->_form;
-
-        $mform->addElement('header', 'database', get_string('dbexport', 'dbtransfer'));
-        $mform->addElement('textarea', 'description', get_string('description'), array('rows'=>5, 'cols'=>60));
-
-        $this->add_action_buttons(false, get_string('exportdata', 'dbtransfer'));
-    }
-}

admin/dbtransfer/database_transfer_form.php

@@ -1,48 +0,0 @@
-<?php
-
-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 database_transfer_form extends moodleform {
-
-    function definition() {
-        $mform = $this->_form;
-
-        $mform->addElement('header', 'database', get_string('dbtransfer', 'dbtransfer'));
-
-        $supported = array (
-            'mysqli/native',
-            'pgsql/native',
-            'mssql/native',
-            'oci/native',
-            'sqlite3/pdo',
-        );
-        $drivers = array();
-        foreach($supported as $driver) {
-            list($dbtype, $dblibrary) = explode('/', $driver);
-            $targetdb = moodle_database::get_driver_instance($dbtype, $dblibrary);
-            if ($targetdb->driver_installed() !== true) {
-                continue;
-            }
-            $drivers[$driver] = $driver;
-        }
-
-        $mform->addElement('select', 'driver', get_string('dbtype', 'install'), $drivers);
-        $mform->addElement('text', 'dbhost', get_string('dbhost', 'install'));
-        $mform->addElement('text', 'dbname', get_string('database', 'install'));
-        $mform->addElement('text', 'dbuser', get_string('user'));
-        $mform->addElement('text', 'dbpass', get_string('password'));
-        $mform->addElement('text', 'prefix', get_string('dbprefix', 'install'));
-
-        $mform->addRule('dbhost', get_string('required'), 'required', null);
-        $mform->addRule('dbname', get_string('required'), 'required', null);
-        $mform->addRule('dbuser', get_string('required'), 'required', null);
-        $mform->addRule('dbpass', get_string('required'), 'required', null);
-        $mform->addRule('prefix', get_string('required'), 'required', null);
-
-        $this->add_action_buttons(false, get_string('transferdata', 'dbtransfer'));
-    }
-}

admin/dbtransfer/dbexport.php

@@ -1,21 +0,0 @@
-<?php
-
-require('../../config.php');
-require_once('lib.php');
-require_once('database_export_form.php');
-
-require_login();
-admin_externalpage_setup('dbexport');
-
-//create form
-$form = new database_export_form();
-
-if ($data = $form->get_data()) {
-    dbtransfer_export_xml_database($data->description, $DB);
-    die;
-}
-
-echo $OUTPUT->header();
-// TODO: add some more info here
-$form->display();
-echo $OUTPUT->footer();

admin/dbtransfer/index.php

@@ -1,47 +0,0 @@
-<?php
-
-require('../../config.php');
-require_once('lib.php');
-require_once('database_transfer_form.php');
-
-require_login();
-admin_externalpage_setup('dbtransfer');
-
-// Create the form
-$form = new database_transfer_form();
-
-// If we have valid input.
-if ($data = $form->get_data()) {
-    // Connect to the other database.
-    list($dbtype, $dblibrary) = explode('/', $data->driver);
-    $targetdb = moodle_database::get_driver_instance($dbtype, $dblibrary);
-    if (!$targetdb->connect($data->dbhost, $data->dbuser, $data->dbpass, $data->dbname, $data->prefix, null)) {
-        throw new dbtransfer_exception('notargetconectexception', null, "$CFG->wwwroot/$CFG->admin/dbtransfer/");
-    }
-    if ($targetdb->get_tables()) {
-        throw new dbtransfer_exception('targetdatabasenotempty', null, "$CFG->wwwroot/$CFG->admin/dbtransfer/");
-    }
-
-    // Start output.
-    echo $OUTPUT->header();
-    $data->dbtype = $dbtype;
-    echo $OUTPUT->heading(get_string('transferringdbto', 'dbtransfer', $data));
-
-    // Do the transfer.
-    $feedback = new html_list_progress_trace();
-    dbtransfer_transfer_database($DB, $targetdb, $feedback);
-    $feedback->finished();
-
-    // Finish up.
-    echo $OUTPUT->notification(get_string('success'), 'notifysuccess');
-    echo $OUTPUT->continue_button("$CFG->wwwroot/$CFG->admin/");
-    echo $OUTPUT->footer();
-    die;
-}
-
-// Otherwise display the settings form.
-echo $OUTPUT->header();
-echo $OUTPUT->heading(get_string('transferdbtoserver', 'dbtransfer'));
-echo '<p>', get_string('transferdbintro', 'dbtransfer'), "</p>\n\n";
-$form->display();
-echo $OUTPUT->footer();

admin/dbtransfer/lib.php

@@ -1,52 +0,0 @@
-<?php
-
-/*
-
-TODO:
-  - exporting to server file >2GB fails in 32bit operating systems - needs warning
-  - we may run out of disk space exporting to srever file - we must verify the file is not truncated; read from the end of file?
-  - when sending file >4GB - FAT32 limit, Apache limit, browser limit - needs warning
-  - there must be some form of progress bar during export, transfer - new tracking class could be passed around
-  - command line operation - could work around some 2G/4G limits in PHP; useful for cron full backups
-  - by default allow exporting into empty database only (no tables with the same prefix yet)
-  - all dangerous operation (like deleting of all data) should be confirmed by key found in special file in dataroot
-    (user would need file access to dataroot which might prevent various "accidents")
-  - implement "Export/import running" notification in lib/setup.php (similar to new upgrade flag in config table)
-  - gzip compression when storing xml file - the xml is very verbose and full of repeated tags (zip is not suitable here at all)
-    this could help us keep the files bellow 2G (expected ratio is > 10:1)
-
-*/
-
-require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->libdir.'/dtllib.php');
-
-
-function dbtransfer_export_xml_database($description, $mdb) {
-    @set_time_limit(0);
-
-    session_get_instance()->write_close(); // release session
-
-    header('Content-Type: application/xhtml+xml; charset=utf-8');
-    header('Content-Disposition: attachment; filename=database.xml');
-    header('Expires: 0');
-    header('Cache-Control: must-revalidate,post-check=0,pre-check=0');
-    header('Pragma: public');
-
-    while(@ob_flush());
-
-    $var = new file_xml_database_exporter('php://output', $mdb);
-    $var->export_database($description);
-
-    // no more output
-    die;
-}
-
-
-function dbtransfer_transfer_database($sourcedb, $targetdb, $feedback = null) {
-    @set_time_limit(0);
-
-    session_get_instance()->write_close(); // release session
-
-    $var = new database_mover($sourcedb, $targetdb, true, $feedback);
-    $var->export_database(null);
-}

admin/delete.php

@@ -1,48 +1,33 @@
-<?php
+<?PHP //$Id$
 
 // Deletes the moodledata directory, COMPLETELY!!
 // BE VERY CAREFUL USING THIS!
 
     require_once('../config.php');
-    require_once($CFG->libdir.'/adminlib.php');
-
-    admin_externalpage_setup('purgemoodledata');
 
     require_login();
 
-    $sure       = optional_param('sure', 0, PARAM_BOOL);
-    $reallysure = optional_param('reallysure', 0, PARAM_BOOL);
+    $sure = optional_param('sure', '');
+    $reallysure = optional_param('reallysure', '');
 
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
+    if (!isadmin()) {
+        error('You must be admin to use this script!');
+    }
 
     $deletedir = $CFG->dataroot;   // The directory to delete!
 
-    echo $OUTPUT->header();
-    echo $OUTPUT->heading('Purge moodledata');
-
     if (empty($sure)) {
-        $optionsyes = array('sure'=>'yes', 'sesskey'=>sesskey());
-
-        $formcontinue = new single_button(new moodle_url('delete.php', $optionsyes), get_string('yes'));
-        $formcancel = new single_button('index.php', get_string('no'), 'get');
-        echo $OUTPUT->confirm('Are you completely sure you want to delete everything inside the directory '. $deletedir .' ?', $formcontinue, $formcancel);
-        echo $OUTPUT->footer();
+        notice_yesno ('Are you completely sure you want to delete everything inside the directory '. $deletedir .' ?', 'delete.php?sure=yes&amp;sesskey='.sesskey(), 'index.php');
         exit;
     }
 
-    if (!data_submitted() or empty($reallysure)) {
-        $optionsyes = array('sure'=>'yes', 'sesskey'=>sesskey(), 'reallysure'=>'yes');
-        $formcontinue = new single_button(new moodle_url('delete.php', $optionsyes), get_string('yes'));
-        $formcancel = new single_button('index.php', get_string('no'), 'get');
-        echo $OUTPUT->confirm('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) ?',
-                $formcontinue, $formcancel);
-        echo $OUTPUT->footer();
+    if (empty($reallysure)) {
+        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?sure=yes&amp;reallysure=yes&amp;sesskey='.sesskey(), 'index.php');
         exit;
     }
 
     if (!confirm_sesskey()) {
-        print_error('wrongcall', 'error');
+        error('This script was called wrongly');
     }
 
     /// OK, here goes ...
@@ -50,8 +35,7 @@
     delete_subdirectories($deletedir);
 
     echo '<h1 align="center">Done!</h1>';
-    echo $OUTPUT->continue_button($CFG->wwwroot);
-    echo $OUTPUT->footer();
+    print_continue($CFG->wwwroot);
     exit;
 
 
@@ -59,7 +43,7 @@ function delete_subdirectories($rootdir) {
 
     $dir = opendir($rootdir);
 
-    while (false !== ($file = readdir($dir))) {
+    while ($file = readdir($dir)) {
         if ($file != '.' and $file != '..') {
             $fullfile = $rootdir .'/'. $file;
             if (filetype($fullfile) == 'dir') {
@@ -82,5 +66,5 @@ function delete_subdirectories($rootdir) {
     }
     closedir($dir);
 }
-
-
+  
+?>

admin/editor.html

@@ -0,0 +1,265 @@
+<form method="post" action="editor.php">
+<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+<table border="0" cellpadding="4" cellspacing="2">
+<tr>
+    <td align="right" valign="top">htmleditor:</td>
+    <td valign="top">
+    <?php
+       unset($options);
+       $options[0] = get_string("allownot");
+       $options[1] = get_string("allow");
+       choose_from_menu ($options, "htmleditor", $CFG->htmleditor, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php print_string('confightmleditor', 'admin') ?>
+    </td>
+</tr>
+<tr>
+    <td align="right" valign="top">editorbackgroundcolor:</td>
+    <td valign="top"><input type="text" name="backgroundcolor" size="10" value="<?php print($CFG->editorbackgroundcolor);?>" /></td>
+    <td valign="top"><?php print_string("edhelpbgcolor");?></td>
+</tr>
+<tr>
+    <td align="right" valign="top">editorfontfamily:</td>
+    <td valign="top"><input type="text" name="fontfamily" size="30" value="<?php print($CFG->editorfontfamily);?>" /></td>
+    <td valign="top"><?php print_string("edhelpfontfamily");?></td>
+</tr>
+<tr>
+    <td align="right" valign="top">editorfontsize:</td>
+    <td valign="top"><input type="text" name="fontsize" size="10" value="<?php print($CFG->editorfontsize);?>" /></td>
+    <td valign="top"><?php print_string("edhelpfontsize");?></td>
+</tr>
+<tr>
+    <td align="right" valign="top">editorkillword:</td>
+    <td valign="top"><select name="killword">
+    <option value="1"<?php print(!$CFG->editorkillword)?"":" selected=\"selected\"";?>><?php print_string("yes");?></option>
+    <option value="0"<?php print(!$CFG->editorkillword)?" selected=\"selected\"":"";?>><?php print_string("no");?></option>
+    </select></td>
+    <td valign="top"><?php print_string("edhelpcleanword");?></td>
+</tr>
+<tr>
+    <td align="right" valign="top">aspellpath:</td>
+    <td valign="top"><input onchange="change_state()" id="aspellpath" type="text" name="aspellpath" size="25" value="<?php print($CFG->aspellpath);?>" /></td>
+    <td valign="top"><?php print_string("edhelpaspellpath");?></td>
+</tr>
+<tr>
+    <td align="right" valign="top">editorspelling:</td>
+    <td valign="top"><select onchange="change_state()" id="spelling" name="spelling"<?php
+    if (empty($CFG->aspellpath)) {
+        echo " disabled=\"disabled\"";
+        $CFG->editorspelling = false;
+    }
+    ?>>
+    <option value="1"<?php print(!$CFG->editorspelling)?"":" selected=\"selected\"";?>><?php print_string("yes");?></option>
+    <option value="0"<?php print(!$CFG->editorspelling)?" selected=\"selected\"":"";?>><?php print_string("no");?></option>
+    </select>
+    <select id="dictionary" name="dictionary"<?php
+    if (empty($CFG->aspellpath)) {
+        echo " disabled=\"disabled\"";
+        $CFG->editordictionary = false;
+    }
+    ?>>
+    <?php
+    if (is_array($dicts)) {
+        foreach ($dicts as $dict) {
+            echo "<option value=\"$dict\"";
+            if (!empty($CFG->editordictionary)) {
+                print ($CFG->editordictionary != $dict) ? "" : " selected=\"selected\"";
+            }
+            echo ">$dict</option>\n";
+        }
+    } else if (is_string($dicts)) {
+        echo '<option value="">'. $dicts .'</option>' . "\n";
+    }
+    ?>
+    </select>
+    </td>
+    <td valign="top"><?php print_string("edhelpenablespelling");?></td>
+</tr>
+<tr><td colspan="3"><br /><?php print_string("edhelpfontlist");?></td></tr>
+<?php
+    if(is_array($fontlist)) {
+        foreach($fontlist as $fontkey => $fontvalue) {
+        ?>
+<tr>
+    <td>&nbsp;</td>
+    <td colspan="2"><input type="text" name="fontname[]" size="15" value="<?php print($fontkey);?>">
+    <input type="text" name="fontnamevalue[]" size="30" value="<?php print($fontvalue);?>" /></td>
+</tr>
+    <?php
+        }
+    }
+?>
+<tr>
+    <td>&nbsp;</td>
+    <td colspan="2"><input type="text" name="fontname[]" size="15" value="" />
+    <input type="text" name="fontnamevalue[]" size="30" value="" /></td>
+</tr>
+<tr>
+    <td valign="top" align="right">editorhidebuttons:</td>
+    <td colspan="2">
+    <?php
+    $buttons = array();
+    if (!empty($CFG->editorhidebuttons)) {
+        $buttons = explode(chr(32), $CFG->editorhidebuttons);
+    }
+    ?>
+    <table border="0" cellpadding="2" cellspacing="1">
+    <tr>
+        <td colspan="12"><input type="checkbox" name="buttons[fontname]"<?php print(in_array("fontname", $buttons)) ? " checked=\"checked\"": "";?> /> <?php print_string("fontname","editor");?>
+        <input type="checkbox" name="buttons[fontsize]"<?php print(in_array("fontsize", $buttons)) ? " checked=\"checked\"": "";?> /> <?php print_string("fontsize","editor");?>
+        <input type="checkbox" name="buttons[formatblock]"<?php print(in_array("formatblock", $buttons)) ? " checked=\"checked\"": "";?> /> <?php print_string("formatblock","editor");?></td>
+    </tr>
+    <tr>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_format_bold.gif" width="18" height="18" alt="<?php print_string("bold","editor");?>" title="<?php print_string("bold","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_format_italic.gif" width="18" height="18" alt="<?php print_string("italic","editor");?>" title="<?php print_string("italic","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_format_underline.gif" width="18" height="18" alt="<?php print_string("underline","editor");?>" title="<?php print_string("underline","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_format_strike.gif" width="18" height="18" alt="<?php print_string("strikethrough","editor");?>" title="<?php print_string("strikethrough","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_format_sub.gif" width="18" height="18" alt="<?php print_string("subscript","editor");?>" title="<?php print_string("subscript","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_format_sup.gif" width="18" height="18" alt="<?php print_string("superscript","editor");?>" title="<?php print_string("superscript","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_copy.gif" width="18" height="18" alt="<?php print_string("copy","editor");?>" title="<?php print_string("copy","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_cut.gif" width="18" height="18" alt="<?php print_string("cut","editor");?>" title="<?php print_string("cut","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_paste.gif" width="18" height="18" alt="<?php print_string("paste","editor");?>" title="<?php print_string("paste","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_wordclean.gif" width="18" height="18" alt="<?php print_string("wordclean","editor");?>" title="<?php print_string("wordclean","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_undo.gif" width="18" height="18" alt="<?php print_string("undo","editor");?>" title="<?php print_string("undo","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_redo.gif" width="18" height="18" alt="<?php print_string("redo","editor");?>" title="<?php print_string("redo","editor");?>" /></td>
+    </tr>
+    <tr>
+        <td><input type="checkbox" name="buttons[bold]"<?php print(in_array("bold", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[italic]"<?php print(in_array("italic", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[underline]"<?php print(in_array("underline", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[strikethrough]"<?php print(in_array("strikethrough", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[subscript]"<?php print(in_array("subscript", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[superscript]"<?php print(in_array("superscript", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[copy]"<?php print(in_array("copy", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[cut]"<?php print(in_array("cut", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[paste]"<?php print(in_array("paste", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[clean]"<?php print(in_array("clean", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[undo]"<?php print(in_array("undo", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[redo]"<?php print(in_array("redo", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+    </tr>
+    <tr>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_align_left.gif" width="18" height="18" alt="<?php print_string("justifyleft","editor");?>" title="<?php print_string("justifyleft","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_align_center.gif" width="18" height="18" alt="<?php print_string("justifycenter","editor");?>" title="<?php print_string("justifycenter","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_align_right.gif" width="18" height="18" alt="<?php print_string("justifyright","editor");?>" title="<?php print_string("justifyright","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_align_justify.gif" width="18" height="18" alt="<?php print_string("justifyfull","editor");?>" title="<?php print_string("justifyfull","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_left_to_right.gif" width="18" height="18" alt="<?php print_string("lefttoright","editor");?>" title="<?php print_string("lefttoright","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_right_to_left.gif" width="18" height="18" alt="<?php print_string("righttoleft","editor");?>" title="<?php print_string("righttoleft","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_list_num.gif" width="18" height="18" alt="<?php print_string("orderedlist","editor");?>" title="<?php print_string("orderedlist","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_list_bullet.gif" width="18" height="18" alt="<?php print_string("unorderedlist","editor");?>" title="<?php print_string("unorderedlist","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_indent_less.gif" width="18" height="18" alt="<?php print_string("outdent","editor");?>" title="<?php print_string("outdent","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_indent_more.gif" width="18" height="18" alt="<?php print_string("indent","editor");?>" title="<?php print_string("indent","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_color_fg.gif" width="18" height="18" alt="<?php print_string("forecolor","editor");?>" title="<?php print_string("forecolor","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_color_bg.gif" width="18" height="18" alt="<?php print_string("hilitecolor","editor");?>" title="<?php print_string("hilitecolor","editor");?>" /></td>
+    </tr>
+    <tr>
+        <td><input type="checkbox" name="buttons[justifyleft]"<?php print(in_array("justifyleft", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[justifycenter]"<?php print(in_array("justifycenter", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[justifyright]"<?php print(in_array("justifyright", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[justifyfull]"<?php print(in_array("justifyfull", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[lefttoright]"<?php print(in_array("lefttoright", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[righttoleft]"<?php print(in_array("righttoleft", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[insertorderedlist]"<?php print(in_array("insertorderedlist", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[insertunorderedlist]"<?php print(in_array("insertunorderedlist", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[outdent]"<?php print(in_array("outdent", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[indent]"<?php print(in_array("indent", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[forecolor]"<?php print(in_array("forecolor", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[hilitecolor]"<?php print(in_array("hilitecolor", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+    </tr>
+    <tr>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_hr.gif" width="18" height="18" alt="<?php print_string("horizontalrule","editor");?>" title="<?php print_string("horizontalrule","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_anchor.gif" width="18" height="18" alt="<?php print_string("createanchor","editor");?>" title="<?php print_string("createanchor","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_link.gif" width="18" height="18" alt="<?php print_string("insertlink","editor");?>" title="<?php print_string("insertlink","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_unlink.gif" width="18" height="18" alt="<?php print_string("removelink","editor");?>" title="<?php print_string("removelink","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_image.gif" width="18" height="18" alt="<?php print_string("insertimage","editor");?>" title="<?php print_string("insertimage","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/insert_table.gif" width="18" height="18" alt="<?php print_string("inserttable","editor");?>" title="<?php print_string("inserttable","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/em.icon.smile.gif" width="18" height="18" alt="<?php print_string("insertsmile","editor");?>" title="<?php print_string("insertsmile","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/icon_ins_char.gif" width="18" height="18" alt="<?php print_string("insertchar","editor");?>" title="<?php print_string("insertchar","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/spell-check.gif" width="18" height="18" alt="<?php print_string("spellcheck","editor");?>" title="<?php print_string("spellcheck","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_html.gif" width="18" height="18" alt="<?php print_string("htmlmode","editor");?>" title="<?php print_string("htmlmode","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/fullscreen_maximize.gif" width="18" height="18" alt="<?php print_string("popupeditor","editor");?>" title="<?php print_string("popupeditor","editor");?>" /></td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_replace.gif" width="18" height="18" alt="<?php print_string("popupeditor","editor");?>" title="<?php print_string("searchandreplace","editor");?>" /></td>
+    </tr>
+    <tr>
+        <td><input type="checkbox" name="buttons[inserthorizontalrule]"<?php print(in_array("inserthorizontalrule", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[createanchor]"<?php print(in_array("createanchor", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[createlink]"<?php print(in_array("createlink", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[unlink]"<?php print(in_array("unlink", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[insertimage]"<?php print(in_array("insertimage", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[inserttable]"<?php print(in_array("inserttable", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[insertsmile]"<?php print(in_array("insertsmile", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[insertchar]"<?php print(in_array("insertchar", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[spellcheck]"<?php print(in_array("spellcheck", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[htmlmode]"<?php print(in_array("htmlmode", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[popupeditor]"<?php print(in_array("popupeditor", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[search_replace]"<?php print(in_array("search_replace", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+    </tr>
+    <tr>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_nolink.gif" width="18" height="18" alt="<?php print_string("horizontalrule","editor");?>" title="<?php print_string("nolink","editor");?>" /></td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+    </tr>
+    <tr>
+        <td><input type="checkbox" name="buttons[nolink]"<?php print(in_array("nolink", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+    </tr>
+    </table>
+    </td>
+</tr>
+<tr>
+    <td colspan="3" align="center"><input type="submit" value="<?php print_string("savechanges");?>" /></td>
+</tr>
+</table>
+</form>
+
+<form method="post" action="<?php print($GLOBALS['ME']);?>">
+<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+<center>
+<input type="submit" name="resettodefaults" value="<?php print_string('editorresettodefaults') ?>" />
+</center>
+</form>
+<script language="javascript" type="text/javascript">
+<!--
+
+function change_state () {
+
+    var choice = document.forms[0].spelling;
+    var speller = choice.options[choice.selectedIndex].value;
+    var spellpath = document.forms[0].aspellpath.value;
+
+    if (spellpath == '') {
+        document.forms[0].spelling.disabled = true;
+    } else {
+        document.forms[0].spelling.disabled = false;
+    }
+
+    if (speller != 1) {
+        document.forms[0].dictionary.disabled = true;
+    } else {
+        document.forms[0].dictionary.disabled = false;
+    }
+}
+
+document.onload = change_state();
+-->
+</script>

admin/editor.php

@@ -0,0 +1,214 @@
+<?php // $Id$
+/// configuration routines for HTMLArea editor
+
+    require_once("../config.php");
+    require_login();
+
+    if (!isadmin()) {
+        error("Only admins can access this page");
+    }
+
+    if (($data = data_submitted()) && confirm_sesskey()) {
+
+        // do we want default values?
+        if (isset($data->resettodefaults)) {
+            if (!(reset_to_defaults())) {
+                error("Editor settings could not be restored!");
+            }
+        } else {
+
+            if (!(editor_update_config($data))) {
+                error("Editor settings could not be updated!");
+            }
+        }
+        redirect("$CFG->wwwroot/$CFG->admin/editor.php", get_string("changessaved"), 1);
+
+    } else {
+        // Generate edit form
+
+        $fontlist = editor_convert_to_array($CFG->editorfontlist);
+        $dicts    = editor_get_dictionaries();
+
+        $stradmin = get_string("administration");
+        $strconfiguration = get_string("configuration");
+        $streditorsettings = get_string("editorsettings");
+        $streditorsettingshelp = get_string("adminhelpeditorsettings");
+        print_header("Editor settings","Editor settings",
+                     "<a href=\"index.php\">$stradmin</a> -> ".
+                     "<a href=\"configure.php\">$strconfiguration</a> -> $streditorsettings");
+        print_heading($streditorsettings);
+        print_simple_box("<center>$streditorsettingshelp</center>","center","50%");
+        print("<br />\n");
+        print_simple_box_start("center");
+        include("editor.html");
+        print_simple_box_end();
+        print_footer();
+    }
+
+
+/// FUNCTIONS
+
+function editor_convert_to_array ($string) {
+/// Converts $CFG->editorfontlist to array
+
+    if (empty($string) || !is_string($string)) {
+        return false;
+    }
+    $fonts = array();
+
+    $lines = explode(";", $string);
+    foreach ($lines as $line) {
+        if (!empty($line)) {
+            list($fontkey, $fontvalue) = explode(":", $line);
+            $fonts[$fontkey] = $fontvalue;
+        }
+    }
+
+   return $fonts;
+}
+
+function editor_update_config ($data) {
+
+/// Updates the editor config values.
+
+    if (!is_object($data)) {
+        return false;
+    }
+
+    // Make array for unwanted characters.
+    $nochars = array(chr(33),chr(34),chr(35),chr(36),chr(37),
+                     chr(38),chr(39),chr(40),chr(41),chr(42),
+                     chr(43),chr(46),chr(47),chr(58),chr(59),
+                     chr(60),chr(61),chr(62),chr(63),chr(64),
+                     chr(91),chr(92),chr(93),chr(94),chr(95),
+                     chr(96),chr(123),chr(124),chr(125),chr(126));
+
+    $fontlist = '';
+
+    // make font string
+    $cnt = count($data->fontname);
+    for ($i = 0; $i < $cnt; $i++) {
+        if (!empty($data->fontname[$i])) {
+            $fontlist .= str_replace($nochars, "", $data->fontname[$i]) .":";
+            $fontlist .= str_replace($nochars, "", $data->fontnamevalue[$i]) .";";
+        }
+    }
+    // strip last semicolon
+    $fontlist = substr($fontlist, 0, strlen($fontlist) - 1);
+
+    // make array of values to update
+    $updatedata = array();
+    $updatedata['htmleditor'] = !empty($data->htmleditor) ? $data->htmleditor : 0;
+    $updatedata['editorbackgroundcolor'] = !empty($data->backgroundcolor) ? $data->backgroundcolor : "#ffffff";
+    $updatedata['editorfontfamily'] = !empty($data->fontfamily) ? str_replace($nochars,"",$data->fontfamily) : "Times New Roman, Times";
+    $updatedata['editorfontsize'] = !empty($data->fontsize) ? $data->fontsize : "";
+    $updatedata['editorkillword'] = !empty($data->killword) ? $data->killword : 0;
+    $updatedata['editorspelling'] = !empty($data->spelling) ? $data->spelling : 0;
+    $updatedata['editorfontlist'] = $fontlist;
+    $updatedata['editordictionary'] = !empty($data->dictionary) ? $data->dictionary : '';
+    $updatedata['aspellpath'] = !empty($data->aspellpath) ? $data->aspellpath : '';
+
+    $hidebuttons = '';
+    if (!empty($data->buttons) && is_array($data->buttons)) {
+        foreach ($data->buttons as $key => $value) {
+            $hidebuttons .= $key . " ";
+        }
+    }
+    $updatedata['editorhidebuttons'] = trim($hidebuttons);
+
+    foreach ($updatedata as $name => $value) {
+        if (!(set_config($name, $value))) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+function reset_to_defaults () {
+/// Reset the values to default
+
+    global $CFG;
+    include_once($CFG->dirroot .'/lib/defaults.php');
+
+    $updatedata = array();
+
+    $updatedata['editorbackgroundcolor'] = $defaults['editorbackgroundcolor'];
+    $updatedata['editorfontfamily'] = $defaults['editorfontfamily'];
+    $updatedata['editorfontsize'] = $defaults['editorfontsize'];
+    $updatedata['editorkillword'] = $defaults['editorkillword'];
+    $updatedata['editorspelling'] = $defaults['editorspelling'];
+    $updatedata['editorfontlist'] = $defaults['editorfontlist'];
+    $updatedata['editorhidebuttons'] = $defaults['editorhidebuttons'];
+    $updatedata['editordictionary'] = '';
+
+    foreach ($updatedata as $name => $value) {
+        if (!(set_config($name, $value))) {
+            return false;
+        }
+    }
+    return true;
+}
+
+function editor_get_dictionaries () {
+/// Get all installed dictionaries in the system
+
+    global $CFG;
+
+    error_reporting(E_ALL); // for debug, final version shouldn't have this...
+    clearstatcache();
+
+    $strerror = '';
+
+    // If aspellpath isn't set don't even bother ;-)
+    if (empty($CFG->aspellpath)) {
+        return $strerror = 'Empty aspell path!';
+    }
+
+    // Do we have access to popen function?
+    if (!function_exists('popen')) {
+        return $strerror = "Popen function disabled!";
+        exit;
+    }
+
+    global $CFG;
+
+    $cmd          = $CFG->aspellpath;
+    $output       = '';
+    $dictionaries = array();
+    $dicts        = array();
+
+    if(!($handle = @popen($cmd .' dump dicts', 'r'))) {
+        return $strerror = "Couldn't create handle!";
+        exit;
+    }
+
+    while(!feof($handle)) {
+        $output .= fread($handle, 1024);
+    }
+    @pclose($handle);
+
+    $dictionaries = explode(chr(10), $output);
+
+    // Get rid of possible empty values
+    if (is_array($dictionaries)) {
+
+        $cnt = count($dictionaries);
+
+        for ($i = 0; $i < $cnt; $i++) {
+            if (!empty($dictionaries[$i])) {
+                $dicts[] = $dictionaries[$i];
+            }
+        }
+    }
+
+    if (count($dicts) >= 1) {
+        return $dicts;
+    }
+
+    $strerror = "Error! Check your aspell installation!";
+    return $strerror;
+
+}
+
+?>

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_SAFEDIR);
-
-// 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,120 +1,88 @@
-<?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
- */
+    include("../config.php");
 
-require_once('../config.php');
-require_once($CFG->libdir.'/adminlib.php');
+    $enrol = optional_param('enrol', $CFG->enrol, PARAM_ALPHA);
 
-$action  = required_param('action', PARAM_ACTION);
-$enrol   = required_param('enrol', PARAM_SAFEDIR);
-$confirm = optional_param('confirm', 0, PARAM_BOOL);
+    require_login();
 
-$PAGE->set_url('/admin/enrol.php');
+    if (!$site = get_site()) {
+        redirect("index.php");
+    }
 
-require_login();
-require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
-require_sesskey();
+    if (!isadmin()) {
+        error("Only the admin can use this page");
+    }
 
-$enabled = enrol_get_plugins(true);
-$all     = enrol_get_plugins(false);
+    if (!confirm_sesskey()) {
+        error(get_string('confirmsesskeybad', 'error'));
+    }
 
-$return = new moodle_url('/admin/settings.php', array('section'=>'manageenrols'));
+    require_once("$CFG->dirroot/enrol/$enrol/enrol.php");   /// Open the class
 
-switch ($action) {
-    case 'disable':
-        unset($enabled[$enrol]);
-        set_config('enrol_plugins_enabled', implode(',', array_keys($enabled)));
-        break;
+    $enrolment = new enrolment_plugin();
 
-    case 'enable':
-        if (!isset($all[$enrol])) {
-            break;
+
+/// If data submitted, then process and store.
+
+    if ($frm = data_submitted()) {
+        if ($enrolment->process_config($frm)) {
+            set_config('enrol', $frm->enrol);
+            redirect("enrol.php?sesskey=$USER->sesskey", get_string("changessaved"), 1);
         }
-        $enabled = array_keys($enabled);
-        $enabled[] = $enrol;
-        set_config('enrol_plugins_enabled', implode(',', $enabled));
-        break;
+    } else {
+        $frm = $CFG;
+    }
 
-    case 'up':
-        if (!isset($enabled[$enrol])) {
-            break;
-        }
-        $enabled = array_keys($enabled);
-        $enabled = array_flip($enabled);
-        $current = $enabled[$enrol];
-        if ($current == 0) {
-            break; //already at the top
-        }
-        $enabled = array_flip($enabled);
-        $enabled[$current] = $enabled[$current - 1];
-        $enabled[$current - 1] = $enrol;
-        set_config('enrol_plugins_enabled', implode(',', $enabled));
-        break;
+/// Otherwise fill and print the form.
 
-    case 'down':
-        if (!isset($enabled[$enrol])) {
-            break;
-        }
-        $enabled = array_keys($enabled);
-        $enabled = array_flip($enabled);
-        $current = $enabled[$enrol];
-        if ($current == count($enabled) - 1) {
-            break; //already at the end
-        }
-        $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);
-        } else {
-            $strplugin = $enrol;
-        }
-
-        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;
-
-        } else {  // Delete everything!!
-            uninstall_plugin('enrol', $enrol);
-
-            $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;
-        }
-}
+    /// get language strings
+    $str = get_strings(array('enrolments', 'users', 'administration', 'settings'));
 
 
-redirect($return);
+    $modules = get_list_of_plugins("enrol");
+    foreach ($modules as $module) {
+        $options[$module] = get_string("enrolname", "enrol_$module");
+    }
+    asort($options);
+
+    print_header("$site->shortname: $str->enrolments", "$site->fullname",
+                  "<a href=\"index.php\">$str->administration</a> -> 
+                   <a href=\"users.php\">$str->users</a> -> $str->enrolments");
+
+    echo "<form target=\"{$CFG->framename}\" name=\"enrolmenu\" method=\"post\" action=\"enrol.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.php?sesskey=$USER->sesskey&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 />";
+   // print_heading($str->settings);
+    
+    $enrolment->config_form($frm);
+
+    echo "<center><p><input type=\"submit\" value=\"".get_string("savechanges")."\"></p></center>\n";
+    echo "</form>";
+
+    print_simple_box_end();
+
+    print_footer();
+
+    exit;
+?>

admin/environment.php

@@ -1,4 +1,4 @@
-<?php
+<?php  //$Id$
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
@@ -7,7 +7,7 @@
 // Moodle - Modular Object-Oriented Dynamic Learning Environment         //
 //          http://moodle.com                                            //
 //                                                                       //
-// Copyright (C) 1999 onwards Martin Dougiamas     http://dougiamas.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  //
@@ -30,16 +30,24 @@
 // 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');
 
-    admin_externalpage_setup('environment');
 
 /// Parameters
-    $action  = optional_param('action', '', PARAM_ACTION);
-    $version = optional_param('version', '', PARAM_FILE); //
+    $action = optional_param('action', '', PARAM_ALPHA);
+    $sesskey = optional_param('sesskey');
+    $version = optional_param('version');
 
+/// Security checks
+    require_login();
+
+    if (!isadmin()) {
+        error('You need to be admin to use this page');
+    }
+
+    if (!$site = get_site()) {
+        error("Site isn't defined!");
+    }
 
 /// Get some strings
     $stradmin = get_string('administration');
@@ -47,50 +55,18 @@
     $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');
 
 /// Print the header stuff
-    echo $OUTPUT->header();
+    print_header("$SITE->shortname: $strenvironment", $SITE->fullname,
+                 "<a href=\"index.php\">$stradmin</a> -> ".$strenvironment);
 
-/// Print the component download link
-    echo '<div class="reportlink"><a href="environment.php?action=updatecomponent&amp;sesskey='.sesskey().'">'.$strupdate.'</a></div>';
-
-    echo $OUTPUT->heading($strenvironment);
-
-/// 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.'/';
-                        echo $OUTPUT->box(get_string($cd->get_error(), 'error', $a), 'errorbox');
-                    } else {
-                        echo $OUTPUT->box(get_string($cd->get_error(), 'error'), 'errorbox');
-                    }
-                    break;
-                case COMPONENT_UPTODATE:
-                    echo $OUTPUT->box(get_string($cd->get_error(), 'error'));
-                    break;
-                case COMPONENT_INSTALLED:
-                    echo $OUTPUT->box(get_string('componentinstalled', 'admin'));
-                    break;
-            }
-        }
-    }
+    print_heading($strenvironment);
 
 /// Start of main box
-    echo $OUTPUT->box_start();
+    print_simple_box_start('center');
 
-    echo "<div style=\"text-align:center\">".$stradminhelpenvironment."</div><br />";
+    echo "<center>".$stradminhelpenvironment."</center><br />";
 
 /// Get current Moodle version
     $current_version = $CFG->release;
@@ -106,7 +82,7 @@
             if (empty($version)) {
                 $version =  $env_version;
             }
-        ///Iterate over each version, adding bigger than current
+        ///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;
@@ -120,18 +96,33 @@
     }
 
 /// Print form and popup menu
-    echo '<div style="text-align:center"> ';
-    $select = new single_select(new moodle_url('/admin/environment.php'), 'version', $versions, $version, null);
-    $select->label = $strmoodleversion;
-    echo $OUTPUT->render($select);
-    echo '</div>';
-
+    echo '<center><form method="post" action="'.$CFG->wwwroot.'/admin/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
-    echo $OUTPUT->box_end();
+    print_simple_box_end();
 
 /// Gather and show results
     $status = check_moodle_environment($version, $environment_results);
 
-/// Print footer
-    echo $OUTPUT->footer();
 
+
+/// Process action
+    if ($form = data_submitted()) {
+        if (confirm_sesskey()) {
+            if ($form->action == "disable") {
+
+            } else {
+
+            }
+        }
+    }
+
+/// Default action, show explanation and popup menu
+
+
+/// Print footer
+    print_footer();
+?>

admin/environment.xml

@@ -12,434 +12,13 @@
   </MOODLE>
   <MOODLE version="1.6">
     <DATABASE level="required">
-      <VENDOR name="mysql" version="4.1.16">
-        <FEEDBACK>
-          <ON_ERROR message="mysql416required" />
-        </FEEDBACK>
-        <BYPASS function="bypass_mysql416_reqs" message="mysql416bypassed" />
-      </VENDOR>
+      <VENDOR name="mysql" version="4.1.12" />
       <VENDOR name="postgres" version="7.4" />
     </DATABASE>
     <PHP version="4.3.0" level="required" />
     <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="iconv" level="optional" />
+      <PHP_EXTENSION name="mbstring" level="optional" />
     </PHP_EXTENSIONS>
   </MOODLE>
-  <MOODLE version="1.7">
-    <UNICODE level="optional">
-      <FEEDBACK>
-        <ON_CHECK message="unicoderecommended" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mysql" version="4.1.16">
-        <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" />
-      <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_EXTENSIONS>
-  </MOODLE>
-  <MOODLE version="1.8">
-    <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="7.4" />
-      <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_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">
-        <FEEDBACK>
-          <ON_ERROR message="mysql416required" />
-        </FEEDBACK>
-      </VENDOR>
-      <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">
-        <FEEDBACK>
-          <ON_ERROR message="mysql416required" />
-        </FEEDBACK>
-      </VENDOR>
-      <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>
 </COMPATIBILITY_MATRIX>

admin/filters.html

@@ -0,0 +1,159 @@
+<?php print_simple_box_start("center"); ?>
+
+<form name="filters" id="filters" method="post" action="filters.php">
+<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
+  <table align="center" border="0" cellpadding="5" cellspacing="0">
+    <tr>
+      <td valign="top"><div align="right">
+        <br />
+        <input name="up" type="submit" id="up" value="&uarr;" />
+        <br />
+        <input name="down" type="submit" id="down" value="&darr;" />
+        <br />
+        </div></td>
+      <td valign="top">
+          <?php p($stractive) ?>
+          <br />
+      
+          <select name="iselect" size="20" id="iselect" 
+                  onclick="document.filters.add.disabled=true;
+                           document.filters.remove.disabled=false;
+                           document.filters.uselect.selectedIndex=-1;">
+          <?php 
+              $runscript = "";
+              foreach ($installedfilters as $filter) {
+                  if ($selectedfilter == $filter) {
+                      $selected = " selected ";
+                      $runscript = "eval(\"document.filters.add.disabled=true\");
+                                    eval(\"document.filters.remove.disabled=false\");
+                                    eval(\"document.filters.uselect.selectedIndex=-1\");";
+                  } else {
+                      $selected = "";
+                  }
+                  echo "<option value=\"$filter\" $selected>".$allfilters[$filter]."</option>";
+              }
+          ?>
+          </select></td>
+      <td valign="top">
+        <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">
+          <?php p($strinactive) ?>
+          <br />
+          <select name="uselect" size="20" id="select" 
+                  onclick="document.filters.add.disabled=false;
+                           document.filters.remove.disabled=true;
+                           document.filters.iselect.selectedIndex=-1;">
+          <?php
+              foreach ($uninstalledfilters as $filter) {
+                  if ($selectedfilter == $filter) {
+                      $selected = " selected ";
+                      $runscript = "eval(\"document.filters.add.disabled=false\");
+                                    eval(\"document.filters.remove.disabled=true\");
+                                    eval(\"document.filters.iselect.selectedIndex=-1\");";
+                  } else {
+                      $selected = "";
+                  }
+                  echo "<option value=\"$filter\" $selected>".$allfilters[$filter]."</option>";
+              }
+          ?>
+         </select></td>
+    </tr>
+  </table>
+</form>
+
+<script language="Javascript">
+<!--
+<?php echo $runscript ?>
+
+-->
+</script>
+<?php print_simple_box_end(); ?>
+
+<br />
+<br />
+
+
+<?php print_simple_box_start("center"); ?>
+
+<form name="options" id="options" method="post" action="filters.php">
+<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
+<input type="hidden" name="options" value="1">
+<table cellpadding="20">
+<tr valign="top">
+    <td nowrap="nowrap" align="right"><?php p($strcachetext) ?>:</td>
+    <td>
+    <?php 
+       unset($options);
+       $options[604800]  = get_string('numdays', '', 7);
+       $options[86400]  = get_string('numdays', '', 1);
+       $options[43200]  = get_string('numhours', '', 12);
+       $options[10800] = get_string('numhours', '', 3);
+       $options[7200]  = get_string('numhours', '', 2);
+       $options[3600]  = get_string('numhours', '', 1);
+       $options[2700]  = get_string('numminutes', '', 45);
+       $options[1800]  = get_string('numminutes', '', 30);
+       $options[900]   = get_string('numminutes', '', 15);
+       $options[600]   = get_string('numminutes', '', 10);
+       $options[540]   = get_string('numminutes', '',  9);
+       $options[480]   = get_string('numminutes', '',  8);
+       $options[420]   = get_string('numminutes', '',  7);
+       $options[360]   = get_string('numminutes', '',  6);
+       $options[300]   = get_string('numminutes', '',  5);
+       $options[240]   = get_string('numminutes', '',  4);
+       $options[180]   = get_string('numminutes', '',  3);
+       $options[120]   = get_string('numminutes', '',  2);
+       $options[60]    = get_string('numminutes', '',  1);
+       $options[30]    = get_string('numseconds', '',  30);
+       $options[0]     = get_string('no');
+
+       choose_from_menu ($options, "cachetext", $CFG->cachetext, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php p($strconfigcachetext) ?>
+    </td>
+</tr>
+<tr valign="top">
+    <td nowrap="nowrap" align="right"><?php p($strfilteruploadedfiles) ?>:</td>
+    <td>
+    <?php 
+       unset($options);
+       $options[0] = get_string('no');
+       $options[1] = get_string('yes');
+
+       choose_from_menu ($options, "filteruploadedfiles", $CFG->filteruploadedfiles, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php p($strconfigfilteruploadedfiles) ?>
+    </td>
+</tr>
+<tr valign="top">
+    <td nowrap="nowrap" align="right"><?php p($strfilterall) ?>:</td>
+    <td>
+    <?php 
+       unset($options);
+       $options[0] = get_string('no');
+       $options[1] = get_string('yes');
+
+       choose_from_menu ($options, "filterall", $CFG->filterall, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php p($strconfigfilterall) ?>
+    </td>
+</tr>
+<tr valign="top">
+    <td>&nbsp;</td>
+    <td><input type="submit" value="<?php print_string("savechanges") ?>"></td>
+    <td>&nbsp;</td>
+</tr>
+</table>
+</form>
+
+<?php print_simple_box_end(); ?>

admin/filters.php

@@ -1,285 +1,173 @@
-<?php
+<?PHP // $Id$
+      // Allows the admin to create, delete and rename course categories
 
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// 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");
 
-/**
- * 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
- *//** */
-
-    require_once(dirname(__FILE__) . '/../config.php');
-    require_once($CFG->libdir . '/adminlib.php');
-
-    $action = optional_param('action', '', PARAM_ACTION);
-    $filterpath = optional_param('filterpath', '', PARAM_PATH);
+    optional_variable($iselect);
+    optional_variable($uselect);
+    optional_variable($add);
+    optional_variable($remove);
+    optional_variable($up);
+    optional_variable($down);
 
     require_login();
-    $systemcontext = get_context_instance(CONTEXT_SYSTEM);
-    require_capability('moodle/site:config', $systemcontext);
 
-    $returnurl = "$CFG->wwwroot/$CFG->admin/filters.php";
-    admin_externalpage_setup('managefilters');
-
-    $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]);
+    if (!isadmin()) {
+        error("Only administrators can use this page!");
     }
 
-/// Process actions ============================================================
-
-    if ($action) {
-        if (!isset($filters[$filterpath]) && !isset($newfilters[$filterpath])) {
-            throw new moodle_exception('filternotinstalled', 'error', $returnurl, $filterpath);
-        }
-
-        if (!confirm_sesskey()) {
-            redirect($returnurl);
-        }
+    if (!$site = get_site()) {
+        error("Site isn't defined!");
     }
 
-    switch ($action) {
+/// Print headings
 
-    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]);
-        }
-        break;
+    $stradministration = get_string("administration");
+    $strconfiguration = get_string("configuration");
+    $strmanagefilters = get_string("managefilters");
+    $strversion = get_string("version");
+    $strsettings = get_string("settings");
+    $strup = get_string("up");
+    $strdown = get_string("down");
+    $stractive = get_string("active");
+    $strinactive = get_string("inactive");
+    $strcachetext = get_string("cachetext", "admin");
+    $strconfigcachetext = get_string("configcachetext", 'admin');
+    $strfilteruploadedfiles = get_string("filteruploadedfiles", "admin");
+    $strfilterall = get_string("filterall", "admin");
+    $strconfigfilteruploadedfiles = get_string("configfilteruploadedfiles", 'admin');
+    $strconfigfilterall = get_string("configfilterall", "admin");
 
-    case 'setapplyto':
-        $applytostrings = optional_param('stringstoo', false, PARAM_BOOL);
-        filter_set_applies_to_strings($filterpath, $applytostrings);
-        break;
+    print_header("$site->shortname: $strmanagefilters", "$site->fullname", 
+                 "<a href=\"index.php\">$stradministration</a> -> ".
+                 "<a href=\"configure.php\">$strconfiguration</a> -> $strmanagefilters");
 
-    case 'down':
-        if (isset($filters[$filterpath])) {
-            $oldpos = $filters[$filterpath]->sortorder;
-            if ($oldpos <= count($filters)) {
-                filter_set_global_state($filterpath, $filters[$filterpath]->active, $oldpos + 1);
+    print_heading($strmanagefilters);
+
+
+/// Make a list of all available filters and the best names for them we can find
+    $allfilters = array();
+
+    $filterlocations = array("mod", "filter");
+
+    foreach ($filterlocations as $filterlocation) {
+        $plugins = get_list_of_plugins($filterlocation);
+        foreach ($plugins as $key => $plugin) {
+            if (is_readable("$CFG->dirroot/$filterlocation/$plugin/filter.php")) {
+                $name = trim(get_string("filtername", $plugin));
+                if (empty($name) or $name == "[[filtername]]") {
+                    $name = $plugin;
+                }
+                $allfilters["$filterlocation/$plugin"] = $name;
             }
         }
-        break;
+    }
 
-    case 'up':
-        if (isset($filters[$filterpath])) {
-            $oldpos = $filters[$filterpath]->sortorder;
-            if ($oldpos >= 1) {
-                filter_set_global_state($filterpath, $filters[$filterpath]->active, $oldpos - 1);
+   
+/// Make an array of all the currently installed filters
+
+    $installedfilters = array();
+    if (!empty($CFG->textfilters)) {
+        $installedfilters = explode(',',$CFG->textfilters);
+
+        // Do a little cleanup for robustness
+        foreach ($installedfilters as $key => $installedfilter) {
+            if (empty($installedfilter)) {
+                unset($installedfilters[$key]);
+                set_config("textfilters", implode(',', $installedfilters));
             }
         }
-        break;
-
-    case 'delete':
-        if (!empty($filternames[$filterpath])) {
-            $filtername = $filternames[$filterpath];
-        } else {
-            $filtername = $filterpath;
-        }
-
-        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);
-        }
-
-        // 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;
-        }
-
-        // 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;
     }
 
-    // Add any missing filters to the DB table.
-    foreach ($newfilters as $filter => $notused) {
-        filter_set_global_state($filter, TEXTFILTER_DISABLED);
-    }
+    $selectedfilter = "none";
 
-    // Reset caches and return
-    if ($action) {
-        reset_text_filters_cache();
-        redirect($returnurl);
-    }
+/// If data submitted, then process and store.
 
-/// 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;
+    if (!empty($options)) {
+        if (($config = data_submitted()) && confirm_sesskey()) {  
+            unset($config->options);
+            unset($config->sesskey);
+            foreach ($config as $name => $value) {
+                set_config($name, $value);
+            }
         }
     }
 
-    // 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[] = '';
+    if (!empty($add) and !empty($uselect) and confirm_sesskey()) {
+        $selectedfilter = $uselect;
+        if (!in_array($selectedfilter, $installedfilters)) {
+            $installedfilters[] = $selectedfilter;
+            set_config("textfilters", implode(',', $installedfilters));
         }
-        $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));
-    $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 if (!empty($remove) and !empty($iselect) and confirm_sesskey()) {
+        $selectedfilter = $iselect;
+        foreach ($installedfilters as $key => $installedfilter) {
+            if ($installedfilter == $selectedfilter) {
+                unset($installedfilters[$key]);
+            }
         }
-        if (!$islastactive) {
-            $updown .= $OUTPUT->action_icon(filters_action_url($filter, 'down'), new pix_icon('t/down', get_string('down')));
-        } else {
-            $updown .= $spacer;
+        set_config("textfilters", implode(',', $installedfilters));
+
+    } else if ((!empty($up) or !empty($down)) and !empty($iselect) and confirm_sesskey()) {
+
+        if (!empty($up)) {
+            if ($allfilters[$iselect]) {
+                foreach ($installedfilters as $key => $installedfilter) {
+                    if ($installedfilter == $iselect) {
+                        $movefilter = $key;
+                        break;
+                    }
+                    $swapfilter = $key;
+                }
+            }
+        }
+        if (!empty($down)) {
+            if ($allfilters[$iselect]) {
+                $choosenext = false;
+                foreach ($installedfilters as $key => $installedfilter) {
+                    if ($choosenext) {
+                        $swapfilter = $key;
+                        break;
+                    }
+                    if ($installedfilter == $iselect) {
+                        $movefilter = $key;
+                        $choosenext = true;
+                    }
+                }
+            }
+        }
+        if (isset($swapfilter) and isset($movefilter)) {
+            $tempfilter = $installedfilters[$swapfilter];
+            $installedfilters[$swapfilter] = $installedfilters[$movefilter];
+            $installedfilters[$movefilter] = $tempfilter;
+            set_config("textfilters", implode(',', $installedfilters));
+        }
+        $selectedfilter = $iselect;
+    }
+
+
+
+/// Make an array of all the currently uninstalled filters
+
+    $uninstalledfilters = array();
+    foreach ($allfilters as $filter => $name) {
+        $installed = false;
+        foreach ($installedfilters as $installedfilter) {
+            if ($installedfilter == $filter) {
+                $installed = true;
+            }
+        }
+        if (!$installed) {
+            $uninstalledfilters[] = $filter;
         }
     }
-    $row[] = $updown;
 
-    // Apply to strings.
-    $select = new single_select(filters_action_url($filter, 'setapplyto'), 'stringstoo', $applytochoices, $applytostrings, null, 'applyto' . basename($filter));
-    $select->disabled = $filterinfo->active == TEXTFILTER_DISABLED;
-    $row[] = $OUTPUT->render($select);
+/// Print the current form
 
-    // 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[] = '';
-    }
+    include("filters.html");
 
-    // Delete
-    if (substr($filter, 0, 4) != 'mod/') {
-        $row[] = '<a href="' . filters_action_url($filter, 'delete') . '">' . get_string('delete') . '</a>';
-    } else {
-        $row[] = '';
-    }
 
-    return $row;
-}
+    print_footer();
+
+?>

admin/handlevirus.php

@@ -1,20 +1,19 @@
-<?php
+<?
 /** 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

@@ -1,32 +1,23 @@
-<?php
+<?php  // $Id$
 
-    ob_start(); //for whitespace test
     require_once('../config.php');
 
-    // extra whitespace test - intentionally breaks cookieless mode
-    $extraws = '';
-    while (ob_get_level()) {
-        $extraws .= ob_get_contents();
-        ob_end_clean();
-    }
-
-    require_once($CFG->libdir.'/adminlib.php');
-
-    admin_externalpage_setup('healthcenter');
-
     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));
+    if (!isadmin()) {
+        error('Only the admin can use this page');
+    }
 
     $site = get_site();
+    $stradmin         = get_string('administration');
+    $strhealthcenter  = get_string('healthcenter');
 
-    echo $OUTPUT->header();
+    print_header($site->shortname.': '.$strhealthcenter, $site->fullname,
+                  '<a href="index.php">'.$stradmin.'</a> -> '.$strhealthcenter);
 
 echo <<<STYLES
 <style type="text/css">
@@ -90,7 +81,9 @@ dd.solution li {
 </style>
 STYLES;
 
-    if(strpos($solution, 'problem_') === 0 && class_exists($solution)) {
+    $solution = optional_param('solution', NULL);
+
+    if(!empty($solution) && class_exists($solution)) {
         health_print_solution($solution);
     }
     else {
@@ -98,13 +91,12 @@ STYLES;
     }
 
 
-    echo $OUTPUT->footer();
+    print_footer();
 
 
 function health_find_problems() {
-    global $OUTPUT;
 
-    echo $OUTPUT->heading(get_string('healthcenter'));
+    print_heading(get_string('healthcenter'));
 
     $issues   = array(
         SEVERITY_CRITICAL    => array(),
@@ -138,7 +130,7 @@ function health_find_problems() {
         echo '</div>';
     }
     else {
-        echo $OUTPUT->heading(get_string('healthproblemsdetected'));
+        print_heading(get_string('healthproblemsdetected'));
         $severities = array(SEVERITY_CRITICAL, SEVERITY_SIGNIFICANT, SEVERITY_ANNOYANCE, SEVERITY_NOTICE);
         foreach($severities as $severity) {
             if(!empty($issues[$severity])) {
@@ -157,7 +149,6 @@ function health_find_problems() {
 }
 
 function health_print_solution($classname) {
-    global $OUTPUT;
     $problem = new $classname;
     $data = array(
         'title'       => $problem->title(),
@@ -166,8 +157,8 @@ function health_print_solution($classname) {
         'solution'    => $problem->solution()
     );
 
-    echo $OUTPUT->heading(get_string('healthcenter'));
-    echo $OUTPUT->heading(get_string('healthproblemsolution'));
+    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>';
@@ -196,15 +187,46 @@ class problem_base {
     }
 }
 
-class problem_000002 extends problem_base {
+class problem_000001 extends problem_base {
     function title() {
-        return 'Extra characters at the end of config.php or other library function';
+        return 'Invalid value for $CFG->dirroot';
     }
     function exists() {
-        global $extraws;
+        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>';
+    }
+}
 
-        if($extraws === '') {
-            return false;
+class problem_000002 extends problem_base {
+    function title() {
+        return 'Extra characters at the end of config.php';
+    }
+    function exists() {
+        // [pj] When the requirements are raised to PHP 4.3.0 this will be file_get_contents()
+        if($fp = @fopen('../config.php', 'r')) {
+            $contents = fread($fp, 16384); // 16K should be enough
+            $ending = substr($contents, -2);
+            unset($contents);
+            if($ending == '?>') {
+                return false;
+            }
+            fclose($fp);
         }
         return true;
     }
@@ -212,11 +234,11 @@ class problem_000002 extends problem_base {
         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.';
+        return 'Your Moodle configuration file, config.php, contains some characters after the closing PHP tag (?>). This could cause Moodle to exhibit several kinds of problems and should 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.';
+        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.';
     }
 }
 
@@ -249,8 +271,8 @@ class problem_000004 extends problem_base {
         return 'cron.php is not set up to run automatically';
     }
     function exists() {
-        global $DB;
-        $lastcron = $DB->get_field_sql('SELECT max(lastcron) FROM {modules}');
+        global $CFG;
+        $lastcron = get_field_sql('SELECT max(lastcron) FROM '.$CFG->prefix.'modules');
         return (time() - $lastcron > 3600 * 24);
     }
     function severity() {
@@ -327,44 +349,24 @@ class problem_000008 extends problem_base {
         return 'PHP: memory_limit cannot be controlled by Moodle';
     }
     function exists() {
-        global $CFG;
-
-        $oldmemlimit = @ini_get('memory_limit');
-        if (empty($oldmemlimit)) {
+        $memlimit = @ini_get('memory_limit');
+        if(empty($memlimit)) {
             // 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;
+            // probably limited to 8M so we have a problem...
+            return true;
         }
-        $oldmemlimit = get_real_size($oldmemlimit);
-        //now lets change the memory limit to something higher
-        $newmemlimit = ($oldmemlimit + 1024*1024*5);
-        raise_memory_limit($newmemlimit);
-        $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;
-            }
-        }
-        reduce_memory_limit($oldmemlimit);
+        // Otherwise, raise_memory_limit in setup.php will do the trick
         return false;
     }
     function severity() {
-        return SEVERITY_NOTICE;
+        return SEVERITY_ANNOYANCE;
     }
     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.';
+        return 'The settings for PHP on your server do not allow a script to request more memory during its execution. This means that most likely there is a hard limit of 8MB 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. Therefore, it is recommended that you contact your server administrator to address this issue.';
     }
     function solution() {
-        return 'It is recommended that you contact your web server administrator to address this issue.';
+        global $CFG;
+        return 'We need a good solution here. Enabling memory limit control means recompiling PHP... maybe this should be SEVERITY_NOTICE instead of SEVERITY_ANNOYANCE?';
     }
 }
 
@@ -388,14 +390,14 @@ class problem_000009 extends problem_base {
         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.');
     }
 }
-/* // not implemented in 2.0 yet
+
 class problem_000010 extends problem_base {
     function title() {
         return 'Uploaded files: slasharguments disabled or not working';
     }
     function exists() {
         if (!$this->is_enabled()) {
-            return true;
+            return true;   
         }
         if ($this->status() < 1) {
             return true;
@@ -405,7 +407,7 @@ class problem_000010 extends problem_base {
     function severity() {
         if ($this->is_enabled() and $this->status() == 0) {
             return SEVERITY_SIGNIFICANT;
-        } else {
+        } else { 
             return SEVERITY_ANNOYANCE;
         }
     }
@@ -413,12 +415,12 @@ class problem_000010 extends problem_base {
         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>';
+            $desc .= '<li>slasharguments are <strong>disabled</strong> in Moodle configuration</li>';   
         } else {
-            $desc .= '<li>slasharguments are enabled in Moodle configuration</li>';
+            $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>';
+            $desc .= '<li>can not run automatic test, you can verify it <a href="'.$CFG->wwwroot.'/file.php/testslasharguments" target="_blank">here</a></li>';
         } else if ($this->status() == 0) {
             $desc .= '<li>slashargument test <strong>failed</strong>, please check server configuration</li>';
         } else {
@@ -446,9 +448,9 @@ class problem_000010 extends problem_base {
             $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>';
+            $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;
     }
@@ -459,13 +461,13 @@ class problem_000010 extends problem_base {
     function status() {
         global $CFG;
         $handle = @fopen($CFG->wwwroot.'/file.php?file=/testslasharguments', "r");
-        $contents = @trim(fread($handle, 10));
+        $contents = trim(@fread($handle, 7));
         @fclose($handle);
         if ($contents != 'test -1') {
             return -1;
         }
         $handle = @fopen($CFG->wwwroot.'/file.php/testslasharguments', "r");
-        $contents = trim(@fread($handle, 10));
+        $contents = trim(@fread($handle, 6));
         @fclose($handle);
         switch ($contents) {
             case 'test 1': return 1;
@@ -473,292 +475,41 @@ class problem_000010 extends problem_base {
             default:  return 0;
         }
     }
-}*/
+}
 
-class problem_000012 extends problem_base {
+class problem_000011 extends problem_base {
     function title() {
-        return 'Random questions data consistency';
+        return 'Session errors detected';
     }
     function exists() {
-        global $DB;
-        return $DB->record_exists_select('question', "qtype = 'random' AND parent <> id", array());
+        global $CFG;
+        return isset($CFG->session_error_counter);
     }
     function severity() {
         return SEVERITY_ANNOYANCE;
     }
     function description() {
-        return '<p>For random questions, question.parent should equal question.id. ' .
-        'There are some questions in your database for which this is not true. ' .
-        'One way that this could have happened is for random questions restored from backup before ' .
-        '<a href="http://tracker.moodle.org/browse/MDL-5482">MDL-5482</a> was fixed.</p>';
+        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;
-        return '<p>Upgrade to Moodle 1.9.1 or later, or manually execute the SQL</p>' .
-        '<pre>UPDATE ' . $CFG->prefix . 'question SET parent = id WHERE qtype = \'random\' and parent &lt;> id;</pre>';
-    }
-}
-
-class problem_000013 extends problem_base {
-    function title() {
-        return 'Multi-answer questions data consistency';
-    }
-    function exists() {
-        global $DB;
-        $positionexpr = $DB->sql_position($DB->sql_concat("','", "q.id", "','"),
-                $DB->sql_concat("','", "qma.sequence", "','"));
-        return $DB->record_exists_sql("
-                SELECT * FROM {question} q
-                    JOIN {question_multianswer} qma ON $positionexpr > 0
-                WHERE qma.question <> q.parent") ||
-            $DB->record_exists_sql("
-                SELECT * FROM {question} q
-                    JOIN {question} parent_q ON parent_q.id = q.parent
-                WHERE q.category <> parent_q.category");
-    }
-    function severity() {
-        return SEVERITY_ANNOYANCE;
-    }
-    function description() {
-        return '<p>For each sub-question whose id is listed in ' .
-        'question_multianswer.sequence, its question.parent field should equal ' .
-        'question_multianswer.question; and each sub-question should be in the same ' .
-        'category as its parent. There are questions in your database for ' .
-        'which this is not the case. One way that this could have happened is ' .
-        'for multi-answer questions restored from backup before ' .
-        '<a href="http://tracker.moodle.org/browse/MDL-14750">MDL-14750</a> was fixed.</p>';
-    }
-    function solution() {
-        return '<p>Upgrade to Moodle 1.9.1 or later, or manually execute the ' .
-        'code in question_multianswer_fix_subquestion_parents_and_categories in ' .
-        '<a href="http://cvs.moodle.org/moodle/question/type/multianswer/db/upgrade.php?revision=1.1.10.2&amp;view=markup">/question/type/multianswer/db/upgrade.php' .
-        'from the 1.9 stable branch</a>.</p>';
-    }
-}
-
-class problem_000014 extends problem_base {
-    function title() {
-        return 'Only multianswer and random questions should be the parent of another question';
-    }
-    function exists() {
-        global $DB;
-        return $DB->record_exists_sql("
-                SELECT * FROM {question} q
-                    JOIN {question} parent_q ON parent_q.id = q.parent
-                WHERE parent_q.qtype NOT IN ('random', 'multianswer')");
-    }
-    function severity() {
-        return SEVERITY_ANNOYANCE;
-    }
-    function description() {
-        return '<p>You have questions that violate this in your databse. ' .
-        'You will need to investigate to determine how this happened.</p>';
-    }
-    function solution() {
-        return '<p>It is impossible to give a solution without knowing more about ' .
-        ' how the problem was caused. You may be able to get help from the ' .
-        '<a href="http://moodle.org/mod/forum/view.php?f=121">Quiz forum</a>.</p>';
-    }
-}
-
-class problem_000015 extends problem_base {
-    function title() {
-        return 'Question categories should belong to a valid context';
-    }
-    function exists() {
-        global $DB;
-        return $DB->record_exists_sql("
-            SELECT qc.*, (SELECT COUNT(1) FROM {question} q WHERE q.category = qc.id) AS numquestions
-            FROM {question_categories} qc
-                LEFT JOIN {context} con ON qc.contextid = con.id
-            WHERE con.id IS NULL");
-    }
-    function severity() {
-        return SEVERITY_ANNOYANCE;
-    }
-    function description() {
-        global $DB;
-        $problemcategories = $DB->get_records_sql("
-            SELECT qc.id, qc.name, qc.contextid, (SELECT COUNT(1) FROM {question} q WHERE q.category = qc.id) AS numquestions
-            FROM {question_categories} qc
-                LEFT JOIN {context} con ON qc.contextid = con.id
-            WHERE con.id IS NULL
-            ORDER BY numquestions DESC, qc.name");
-        $table = '<table><thead><tr><th>Cat id</th><th>Category name</th>' .
-        "<th>Context id</th><th>Num Questions</th></tr></thead><tbody>\n";
-        foreach ($problemcategories as $cat) {
-            $table .= "<tr><td>$cat->id</td><td>" . s($cat->name) . "</td><td>" .
-            $cat->contextid ."</td><td>$cat->numquestions</td></tr>\n";
-        }
-        $table .= '</tbody></table>';
-        return '<p>All question categories are linked to a context id, and, ' .
-        'the context they are linked to must exist. The following categories ' .
-        'belong to a non-existant category:</p>' . $table . '<p>Any of these ' .
-        'categories that contain no questions can just be deleted form the database. ' .
-        'Other categories will require more thought.</p>';
-    }
-    function solution() {
-        global $CFG;
-        return '<p>You can delete the empty categories by executing the following SQL:</p><pre>
-DELETE FROM ' . $CFG->prefix . 'question_categories
-WHERE
-    NOT EXISTS (SELECT * FROM ' . $CFG->prefix . 'question q WHERE q.category = ' . $CFG->prefix . 'question_categories.id)
-AND NOT EXISTS (SELECT * FROM ' . $CFG->prefix . 'context con WHERE contextid = con.id)
-        </pre><p>Any remaining categories that contain questions will require more thought. ' .
-        'People in the <a href="http://moodle.org/mod/forum/view.php?f=121">Quiz forum</a> may be able to help.</p>';
-    }
-}
-
-class problem_000016 extends problem_base {
-    function title() {
-        return 'Question categories should belong to the same context as their parent';
-    }
-    function exists() {
-        global $DB;
-        return $DB->record_exists_sql("
-            SELECT parent_qc.id AS parent, child_qc.id AS child, child_qc.contextid
-            FROM {question_categories} child_qc
-                JOIN {question_categories} parent_qc ON child_qc.parent = parent_qc.id
-            WHERE child_qc.contextid <> parent_qc.contextid");
-    }
-    function severity() {
-        return SEVERITY_ANNOYANCE;
-    }
-    function description() {
-        global $DB;
-        $problemcategories = $DB->get_records_sql("
-            SELECT
-                parent_qc.id AS parentid, parent_qc.name AS parentname, parent_qc.contextid AS parentcon,
-                child_qc.id AS childid, child_qc.name AS childname, child_qc.contextid AS childcon
-            FROM {question_categories} child_qc
-                JOIN {question_categories} parent_qc ON child_qc.parent = parent_qc.id
-            WHERE child_qc.contextid <> parent_qc.contextid");
-        $table = '<table><thead><tr><th colspan="3">Child category</th><th colspan="3">Parent category</th></tr><tr>' .
-        '<th>Id</th><th>Name</th><th>Context id</th>' .
-        '<th>Id</th><th>Name</th><th>Context id</th>' .
-        "</tr></thead><tbody>\n";
-        foreach ($problemcategories as $cat) {
-            $table .= "<tr><td>$cat->childid</td><td>" . s($cat->childname) .
-            "</td><td>$cat->childcon</td><td>$cat->parentid</td><td>" . s($cat->parentname) .
-            "</td><td>$cat->parentcon</td></tr>\n";
-        }
-        $table .= '</tbody></table>';
-        return '<p>When one question category is the parent of another, then they ' .
-        'should both belong to the same context. This is not true for the following categories:</p>' .
-        $table;
-    }
-    function solution() {
-        return '<p>An automated solution is difficult. It depends whether the ' .
-        'parent or child category is in the wrong pace.' .
-        'People in the <a href="http://moodle.org/mod/forum/view.php?f=121">Quiz forum</a> may be able to help.</p>';
-    }
-}
-
-class problem_000017 extends problem_base {
-    function title() {
-        return 'Question categories tree structure';
-    }
-    function find_problems() {
-        global $DB;
-        static $answer = null;
-
-        if (is_null($answer)) {
-            $categories = $DB->get_records('question_categories', array(), 'id');
-
-            // Look for missing parents.
-            $missingparent = array();
-            foreach ($categories as $category) {
-                if ($category->parent != 0 && !array_key_exists($category->parent, $categories)) {
-                    $missingparent[$category->id] = $category;
-                }
+        if (isset($_GET['resetsesserrorcounter'])) {
+            if (get_field('config', 'name', 'name', 'session_error_counter')) {
+                delete_records('config', 'name', 'session_error_counter');
             }
-
-            // Look for loops.
-            $loops = array();
-            while (!empty($categories)) {
-                $current = array_pop($categories);
-                $thisloop = array($current->id => $current);
-                while (true) {
-                    if (isset($thisloop[$current->parent])) {
-                        // Loop detected
-                        $loops[$current->id] = $thisloop;
-                        break;
-                    } else if (!isset($categories[$current->parent])) {
-                        // Got to the top level, or a category we already know is OK.
-                        break;
-                    } else {
-                        // Continue following the path.
-                        $current = $categories[$current->parent];
-                        $thisloop[$current->id] = $current;
-                        unset($categories[$current->id]);
-                    }
-                }
-            }
-
-            $answer = array($missingparent, $loops);
+            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>';
         }
-
-        return $answer;
-    }
-    function exists() {
-        list($missingparent, $loops) = $this->find_problems();
-        return !empty($missingparent) || !empty($loops);
-    }
-    function severity() {
-        return SEVERITY_ANNOYANCE;
-    }
-    function description() {
-        list($missingparent, $loops) = $this->find_problems();
-
-        $description = '<p>The question categories should be arranged into tree ' .
-                ' structures by the question_categories.parent field. Sometimes ' .
-                ' this tree structure gets messed up.</p>';
-
-        if (!empty($missingparent)) {
-            $description .= '<p>The following categories are missing their parents:</p><ul>';
-            foreach ($missingparent as $cat) {
-                $description .= "<li>Category $cat->id: " . s($cat->name) . "</li>\n";
-            }
-            $description .= "</ul>\n";
-        }
-
-        if (!empty($loops)) {
-            $description .= '<p>The following categories form a loop of parents:</p><ul>';
-            foreach ($loops as $loop) {
-                $description .= "<li><ul>\n";
-                foreach ($loop as $cat) {
-                    $description .= "<li>Category $cat->id: " . s($cat->name) . " has parent $cat->parent</li>\n";
-                }
-                $description .= "</ul></li>\n";
-            }
-            $description .= "</ul>\n";
-        }
-
-        return $description;
-    }
-    function solution() {
-        global $CFG;
-        list($missingparent, $loops) = $this->find_problems();
-
-        $solution = '<p>Consider executing the following SQL queries. These fix ' .
-                'the problem by moving some categories to the top level.</p>';
-
-        if (!empty($missingparent)) {
-            $solution .= "<pre>UPDATE " . $CFG->prefix . "question_categories\n" .
-                    "        SET parent = 0\n" .
-                    "        WHERE id IN (" . implode(',', array_keys($missingparent)) . ");</pre>\n";
-        }
-
-        if (!empty($loops)) {
-            $solution .= "<pre>UPDATE " . $CFG->prefix . "question_categories\n" .
-                    "        SET parent = 0\n" .
-                    "        WHERE id IN (" . implode(',', array_keys($loops)) . ");</pre>\n";
-        }
-
-        return $solution;
     }
 }
 
+
 class problem_00000x extends problem_base {
     function title() {
         return '';
@@ -783,8 +534,7 @@ class problem_00000x extends problem_base {
 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,467 +1,444 @@
-<?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;
-}
-
-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
-
-$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);
-
-// 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->framename)) {
-    $CFG->framename = '_top';
-}
-if (!isset($CFG->release)) {
-    $CFG->release = '';
-}
-if (!isset($CFG->version)) {
-    $CFG->version = '';
-}
-
-$version = null;
-$release = null;
-require("$CFG->dirroot/version.php");       // defines $version, $release 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);
-        echo $OUTPUT->header();
-        echo $OUTPUT->heading('<a href="http://moodle.org">Moodle</a> - Modular Object-Oriented Dynamic Learning Environment');
-        echo $OUTPUT->heading(get_string('copyrightnotice'));
-        $copyrightnotice = text_to_html(get_string('gpl3'));
-        $copyrightnotice = str_replace('target="_blank"', 'onclick="this.target=\'_blank\'"', $copyrightnotice); // extremely ugly validation hack
-        echo $OUTPUT->box($copyrightnotice, 'copyrightnotice');
-        echo '<br />';
-        $continue = new single_button(new moodle_url('/admin/index.php', array('lang'=>$CFG->lang, 'agreelicense'=>1)), get_string('continue'), 'get');
-        echo $OUTPUT->confirm(get_string('doyouagree'), $continue, "http://docs.moodle.org/dev/License");
-        echo $OUTPUT->footer();
+/// Check that config.php exists, if not then call the install script
+    if (!file_exists("../config.php")) {
+        header('Location: ../install.php');
         die;
     }
-    if (empty($confirmrelease)) {
-        $strcurrentrelease = get_string('currentrelease');
-        $PAGE->navbar->add($strcurrentrelease);
-        $PAGE->set_title($strinstallation);
-        $PAGE->set_heading($strinstallation . ' - Moodle ' . $CFG->target_release);
-        $PAGE->set_cacheable(false);
-        echo $OUTPUT->header();
-        echo $OUTPUT->heading("Moodle $release");
 
-        if (isset($maturity)) {
-            // main version.php declares moodle code maturity
-            if ($maturity < MATURITY_STABLE) {
-                $maturitylevel = get_string('maturity'.$maturity, 'admin');
-                echo $OUTPUT->box(
-                    $OUTPUT->container(get_string('maturitycorewarning', 'admin', $maturitylevel)) .
-                    $OUTPUT->container($OUTPUT->doc_link('admin/versions', get_string('morehelp'))),
-                    'generalbox maturitywarning');
+    require_once("../config.php");
+    include_once("$CFG->dirroot/lib/adminlib.php");  // Contains various admin-only functions
+
+
+/// Check that PHP is of a sufficient version
+
+    if (!check_php_version("4.1.0")) {
+        $version = phpversion();
+        print_heading("Sorry, Moodle requires PHP 4.1.0 or later (currently using version $version)");
+        die;
+    }
+
+
+/// Check some PHP server settings
+
+    $documentationlink = "please read the <a href=\"../doc/?frame=install.html&amp;sub=webserver\">install documentation</a>";
+
+    if (ini_get_bool('session.auto_start')) {
+        error("The PHP server variable 'session.auto_start' should be Off - $documentationlink");
+    }
+
+    if (ini_get_bool('magic_quotes_runtime')) {
+        error("The PHP server variable 'magic_quotes_runtime' should be Off - $documentationlink");
+    }
+
+    if (!ini_get_bool('file_uploads')) {
+        error("The PHP server variable 'file_uploads' is not turned On - $documentationlink");
+    }
+
+
+/// Check that config.php has been edited
+
+    if ($CFG->wwwroot == "http://example.com/moodle") {
+        error("Moodle has not been configured yet.  You need to edit config.php first.");
+    }
+
+
+/// Check settings in config.php
+
+    $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)."\";",
+              "./");
+    }
+
+/// 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 = "";
+    }
+
+/// 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);
+    @ob_end_flush();
+
+
+/// 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", "user_admins", "user_students", "user_teachers");
+        foreach ($mtables as $mtable) {
+            if (!in_array($CFG->prefix.$mtable, $tables)) {
+                $maintables = false;
+                break;
             }
         }
+    }
 
-        $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/dev/Releases');
-        $releasenoteslink = str_replace('target="_blank"', 'onclick="this.target=\'_blank\'"', $releasenoteslink); // extremely ugly validation hack
-        echo $OUTPUT->box($releasenoteslink, 'generalbox releasenoteslink');
-
-        require_once($CFG->libdir.'/environmentlib.php');
-        if (!check_moodle_environment(normalize_version($release), $environment_results, true, ENV_SELECT_RELEASE)) {
-            print_upgrade_reload("index.php?agreelicense=1&amp;lang=$CFG->lang");
-        } else {
-            echo $OUTPUT->notification(get_string('environmentok', 'admin'), 'notifysuccess');
-            echo $OUTPUT->continue_button(new moodle_url('/admin/index.php', array('agreelicense'=>1, 'confirmrelease'=>1, 'lang'=>$CFG->lang)));
+    if (! $maintables) {
+        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://moodle.org/doc/?frame=licence.html");
+            exit;
         }
 
-        echo $OUTPUT->footer();
+        $strdatabasesetup    = get_string("databasesetup");
+        $strdatabasesuccess  = get_string("databasesuccess");
+        print_header($strdatabasesetup, $strdatabasesetup, $strdatabasesetup, "", "", false, "&nbsp;", "&nbsp;");
+        if (file_exists("$CFG->libdir/db/$CFG->dbtype.sql")) {
+            $db->debug = true;
+            if (modify_database("$CFG->libdir/db/$CFG->dbtype.sql")) {
+                $db->debug = false;
+                notify($strdatabasesuccess, "green");
+            } else {
+                $db->debug = false;
+                error("Error: Main databases NOT set up successfully");
+            }
+        } else {
+            error("Error: Your database ($CFG->dbtype) is not yet fully supported by Moodle.  See the lib/db directory.");
+        }
+        print_continue("index.php");
         die;
     }
 
-    $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);
-    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 version of Moodle code on disk compared with database
+/// and upgrade if possible.
+
+    include_once("$CFG->dirroot/version.php");              # defines $version
+    include_once("$CFG->dirroot/lib/db/$CFG->dbtype.php");  # defines 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);
+
+            if (empty($_GET['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 {
+                $strdatabasesuccess  = get_string("databasesuccess");
+                print_header($strdatabasechecking, $stradministration, $strdatabasechecking,
+                        "", "", false, "&nbsp;", "&nbsp;");
+                print_heading($strdatabasechecking);
+                $db->debug=true;
+                if (main_upgrade($CFG->version)) {
+                    $db->debug=false;
+                    if (set_config("version", $version)) {
+                        remove_dir($CFG->dataroot . '/cache', true); // flush cache
+                        notify($strdatabasesuccess, "green");
+                        print_continue("index.php");
+                        exit;
+                    } else {
+                        notify("Upgrade failed!  (Could not update version in config table)");
+                    }
+                } else {
+                    $db->debug=false;
+                    notify("Upgrade failed!  See /version.php");
+                }
+            }
+        } else if ($version < $CFG->version) {
+            notify("WARNING!!!  The code you are using is OLDER than the version that made these databases!");
+        }
+
+    } else {
+        $strcurrentversion = get_string("currentversion");
+        print_header($strcurrentversion, $stradministration, $strcurrentversion,
+                     "", "", false, "&nbsp;", "&nbsp;");
+
+        if (set_config("version", $version)) {
+            print_heading("Moodle $release ($version)");
+            print_continue("index.php");
+            die;
+        } else {
+            $db->debug=true;
+            if (main_upgrade(0)) {
+                print_continue("index.php");
+            } else {
+                error("A problem occurred inserting current version into databases");
+            }
+            $db->debug=false;
         }
     }
 
-    install_core($version, true);
-}
 
+/// Updated human-readable release version if necessary
 
-// Check version of Moodle code on disk compared with database
-// and upgrade if possible.
-
-$stradministration = get_string('administration');
-$PAGE->set_context(get_context_instance(CONTEXT_SYSTEM));
-
-if (empty($CFG->version)) {
-    print_error('missingconfigversion', 'debug');
-}
-
-if ($version > $CFG->version) {  // upgrade
-    purge_all_caches();
-    $PAGE->set_pagelayout('maintenance');
-    $PAGE->set_popup_notification_allowed(false);
-
-    $a->oldversion = "$CFG->release ($CFG->version)";
-    $a->newversion = "$release ($version)";
-    $strdatabasechecking = get_string('databasechecking', '', $a);
-
-    if (empty($confirmupgrade)) {
-        $PAGE->set_title($stradministration);
-        $PAGE->set_heading($strdatabasechecking);
-        $PAGE->set_cacheable(false);
-        echo $OUTPUT->header();
-        if (isset($maturity)) {
-            // main version.php declares moodle code maturity
-            if ($maturity < MATURITY_STABLE) {
-                $maturitylevel = get_string('maturity'.$maturity, 'admin');
-                echo $OUTPUT->box(
-                    $OUTPUT->container(get_string('maturitycorewarning', 'admin', $maturitylevel)) .
-                    $OUTPUT->container($OUTPUT->doc_link('admin/versions', get_string('morehelp'))),
-                    'generalbox maturitywarning');
-}
+    if ($release <> $CFG->release) {  // Update the release version
+        $strcurrentrelease = get_string("currentrelease");
+        print_header($strcurrentrelease, $strcurrentrelease, $strcurrentrelease, "", "", false, "&nbsp;", "&nbsp;");
+        print_heading("Moodle $release");
+        if (!set_config("release", $release)) {
+            notify("ERROR: Could not update release version in database!!");
         }
-        $continueurl = new moodle_url('index.php', array('confirmupgrade' => 1));
-        $cancelurl = new moodle_url('index.php');
-        echo $OUTPUT->confirm(get_string('upgradesure', 'admin', $a->newversion), $continueurl, $cancelurl);
-        echo $OUTPUT->footer();
+        print_continue("index.php");
+        print_simple_box_start("CENTER");
+        include("$CFG->dirroot/lang/en/docs/release.html");
+        print_simple_box_end();
+        print_continue("index.php");
         exit;
-
-    } else if (empty($confirmrelease)){
-        $strcurrentrelease = get_string('currentrelease');
-        $PAGE->navbar->add($strcurrentrelease);
-        $PAGE->set_title($strcurrentrelease);
-        $PAGE->set_heading($strcurrentrelease);
-        $PAGE->set_cacheable(false);
-        echo $OUTPUT->header();
-        echo $OUTPUT->heading("Moodle $release");
-        $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/dev/Releases');
-        $releasenoteslink = str_replace('target="_blank"', 'onclick="this.target=\'_blank\'"', $releasenoteslink); // extremely ugly validation hack
-        echo $OUTPUT->box($releasenoteslink);
-
-        require_once($CFG->libdir.'/environmentlib.php');
-        if (!check_moodle_environment($release, $environment_results, true, ENV_SELECT_RELEASE)) {
-            print_upgrade_reload('index.php?confirmupgrade=1');
-        } else {
-            echo $OUTPUT->notification(get_string('environmentok', 'admin'), 'notifysuccess');
-            if (empty($CFG->skiplangupgrade)) {
-                echo $OUTPUT->box_start('generalbox', 'notice');
-                print_string('langpackwillbeupdated', 'admin');
-                echo $OUTPUT->box_end();
-            }
-            echo $OUTPUT->continue_button('index.php?confirmupgrade=1&confirmrelease=1');
-        }
-
-        echo $OUTPUT->footer();
-        die;
-
-    } elseif (empty($confirmplugins)) {
-        $strplugincheck = get_string('plugincheck');
-        $PAGE->navbar->add($strplugincheck);
-        $PAGE->set_title($strplugincheck);
-        $PAGE->set_heading($strplugincheck);
-        $PAGE->set_cacheable(false);
-        $output = $PAGE->get_renderer('core', 'admin');
-        $pluginman = plugin_manager::instance();
-
-        echo $output->header();
-        echo $output->box_start('generalbox');
-        echo $output->container(get_string('pluginchecknotice', 'core_plugin'), 'generalbox', 'notice');
-        echo $output->plugins_check($pluginman->get_plugins(), array('full' => $showallplugins));
-        echo $output->box_end();
-        print_upgrade_reload('index.php?confirmupgrade=1&amp;confirmrelease=1');
-        $button = new single_button(new moodle_url('index.php', array('confirmupgrade'=>1, 'confirmrelease'=>1, 'confirmplugincheck'=>1)), get_string('upgradestart', 'admin'), 'get');
-        $button->class = 'continuebutton';
-        echo $output->render($button);
-        echo $output->footer();
-        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 (moodle_needs_upgrading()) {
-    if (!$PAGE->headerprinted) {
-        // means core upgrade or installation was not already done
-        if (!$confirmplugins) {
-            $PAGE->set_pagelayout('maintenance');
-            $PAGE->set_popup_notification_allowed(false);
-            $strplugincheck = get_string('plugincheck');
-            $PAGE->navbar->add($strplugincheck);
-            $PAGE->set_title($strplugincheck);
-            $PAGE->set_heading($strplugincheck);
-            $PAGE->set_cacheable(false);
-            $output = $PAGE->get_renderer('core', 'admin');
-            $pluginman = plugin_manager::instance();
 
-            echo $output->header();
-            echo $output->box_start('generalbox');
-            echo $output->container(get_string('pluginchecknotice', 'core_plugin'), 'generalbox', 'notice');
-            echo $output->plugins_check($pluginman->get_plugins(), array('full' => $showallplugins));
-            echo $output->box_end();
-            print_upgrade_reload('index.php');
-            $button = new single_button(new moodle_url('index.php', array('confirmplugincheck'=>1)), get_string('upgradestart', 'admin'), 'get');
-            $button->class = 'continuebutton';
-            echo $output->render($button);
-            echo $output->footer();
-            die();
-        }
-    }
-    // install/upgrade all plugins and other parts
-    upgrade_noncore(true);
-}
+/// Insert default values for any important configuration variables
 
-// 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");
-}
+    include_once("$CFG->dirroot/lib/defaults.php");
 
-// 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");
-        } else {
-            if (empty($SESSION->sessionverify)) {
-                print_error('installsessionerror', 'admin', "index.php?sessionstarted=1&lang=$CFG->lang");
-            }
-            unset($SESSION->sessionverify);
+    foreach ($defaults as $name => $value) {
+        if (!isset($CFG->$name)) {
+            $CFG->$name = $value;
+            set_config($name, $value);
+            $configchange = true;
         }
     }
 
-    // at this stage there can be only one admin - users may change username, so do not rely on that
-    $adminuser = get_complete_user_data('id', $CFG->siteadmins);
+/// If any new configurations were found then send to the config page to check
 
-    if ($adminuser->password === 'adminsetuppending') {
-        // prevent installation hijacking
-        if ($adminuser->lastip !== getremoteaddr()) {
-            print_error('installhijacked', 'admin');
+    if (!empty($configchange)) {
+        redirect("config.php");
+    }
+
+
+
+/// Find and check all main modules and load them up or upgrade them if necessary
+    upgrade_activity_modules("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
+
+/// Upgrade backup/restore system if necessary
+    require_once("$CFG->dirroot/backup/lib.php");
+    upgrade_backup_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
+
+/// Upgrade blocks system if necessary
+    require_once("$CFG->dirroot/lib/blocklib.php");
+    upgrade_blocks_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
+
+/// Check all blocks and load (or upgrade them if necessary)
+    upgrade_blocks_plugins("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
+
+/// Check all enrolment plugins and upgrade if necessary
+    upgrade_enrol_plugins("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
+
+
+
+/// Set up the overall site name etc.
+    if (! $site = get_site()) {
+        redirect("site.php");
+    }
+
+/// 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));
+    }
+
+/// 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 !!!");
         }
-        // login user and let him set password and admin details
-        $adminuser->newadminuser = 1;
-        complete_user_login($adminuser, false);
-        redirect("$CFG->wwwroot/user/editadvanced.php?id=$adminuser->id"); // Edit thyself
-
-    } else {
-        unset_config('adminsetuppending');
     }
 
-} else {
-    // just make sure upgrade logging is properly terminated
-    upgrade_finished('upgradesettings.php');
-}
-
-// Turn xmlstrictheaders back on now.
-$CFG->xmlstrictheaders = $origxmlstrictheaders;
-unset($origxmlstrictheaders);
-
-// Check for valid admin user - no guest autologin
-require_login(0, false);
-$context = get_context_instance(CONTEXT_SYSTEM);
-require_capability('moodle/site:config', $context);
-
-// 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 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());
-}
-
-// setup critical warnings before printing admin tree block
-$insecuredataroot = is_dataroot_insecure(true);
-$SESSION->admin_critical_warning = ($insecuredataroot==INSECURE_DATAROOT_ERROR);
-
-$adminroot = admin_get_root();
-
-// Check if there are any new admin settings which have still yet to be set
-if (any_new_admin_settings($adminroot)){
-    redirect('upgradesettings.php');
-}
-
-// Everything should now be set up, and the user is an admin
-
-// Print default admin page with notifications.
-admin_externalpage_setup('adminnotifications');
-echo $OUTPUT->header();
-
-// Unstable code warning
-if (isset($maturity)) {
-    if ($maturity < MATURITY_STABLE) {
-        $maturitylevel = get_string('maturity'.$maturity, 'admin');
-        echo $OUTPUT->box(
-            get_string('maturitycoreinfo', 'admin', $maturitylevel) . ' ' .
-            $OUTPUT->doc_link('admin/versions', get_string('morehelp')),
-            'generalbox adminwarning maturityinfo');
+/// Set up the admin user
+    if (! record_exists("user_admins")) {   // No admin user yet
+        redirect("user.php");
     }
-}
 
-if ($insecuredataroot == INSECURE_DATAROOT_WARNING) {
-    echo $OUTPUT->box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot), 'generalbox adminwarning');
-} else if ($insecuredataroot == INSECURE_DATAROOT_ERROR) {
-    echo $OUTPUT->box(get_string('datarootsecurityerror', 'admin', $CFG->dataroot), 'generalbox adminerror');
+/// Check for valid admin user
+    require_login();
 
-}
+    if (!isadmin()) {
+        error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
+    }
 
-if (defined('WARN_DISPLAY_ERRORS_ENABLED')) {
-    echo $OUTPUT->box(get_string('displayerrorswarning', 'admin'), 'generalbox adminwarning');
-}
+/// Check if we are returning from moodle.org registration and if so, we mark that fact to remove reminders
 
-// If no recently cron run
-$lastcron = $DB->get_field_sql('SELECT MAX(lastcron) FROM {modules}');
-if (time() - $lastcron > 3600 * 24) {
-    $helpbutton = $OUTPUT->help_icon('cron', 'admin');
-    echo $OUTPUT->box(get_string('cronwarning', 'admin').'&nbsp;'.$helpbutton, 'generalbox adminwarning');
-}
+    if (!empty($_GET['id'])) {
+        if ($_GET['id'] == $CFG->siteidentifier) {
+            set_config('registered', time());
+        }
+    }
 
-// Hidden bloglevel upgrade
-$showbloglevelupgrade = ($CFG->bloglevel == BLOG_COURSE_LEVEL || $CFG->bloglevel == BLOG_GROUP_LEVEL) && empty($CFG->bloglevel_upgrade_complete);
-if ($showbloglevelupgrade) {
-    echo $OUTPUT->box(get_string('bloglevelupgradenotice', 'admin'), 'generalbox adminwarning');
-}
+/// At this point everything is set up and the user is an admin, so print menu
 
-// diagnose DB, especially the sloppy MyISAM tables
-$diagnose = $DB->diagnose();
-if ($diagnose !== NULL) {
-    echo $OUTPUT->box($diagnose, 'generalbox adminwarning');
-}
+    $stradministration = get_string("administration");
+    print_header("$site->shortname: $stradministration","$site->fullname", "$stradministration");
+    print_simple_box_start('center', '100%', '', 20);
+    print_heading($stradministration);
 
-// Alert if we are currently in maintenance mode
-if (!empty($CFG->maintenance_enabled)) {
-    echo $OUTPUT->box(get_string('sitemaintenancewarning2', 'admin', "$CFG->wwwroot/$CFG->admin/settings.php?section=maintenancemode"), 'generalbox adminwarning');
-}
+    if (!empty($CFG->upgrade)) {  // Print notice about extra upgrading that needs to be done
+        print_simple_box(get_string("upgrade$CFG->upgrade", "admin",
+                                    "$CFG->wwwroot/$CFG->admin/upgrade$CFG->upgrade.php"), "center");
+        print_spacer(10,10);
+    }
 
-//////////////////////////////////////////////////////////////////////////////////////////////////
-////  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/dev/Releases" title="'.$CFG->version.'">'.$CFG->release.'</a><br />'.
-                 'Copyright &copy; 1999 onwards, Martin Dougiamas<br />'.
-                 'and <a href="http://docs.moodle.org/dev/Credits">many other contributors</a>.<br />'.
-                 '<a href="http://docs.moodle.org/dev/License">GNU Public License</a>';
-echo $OUTPUT->box($copyrighttext, 'copyright');
-//////////////////////////////////////////////////////////////////////////////////////////////////
+/// If no recently cron run
+    $lastcron = get_field_sql('SELECT max(lastcron) FROM ' . $CFG->prefix . 'modules');
+    if (time() - $lastcron > 3600 * 24) {
+        print_simple_box(get_string('cronwarning', 'admin') , 'center');
+    }
 
-echo $OUTPUT->footer();
+/// Alert if we are currently in maintenance mode
+    if (file_exists($CFG->dataroot.'/1/maintenance.html')) {
+        print_simple_box(get_string('sitemaintenancewarning', 'admin') , 'center');
+    }
 
+/// 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');
+        echo '<div align="center">';
+        print_string('pleaseregister', 'admin');
+        print_single_button('register.php', $options, get_string('registration'));
+        echo '</div>';
+        print_simple_box_end();
+    }
+
+    $table->tablealign = "right";
+    $table->align = array ("right", "left");
+    $table->wrap = array ("nowrap", "nowrap");
+    $table->cellpadding = 5;
+    $table->cellspacing = 0;
+    $table->width = "40%";
+
+    $configdata  = "<font size=\"+1\">&nbsp;</font><a href=\"config.php\">".get_string("configvariables", 'admin')."</a> - <font size=\"1\">".
+                    get_string("adminhelpconfigvariables")."</font><br />";
+    $configdata .= "<font size=\"+1\">&nbsp;</font><a href=\"site.php\">".get_string("sitesettings")."</a> - <font size=\"1\">".
+                    get_string("adminhelpsitesettings")."</font><br />";
+    $configdata .= "<font size=\"+1\">&nbsp;</font><a href=\"../theme/index.php\">".get_string("themes")."</a> - <font size=\"1\">".
+                    get_string("adminhelpthemes")."</font><br />";
+    $configdata .= "<font size=\"+1\">&nbsp;</font><a href=\"lang.php\">".get_string("language")."</a> - <font size=\"1\">".
+                    get_string("adminhelplanguage")."</font><br />";
+    $configdata .= "<font size=\"+1\">&nbsp;</font><a href=\"modules.php\">".get_string("managemodules")."</a> - <font size=\"1\">".
+                    get_string("adminhelpmanagemodules")."</font><br />";
+    $configdata .= "<font size=\"+1\">&nbsp;</font><a href=\"blocks.php\">".get_string("manageblocks")."</a> - <font size=\"1\">".
+                    get_string("adminhelpmanageblocks")."</font><br />";
+    $configdata .= "<font size=\"+1\">&nbsp;</font><a href=\"filters.php\">".get_string("managefilters")."</a> - <font size=\"1\">".
+                    get_string("adminhelpmanagefilters")."</font><br />";
+    if (!isset($CFG->disablescheduledbackups)) {
+        $configdata .= "<font size=\"+1\">&nbsp;</font><a href=\"backup.php\">".get_string("backup")."</a> - <font size=\"1\">".
+                        get_string("adminhelpbackup")."</font><br />";
+    }
+    $configdata .= "<font size=\"+1\">&nbsp;</font><a href=\"editor.php\">". get_string("editorsettings") ."</a> - <font size=\"1\">".
+                    get_string("adminhelpeditorsettings")."</font><br />";
+    $configdata .= "<font size=\"+1\">&nbsp;</font><a href=\"calendar.php\">". get_string('calendarsettings', 'admin') ."</a> - <font size=\"1\">".
+                    get_string('helpcalendarsettings', 'admin')."</font><br />";
+    $configdata .= "<font size=\"+1\">&nbsp;</font><a href=\"maintenance.php\">". get_string('sitemaintenancemode', 'admin') ."</a> - <font size=\"1\">".
+                    get_string('helpsitemaintenance', 'admin')."</font><br />";
+
+    $table->data[] = array("<font size=\"+1\"><b><a href=\"configure.php\">".get_string("configuration")."</a></b></font>",
+                            $configdata);
+
+
+    $userdata = "<font size=\"+1\">&nbsp;</font><a href=\"auth.php?sesskey=$USER->sesskey\">".get_string("authentication")."</a> - <font size=\"1\">".
+                 get_string("adminhelpauthentication")."</font><br />";
+    $userdata .= "<font size=\"+1\">&nbsp;</font><a href=\"user.php\">".get_string("edituser")."</a> - <font size=\"1\">".
+                 get_string("adminhelpedituser")."</font><br />";
+    $userdata .= "<font size=\"+1\">&nbsp;</font><a href=\"$CFG->wwwroot/$CFG->admin/user.php?newuser=true&amp;sesskey=$USER->sesskey\">".
+                 get_string("addnewuser")."</a> - <font size=\"1\">".
+                 get_string("adminhelpaddnewuser")."</font><br />";
+    $userdata .= "<font size=\"+1\">&nbsp;</font><a href=\"$CFG->wwwroot/$CFG->admin/uploaduser.php?sesskey=$USER->sesskey\">".
+                 get_string("uploadusers")."</a> - <font size=\"1\">".
+                 get_string("adminhelpuploadusers")."</font><br />";
+
+    $userdata .= "<hr /><font size=\"+1\">&nbsp;</font><a href=\"enrol.php?sesskey=$USER->sesskey\">".get_string("enrolments")."</a> - <font size=\"1\">".
+                 get_string("adminhelpenrolments")."</font><br />";
+    $userdata .= "<font size=\"+1\">&nbsp;</font><a href=\"../course/index.php?edit=off&amp;sesskey=$USER->sesskey\">".get_string("assignstudents")."</a> - <font size=\"1\">".
+                 get_string("adminhelpassignstudents")."</font><br />";
+
+    $userdata .= "<font size=\"+1\">&nbsp;</font><a href=\"../course/index.php?edit=on&amp;sesskey=$USER->sesskey\">".get_string("assignteachers")."</a> - <font size=\"1\">".
+                 get_string("adminhelpassignteachers").
+                 " <img src=\"../pix/t/user.gif\" height=\"11\" width=\"11\" alt=\"\" /></font><br />";
+    $userdata .= "<font size=\"+1\">&nbsp;</font><a href=\"creators.php?sesskey=$USER->sesskey\">".get_string("assigncreators")."</a> - <font size=\"1\">".
+                 get_string("adminhelpassigncreators")."</font><br />";
+    $userdata .= "<font size=\"+1\">&nbsp;</font><a href=\"admin.php?sesskey=$USER->sesskey\">".get_string("assignadmins")."</a> - <font size=\"1\">".
+                 get_string("adminhelpassignadmins")."</font><br />";
+
+    $table->data[] = array("<font size=\"+1\"><b><a href=\"users.php\">".get_string("users")."</a></b></font>", $userdata);
+
+    $table->data[] = array("<font size=\"+1\"><b><a href=\"../course/index.php?edit=on&amp;sesskey=$USER->sesskey\">".get_string("courses")."</a></b></font>",
+                           "<font size=\"+1\">&nbsp;</font>".get_string("adminhelpcourses"));
+    $table->data[] = array("<font size=\"+1\"><b><a href=\"../course/log.php?id=$site->id\">".get_string("logs")."</a></b></font>",
+                           "<font size=\"+1\">&nbsp;</font>".get_string("adminhelplogs"));
+    $table->data[] = array("<font size=\"+1\"><b><a href=\"../files/index.php?id=$site->id\">".get_string("sitefiles")."</a></b></font>",
+                           "<font size=\"+1\">&nbsp;</font>".get_string("adminhelpsitefiles"));
+    if (file_exists("$CFG->dirroot/$CFG->admin/$CFG->dbtype")) {
+        $table->data[] = array("<font size=\"+1\"><b><a href=\"$CFG->dbtype/frame.php\">".get_string("managedatabase")."</a></b></font>",
+                               "<font size=\"+1\">&nbsp;</font>".get_string("adminhelpmanagedatabase"));
+    }
+
+    print_table($table);
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    ////  IT IS ILLEGAL AND A VIOLATION OF THE GPL TO REMOVE OR MODIFY THE COPYRIGHT NOTICE BELOW ////
+    $copyrighttext = "<a href=\"http://moodle.org/\">Moodle</a> ".
+                     "<a href=\"../doc/?frame=release.html\">$CFG->release</a> ($CFG->version)<br />".
+                     "Copyright &copy; 1999-2005 Martin Dougiamas<br />".
+                     "<a href=\"../doc/?frame=licence.html\">GNU Public License</a>";
+    echo "<center><p><font size=\"1\">$copyrighttext</font></p></center>";
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+    echo '<table width="100%" cellspacing="0"><tr>';
+    echo '<td align="center" width="33%">';
+    print_single_button($CFG->wwwroot.'/doc/', NULL, get_string('documentation'));
+    echo '</td>';
+
+    echo '<td align="center" width="33%">';
+    print_single_button('phpinfo.php', NULL, get_string('phpinfo'));
+    echo '</td>';
+
+    echo '<td align="center" width="33%">';
+    $options = array();
+    $options['sesskey'] = $USER->sesskey;
+    print_single_button('register.php', $options, get_string('registration'));
+    echo '</td></tr></table>';
+
+    print_simple_box_end();
+
+    print_footer($site);
+
+?>

admin/innodb.php

@@ -1,45 +1,30 @@
 <?php
 
-    require_once('../config.php');
-    require_once($CFG->libdir.'/adminlib.php');
+   include('../config.php');
 
-    admin_externalpage_setup('toinodb');
+   require_login();
 
-    $confirm = optional_param('confirm', 0, PARAM_BOOL);
+   if (!isadmin()) {
+       error('Admin only');
+   }
 
-    require_login();
-
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
-
-    echo $OUTPUT->header();
-    echo $OUTPUT->heading('Convert all MySQL tables from MYISAM to InnoDB');
-
-    if ($DB->get_dbfamily() != 'mysql') {
-        notice('This function is for MySQL databases only!', 'index.php');
-    }
-
-    if (data_submitted() and $confirm and confirm_sesskey()) {
-
-        echo $OUTPUT->notification('Please be patient and wait for this to complete...', 'notifysuccess');
-
-        if ($tables = $DB->get_tables()) {
-            $DB->set_debug(true);
-            foreach ($tables as $table) {
-                $fulltable = $DB->get_prefix().$table;
-                $DB->change_database_structure("ALTER TABLE $fulltable TYPE=INNODB");
-            }
-            $DB->set_debug(false);
-        }
-        echo $OUTPUT->notification('... done.', 'notifysuccess');
-        echo $OUTPUT->continue_button('index.php');
-        echo $OUTPUT->footer();
-
-    } else {
-        $optionsyes = array('confirm'=>'1', 'sesskey'=>sesskey());
-        $formcontinue = new single_button(new moodle_url('/admin/innodb.php', $optionsyes), get_string('yes'));
-        $formcancel = new single_button(new moodle_url('/admin/index.php'), get_string('no'), 'get');
-        echo $OUTPUT->confirm('Are you sure you want convert all your tables to the InnoDB format?', $formcontinue, $formcancel);
-        echo $OUTPUT->footer();
-    }
+   print_header("Convert all tables from MYISAM to InnoDB", "Convert all tables from MYISAM to InnoDB", 
+                "Convert all tables from MYISAM to InnoDB");
 
 
+   if (!empty($confirm) and confirm_sesskey()) {
+
+       print_heading("Please be patient and wait for this to complete...");
+
+       if ($tables = $db->MetaTables()) {
+           $db->debug = true;
+           foreach ($tables as $table) {
+               execute_sql("ALTER TABLE $table TYPE=INNODB; ");
+           }
+       }
+   } else {
+       notice_yesno("Are you sure you want convert all your tables to the InnoDB format?", 
+                    "innodb.php?confirm=yes&sesskey=".sesskey(), "index.php");
+   }
+
+?>

admin/lang.php

@@ -0,0 +1,325 @@
+<?PHP // $Id$
+
+    require_once("../config.php");
+
+    $mode = optional_param('mode', '', PARAM_ALPHA);
+    $currentfile = optional_param('currentfile', 'moodle.php', PARAM_FILE);
+
+    require_login();
+
+    if (!isadmin()) {
+        error("You need to be admin to edit this page");
+    }     
+
+    if (! $site = get_site()) {
+        error("Site not defined!");
+    }
+
+    $stradministration = get_string("administration");
+    $strconfiguration = get_string("configuration");
+    $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");
+
+    switch ($mode) {
+        case "missing":
+            $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;
+    }
+
+    $currentlang = current_language();
+
+    print_header("$site->shortname: $title", "$site->fullname",
+                 "<a href=\"index.php\">$stradministration</a> -> ".
+                 "<a href=\"configure.php\">$strconfiguration</a> -> $navigation",
+                 '', '', true, $button);
+
+    if (!$mode) {
+        $currlang = current_language();
+        $langs = get_list_of_languages();
+        echo "<table align=\"center\"><tr><td align=\"right\">";
+        echo "<b>$strcurrentlanguage:</b>";
+        echo "</td><td>";
+        echo popup_form ("$CFG->wwwroot/$CFG->admin/lang.php?lang=", $langs, "chooselang", $currlang, "", "", "", true);
+        echo '</td></tr><tr><td colspan="2">';
+        $options["lang"] = $currentlang;
+        print_single_button("http://moodle.org/download/lang/", $options, get_string("latestlanguagepack"));
+        echo "</td></tr></table>";
+        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>");
+        print_footer();
+        exit;
+    }
+
+    // Get a list of all the root files in the English directory
+
+    $langdir = "$CFG->dirroot/lang/$currentlang";
+    $enlangdir = "$CFG->dirroot/lang/en";
+
+    if (! $stringfiles = get_directory_list($enlangdir, "", false)) {
+        error("Could not find English language pack!");
+    }
+
+    foreach ($stringfiles as $key => $file) {
+        if (substr($file, -4) != ".php") {
+            unset($stringfiles[$key]);
+        }
+    }
+
+    if ($mode == "missing") {
+        // For each file, check that a counterpart exists, then check all the strings
+    
+        foreach ($stringfiles as $file) {
+            unset($string);
+            include("$enlangdir/$file");
+            $enstring = $string;  
+            
+            unset($string);
+
+            if (file_exists("$langdir/$file")) {
+                include("$langdir/$file");
+            } else {
+                notify(get_string("filemissing", "", "$langdir/$file"));
+                $string = array();
+            }
+    
+            $first = true;
+            foreach ($enstring as $key => $value) {
+                if (empty($string[$key])) {
+                    $value = htmlspecialchars($value);
+                    $value = str_replace("$"."a", "\\$"."a", $value);
+                    $value = str_replace("%%","%",$value);
+                    if ($first) {
+                        echo "<p><b>".get_string("stringsnotset","","$langdir/$file")."</b></p><pre>";
+                        $first = false;
+                        $somethingfound = true;
+                    }
+                    echo "$"."string['$key'] = \"$value\";<br />";
+                }
+            }
+            if (!$first) {
+                echo '</pre><hr />';
+            }
+        }
+  
+        if (! $files = get_directory_list("$CFG->dirroot/lang/en/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/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 (isset($_POST['currentfile'])){   // Save a file
+            if (!confirm_sesskey()) {
+                error(get_string('confirmsesskeybad', 'error'));
+            }
+            $newstrings = $_POST;
+            unset($newstrings['currentfile']);
+            if (lang_save_file($langdir, $currentfile, $newstrings)) {
+                notify(get_string("changessaved")." ($langdir/$currentfile)", "green");
+            } else {
+                error("Could not save the file '$currentfile'!", "lang.php?mode=compare&amp;currentfile=$currentfile");
+            }
+        }
+
+        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_heading("$currentfile", "center", 4);
+
+        if (!file_exists("$langdir/$currentfile")) {
+            if (!touch("$langdir/$currentfile")) {
+                echo "<p><font color=\"red\">".get_string("filemissing", "", "$langdir/$currentfile")."</font></p>";
+                continue;
+            }
+        }
+
+        error_reporting(0);
+        if ($f = fopen("$langdir/$currentfile","r+")) {
+            $editable = true;
+            fclose($f);
+        } else {
+            $editable = false;
+            echo "<p><font size=\"1\">".get_string("makeeditable", "", "$langdir/$currentfile")."</font></p>";
+        }
+        error_reporting(7);
+
+
+        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("$langdir/$currentfile");
+
+        if ($editable) {
+            echo "<form name=\"$currentfile\" action=\"lang.php\" method=\"post\">";
+        }
+        echo "<table width=\"100%\" cellpadding=\"2\" cellspacing=\"3\" border=\"0\" class=\"generalbox\">";
+        foreach ($enstring as $key => $envalue) {
+            $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";
+
+            $value = $string[$key];
+            $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, "\n");                       // Delete leading/trailing lines
+            $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);
+
+            $cellcolour = $value ? '': 'class="highlight"';
+
+            if ($editable) {
+                echo '<td width="40%" '.$cellcolour.' valign="top">'."\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'.$key.'" cols="'.$cols.'" rows="'.$rows.'">'.$value.'</textarea>'."\n";
+                } else {
+                    if ($valuelen) {
+                        $cols = $valuelen + 2;
+                    }
+                    echo '<input type="text" name="stringXXX'.$key.'" value="'.$value.'" size="'.$cols.'" />';
+                }
+                echo '</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>'; 
+
+    }
+
+    print_footer();
+
+//////////////////////////////////////////////////////////////////////
+
+function lang_save_file($path, $file, $strings) {
+// Thanks to Petri Asikainen for the original version of code 
+// used to save language files.
+//
+// $path is a full pathname to the file
+// $file is the file to overwrite.
+// $strings is an array of strings to write
+
+    global $CFG, $USER;
+
+    error_reporting(0);
+    if (!$f = fopen("$path/$file","w")) {
+        return false;
+    }
+    error_reporting(7);
+
+
+    fwrite($f, "<?PHP // \$Id\$ \n");
+    fwrite($f, "      // $file - created with Moodle $CFG->release ($CFG->version)\n\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
+        if ($id == "string" and $value != ""){
+            fwrite($f,"\$string['$stringname'] = '$value';\n");
+        }
+    }
+    fwrite($f,"\n?>\n");
+    fclose($f);
+
+    return true;
+}
+
+?>

admin/langdoc.php

@@ -0,0 +1,236 @@
+<?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
+*/
+
+    //
+    // 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$';
+
+    require_once("../config.php");
+
+    $currentfile = optional_param('currentfile', 'docs/README.txt', PARAM_PATH); 
+
+    require_login();
+
+    if (!isadmin()) {
+        error("You need to be admin to edit this page");
+    }     
+
+    if (! $site = get_site()) {
+        error("Site not defined!");
+    }
+
+    $stradministration = get_string("administration");
+    $strconfiguration = get_string("configuration");
+    $strlanguage = get_string("language");
+    $strcurrentlanguage = get_string("currentlanguage");
+    $strthislanguage = get_string("thislanguage");
+    $stredithelpdocs = get_string('edithelpdocs', 'admin');
+
+    print_header("$site->shortname: $stredithelpdocs: $currentfile", "$site->fullname",
+                 "<a href=\"index.php\">$stradministration</a> -> ".
+                 "<a href=\"configure.php\">$strconfiguration</a> -> 
+                  <a href=\"lang.php\">$strlanguage</a> -> $stredithelpdocs",
+                 'choosefile.popup', '', true);
+
+    $currentlang = current_language();
+    $langdir = "$CFG->dirroot/lang/$currentlang";
+    $enlangdir = "$CFG->dirroot/lang/en";
+
+    // 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/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/docs/$file")) {
+                $options["docs/$file"] .= "$fileoldmark";
+            }
+        }    
+    }
+
+    // Get all files from /help directory
+
+    if (! $files = get_directory_list("$CFG->dirroot/lang/en/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/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>";
+        }
+
+        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/$currentfile", "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";
+        link_to_popup_window("/lang/$currentlang/$currentfile", "popup", get_string("preview"));
+        echo "</td>\n</tr>\n</table>";
+
+        if ($editable) {
+            echo '<div align="center"><input type="submit" value="'.get_string('savechanges').': lang/'.$currentlang.'/'.$currentfile.'" /></div>';
+            echo '</form>';
+        }
+
+        error_reporting($CFG->debug);
+    }
+
+    print_footer();
+
+//////////////////////////////////////////////////////////////////////
+
+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;
+}
+
+?>

admin/langimport.php

@@ -1,341 +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/>.
-
-/**
- * Fetches language packages from download.moodle.org server
- *
- * Language packages are available at http://download.moodle.org/langpack/
- * in ZIP format together with a file languages.md5 containing their hashes
- * and meta info.
- * Locally, language packs are saved into $CFG->dataroot/lang/
- *
- * @package   core
- * @copyright 2005 Yu Zhang
- * @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.'/filelib.php');
-require_once($CFG->libdir.'/componentlib.class.php');
-
-admin_externalpage_setup('langimport');
-
-if (!empty($CFG->skiplangupgrade)) {
-    echo $OUTPUT->header();
-    echo $OUTPUT->box(get_string('langimportdisabled', 'admin'));
-    echo $OUTPUT->footer();
-    die;
-}
-
-$mode          = optional_param('mode', 0, PARAM_INT);              // action
-$pack          = optional_param('pack', array(), PARAM_SAFEDIR);    // pack to install
-$uninstalllang = optional_param('uninstalllang', '', PARAM_LANG);   // installed pack to uninstall
-$confirm       = optional_param('confirm', 0, PARAM_BOOL);          // uninstallation confirmation
-
-define('INSTALLATION_OF_SELECTED_LANG', 2);
-define('DELETION_OF_SELECTED_LANG', 4);
-define('UPDATE_ALL_LANG', 5);
-
-get_string_manager()->reset_caches();
-
-$notice_ok    = array();
-$notice_error = array();
-
-if (($mode == INSTALLATION_OF_SELECTED_LANG) and confirm_sesskey() and !empty($pack)) {
-    set_time_limit(0);
-    make_upload_directory('temp');
-    make_upload_directory('lang');
-
-    $installer = new lang_installer($pack);
-    $results = $installer->run();
-    foreach ($results as $langcode => $langstatus) {
-        switch ($langstatus) {
-        case lang_installer::RESULT_DOWNLOADERROR:
-            $a       = new stdClass();
-            $a->url  = $installer->lang_pack_url($langcode);
-            $a->dest = $CFG->dataroot.'/lang';
-            print_error('remotedownloaderror', 'error', 'langimport.php', $a);
-            break;
-        case lang_installer::RESULT_INSTALLED:
-            $notice_ok[] = get_string('langpackinstalled', 'admin', $langcode);
-            break;
-        case lang_installer::RESULT_UPTODATE:
-            $notice_ok[] = get_string('langpackuptodate', 'admin', $langcode);
-            break;
-        }
-    }
-}
-
-if ($mode == DELETION_OF_SELECTED_LANG and !empty($uninstalllang)) {
-    if ($uninstalllang == 'en') {
-        $notice_error[] = 'English language pack can not be uninstalled';
-
-    } else if (!$confirm and confirm_sesskey()) {
-        echo $OUTPUT->header();
-        echo $OUTPUT->confirm(get_string('uninstallconfirm', 'admin', $uninstalllang),
-                     'langimport.php?mode='.DELETION_OF_SELECTED_LANG.'&uninstalllang='.$uninstalllang.'&confirm=1',
-                     'langimport.php');
-        echo $OUTPUT->footer();
-        die;
-
-    } else if (confirm_sesskey()) {
-        $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);
-        }
-        if ($rm1 or $rm2) {
-            $notice_ok[] = get_string('langpackremoved','admin');
-        } else {    //nothing deleted, possibly due to permission error
-            $notice_error[] = 'An error has occurred, language pack is not completely uninstalled, please check file permissions';
-        }
-    }
-}
-
-if ($mode == UPDATE_ALL_LANG) {
-    set_time_limit(0);
-
-    $installer = new lang_installer();
-
-    if (!$availablelangs = $installer->get_remote_list_of_languages()) {
-        print_error('cannotdownloadlanguageupdatelist', 'error');
-    }
-    $md5array = array();    // (string)langcode => (string)md5
-    foreach ($availablelangs as $alang) {
-        $md5array[$alang[0]] = $alang[1];
-    }
-
-    // filter out unofficial packs
-    $currentlangs = array_keys(get_string_manager()->get_list_of_translations(true));
-    $updateablelangs = array();
-    foreach ($currentlangs as $clang) {
-        if (!array_key_exists($clang, $md5array)) {
-            $notice_ok[] = get_string('langpackupdateskipped', 'admin', $clang);
-            continue;
-        }
-        $dest1 = $CFG->dataroot.'/lang/'.$clang;
-        $dest2 = $CFG->dirroot.'/lang/'.$clang;
-
-        if (file_exists($dest1.'/langconfig.php') || file_exists($dest2.'/langconfig.php')){
-            $updateablelangs[] = $clang;
-        }
-    }
-
-    // then filter out packs that have the same md5 key
-    $neededlangs = array();   // all the packs that needs updating
-    foreach ($updateablelangs as $ulang) {
-        if (!is_installed_lang($ulang, $md5array[$ulang])) {
-            $neededlangs[] = $ulang;
-        }
-    }
-
-    make_upload_directory('temp');
-    make_upload_directory('lang');
-
-    // clean-up currently installed versions of the packs
-    foreach ($neededlangs as $packindex => $pack) {
-        if ($pack == 'en') {
-            continue;
-        }
-
-        // delete old directories
-        $dest1 = $CFG->dataroot.'/lang/'.$pack;
-        $dest2 = $CFG->dirroot.'/lang/'.$pack;
-        $rm1 = false;
-        $rm2 = false;
-        if (file_exists($dest1)) {
-            if (!remove_dir($dest1)) {
-                $notice_error[] = 'Could not delete old directory '.$dest1.', update of '.$pack.' failed, please check permissions.';
-                unset($neededlangs[$packindex]);
-                continue;
-            }
-        }
-        if (file_exists($dest2)) {
-            if (!remove_dir($dest2)) {
-                $notice_error[] = 'Could not delete old directory '.$dest2.', update of '.$pack.' failed, please check permissions.';
-                unset($neededlangs[$packindex]);
-                continue;
-            }
-        }
-    }
-
-    // install all needed language packs
-    $installer->set_queue($neededlangs);
-    $results = $installer->run();
-    $updated = false;    // any packs updated?
-    foreach ($results as $langcode => $langstatus) {
-        switch ($langstatus) {
-        case lang_installer::RESULT_DOWNLOADERROR:
-            $a       = new stdClass();
-            $a->url  = $installer->lang_pack_url($langcode);
-            $a->dest = $CFG->dataroot.'/lang';
-            print_error('remotedownloaderror', 'error', 'langimport.php', $a);
-            break;
-        case lang_installer::RESULT_INSTALLED:
-            $updated = true;
-            $notice_ok[] = get_string('langpackinstalled', 'admin', $langcode);
-            break;
-        case lang_installer::RESULT_UPTODATE:
-            $notice_ok[] = get_string('langpackuptodate', 'admin', $langcode);
-            break;
-        }
-    }
-
-    if ($updated) {
-        $notice_ok[] = get_string('langupdatecomplete','admin');
-    } else {
-        $notice_ok[] = get_string('nolangupdateneeded','admin');
-    }
-
-    unset($installer);
-}
-get_string_manager()->reset_caches();
-
-echo $OUTPUT->header();
-echo $OUTPUT->heading(get_string('langimport', 'admin'));
-
-$installedlangs = get_string_manager()->get_list_of_translations(true);
-
-$missingparents = array();
-foreach ($installedlangs as $installedlang => $unused) {
-    $parent = get_parent_language($installedlang);
-    if (empty($parent)) {
-        continue;
-    }
-    if (!isset($installedlangs[$parent])) {
-        $missingparents[$installedlang] = $parent;
-    }
-}
-
-$installer = new lang_installer();
-
-if ($availablelangs = $installer->get_remote_list_of_languages()) {
-    $remote = true;
-} else {
-    $remote = false;
-    $availablelangs = array();
-    echo $OUTPUT->box_start();
-    print_string('remotelangnotavailable', 'admin', $CFG->dataroot.'/lang/');
-    echo $OUTPUT->box_end();
-}
-
-if ($notice_ok) {
-    $info = implode('<br />', $notice_ok);
-    echo $OUTPUT->notification($info, 'notifysuccess');
-}
-
-if ($notice_error) {
-    $info = implode('<br />', $notice_error);
-    echo $OUTPUT->notification($info, 'notifyproblem');
-}
-
-if ($missingparents) {
-    foreach ($missingparents as $l=>$parent) {
-        $a = new stdClass();
-        $a->lang   = $installedlangs[$l];
-        $a->parent = $parent;
-        foreach ($availablelangs as $alang) {
-            if ($alang[0] == $parent) {
-                $shortlang = $alang[0];
-                $a->parent = $alang[2].' ('.$shortlang.')';
-            }
-        }
-        $info = get_string('missinglangparent', 'admin', $a);
-        echo $OUTPUT->notification($info, 'notifyproblem');
-    }
-}
-
-echo $OUTPUT->box_start();
-
-echo html_writer::start_tag('table');
-echo html_writer::start_tag('tr');
-
-// list of installed languages
-$url = new moodle_url('/admin/langimport.php', array('mode' => DELETION_OF_SELECTED_LANG));
-echo html_writer::start_tag('td', array('valign' => 'top'));
-echo html_writer::start_tag('form', array('id' => 'uninstallform', 'action' => $url->out(), 'method' => 'post'));
-echo html_writer::start_tag('fieldset');
-echo html_writer::label(get_string('installedlangs','admin'), 'uninstalllang');
-echo html_writer::empty_tag('br');
-echo html_writer::select($installedlangs, 'uninstalllang', '', false, array('size' => 15));
-echo html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'sesskey', 'value' => sesskey()));
-echo html_writer::empty_tag('br');
-echo html_writer::empty_tag('input', array('type' => 'submit', 'value' => get_string('uninstall','admin')));
-echo html_writer::end_tag('fieldset');
-echo html_writer::end_tag('form');
-if ($remote) {
-    $url = new moodle_url('/admin/langimport.php', array('mode' => UPDATE_ALL_LANG));
-    echo html_writer::start_tag('form', array('id' => 'updateform', 'action' => $url->out(), 'method' => 'post'));
-    echo html_writer::tag('fieldset', html_writer::empty_tag('input', array('type' => 'submit', 'value' => get_string('updatelangs','admin'))));
-    echo html_writer::end_tag('form');
-}
-echo html_writer::end_tag('td');
-
-// list of available languages
-$options = array();
-foreach ($availablelangs as $alang) {
-    if (!empty($alang[0]) and trim($alang[0]) !== 'en' and !is_installed_lang($alang[0], $alang[1])) {
-        $options[$alang[0]] = $alang[2].' ('.$alang[0].')';
-    }
-}
-if (!empty($options)) {
-    echo html_writer::start_tag('td', array('valign' => 'top'));
-    $url = new moodle_url('/admin/langimport.php', array('mode' => INSTALLATION_OF_SELECTED_LANG));
-    echo html_writer::start_tag('form', array('id' => 'installform', 'action' => $url->out(), 'method' => 'post'));
-    echo html_writer::start_tag('fieldset');
-    echo html_writer::label(get_string('availablelangs','install'), 'pack');
-    echo html_writer::empty_tag('br');
-    echo html_writer::select($options, 'pack[]', '', false, array('size' => 15, 'multiple' => 'multiple'));
-    echo html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'sesskey', 'value' => sesskey()));
-    echo html_writer::empty_tag('br');
-    echo html_writer::empty_tag('input', array('type' => 'submit', 'value' => get_string('install','admin')));
-    echo html_writer::end_tag('fieldset');
-    echo html_writer::end_tag('form');
-    echo html_writer::end_tag('td');
-}
-
-echo html_writer::end_tag('tr');
-echo html_writer::end_tag('table');
-echo $OUTPUT->box_end();
-echo $OUTPUT->footer();
-die();
-
-////////////////////////////////////////////////////////////////////////////////
-// Local functions /////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- * 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;
-}

admin/lib.php

@@ -1,39 +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')
-    );
-    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_SAFEDIR);
-$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;
-}
-textlib_get_instance()->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,79 @@
+<?php // $Id$
+      // Enables/disables maintenance mode
+
+    require('../config.php');
+
+    $action = optional_param('action', '', PARAM_ALPHA);
+    $sesskey = optional_param('sesskey');
+
+    require_login();
+
+    if (!isadmin()) {
+        error('You need to be admin to use this page');
+    }
+
+    //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('index.php', get_string('sitemaintenanceoff','admin'));
+            } else {
+                $file = fopen($filename, 'w');
+                fwrite($file, stripslashes($form->text));
+                fclose($file);
+                redirect('index.php', get_string('sitemaintenanceon', 'admin'));
+            }
+        }
+    }
+
+/// Print the header stuff
+
+    $strmaintenance = get_string('sitemaintenancemode', 'admin');
+    $stradmin = get_string('administration');
+    $strconfiguration = get_string('configuration');
+
+    print_header("$SITE->shortname: $strmaintenance", $SITE->fullname,
+                  "<a href=\"index.php\">$stradmin</a> -> ".
+                  "<a href=\"configure.php\">$strconfiguration</a> -> $strmaintenance");
+
+    print_heading($strmaintenance);
+
+/// 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();
+        }
+    }
+
+    print_footer();
+?>

admin/message.php

@@ -1,70 +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);
-
-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 ($disable || $enable) {
-    $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(get_string('managemessageoutputs', 'message'));
-echo $messageoutputs;
-echo $OUTPUT->footer();

admin/mnet/access_control.php

@@ -1,234 +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(moodle_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 '<input type="text" name="username" size="20" maxlength="100" />';
-
-// choose a remote host
-echo " " . get_string('remotehost', 'mnet') . ":\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 " " . get_string('accesslevel', 'mnet') . ":\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,167 +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'));
-        $mform->setType('wwwroot', PARAM_URL);
-        $mform->addRule('wwwroot', null, 'required', null, '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) {
-        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'));
-        $mform->setType('name', PARAM_NOTAGS);
-
-        $mform->addElement('text', 'wwwroot', get_string('hostname', 'mnet'));
-        $mform->setType('wwwroot', PARAM_URL);
-
-        $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);
-
-        if ($mnet_peer && !empty($mnet_peer->deleted)) {
-            $radioarray = array();
-            $radioarray[] = MoodleQuickForm::createElement('radio', 'deleted', '', get_string('yes'), 1);
-            $radioarray[] = MoodleQuickForm::createElement('radio', 'deleted', '', get_string('no'), 0);
-            $mform->addGroup($radioarray, 'radioar', get_string('deleted'), array(' '), false);
-        } else {
-            $mform->addElement('hidden', 'deleted');
-        }
-
-        // 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>'));
-        }
-
-        // finished with static stuff, print save button
-        $this->add_action_buttons(false);
-    }
-
-    function validation($data) {
-        $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 (!$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,265 +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.'/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();
-
-// 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');
-foreach($hosts as $host) {
-    $hosturl = new moodle_url($baseurl, array('hostid' => $host->id));
-    // process all hosts first since it's the easiest
-    if ($host->id == $CFG->mnet_all_hosts_id) {
-        $table->data[] = array(html_writer::tag('a', $host->name, array('href'=>$hosturl)), '', '', '');
-        continue;
-    }
-
-    if ($host->last_connect_time == 0) {
-        $last_connect = get_string('never');
-    } else {
-        $last_connect = date('H:i:s d/m/Y', $host->last_connect_time);
-    }
-    $table->data[] = array(
-        html_writer::link($hosturl, $host->name),
-        html_writer::link($hosturl, $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);
-
-// 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,64 +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;
-
-
-        $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'), str_replace(',', ', ', $CFG->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'), str_replace(',', ', ', $CFG->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.
-          '/course/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,75 @@
+<?PHP  // $Id$
+       // module.php - allows admin to edit all local configuration variables for a module
+
+    require_once("../config.php");
+
+    require_login();
+
+    if (!isadmin()) {
+        error("Only an admin can use this page");
+    }
+
+    if (!$site = get_site()) {
+        error("Site isn't defined!");
+    }
+
+/// If data submitted, then process and store.
+
+    if ($config = data_submitted()) {
+
+        if (!confirm_sesskey()) {
+            error(get_string('confirmsesskeybad', 'error'));
+        }
+        
+        if ($module = optional_param('module', '', PARAM_CLEANFILE)) {
+            // 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
+            require_once("$CFG->dirroot/mod/$module/lib.php");
+            $moduleconfig = $module.'_process_options';
+            if (function_exists($moduleconfig)) {
+                $moduleconfig($config);
+            }
+        } else {
+            $moduleprefix = '';
+        }
+
+        print_header();
+
+        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_CLEANFILE);
+    require_once("$CFG->dirroot/mod/$module/lib.php");
+
+    $stradmin = get_string("administration");
+    $strconfiguration = get_string("configuration");
+    $strmanagemodules = get_string("managemodules");
+    $strmodulename = get_string("modulename", $module);
+
+    print_header("$site->shortname: $strmodulename: $strconfiguration", $site->fullname,
+                  "<a href=\"index.php\">$stradmin</a> -> ".
+                  "<a href=\"configure.php\">$strconfiguration</a> -> ".
+                  "<a href=\"modules.php\">$strmanagemodules</a> -> $strmodulename");
+
+    print_heading($strmodulename);
+
+    print_simple_box("<center>".get_string("configwarning", 'admin')."</center>", "center", "50%");
+    echo "<br />";
+
+    print_simple_box_start("center", "");
+    include("$CFG->dirroot/mod/$module/config.html");
+    print_simple_box_end();
+
+    print_footer();
+
+?>

admin/modules.php

@@ -1,25 +1,30 @@
-<?php
-      // Allows the admin to manage activity modules
+<?PHP // $Id$
+      // Allows the admin to create, delete and rename course categories
 
-    require_once('../config.php');
-    require_once('../course/lib.php');
-    require_once($CFG->libdir.'/adminlib.php');
-    require_once($CFG->libdir.'/tablelib.php');
+    require_once("../config.php");
+    require_once("../course/lib.php");
 
-    // defines
-    define('MODULE_TABLE','module_administration_table');
+    optional_variable($disable);
+    optional_variable($enable);
+    optional_variable($delete);
+    optional_variable($confirm);
 
-    admin_externalpage_setup('managemodules');
+    require_login();
 
-    $show    = optional_param('show', '', PARAM_SAFEDIR);
-    $hide    = optional_param('hide', '', PARAM_SAFEDIR);
-    $delete  = optional_param('delete', '', PARAM_SAFEDIR);
-    $confirm = optional_param('confirm', '', PARAM_BOOL);
+    if (!isadmin()) {
+        error("Only administrators can use this page!");
+    }
+
+    if (!$site = get_site()) {
+        error("Site isn't defined!");
+    }
 
 
 /// Print headings
 
-    $stractivities = get_string("activities");
+    $stradministration = get_string("administration");
+    $strconfiguration = get_string("configuration");
+    $strmanagemodules = get_string("managemodules");
     $strdelete = get_string("delete");
     $strversion = get_string("version");
     $strhide = get_string("hide");
@@ -27,165 +32,158 @@
     $strsettings = get_string("settings");
     $stractivities = get_string("activities");
     $stractivitymodule = get_string("activitymodule");
-    $strshowmodulecourse = get_string('showmodulecourse');
+
+    print_header("$site->shortname: $strmanagemodules", "$site->fullname", 
+                 "<a href=\"index.php\">$stradministration</a> -> ".
+                 "<a href=\"configure.php\">$strconfiguration</a> -> $strmanagemodules");
+
+    print_heading($strmanagemodules);
+   
 
 /// 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", "visible", "0", "module", $module->id); // Hide all related activity modules
     }
 
     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", "module", $module->id); // Show all related activity modules
     }
 
     if (!empty($delete) and confirm_sesskey()) {
-        echo $OUTPUT->header();
-        echo $OUTPUT->heading($stractivities);
+      
+        $strmodulename = get_string("modulename", "$delete");
 
-        if (get_string_manager()->string_exists('modulename', $delete)) {
-            $strmodulename = get_string('modulename', $delete);
-        } else {
-            $strmodulename = $delete;
-        }
-
-        if (!$confirm) {
-            echo $OUTPUT->confirm(get_string("moduledeleteconfirm", "", $strmodulename), "modules.php?delete=$delete&confirm=1", "modules.php");
-            echo $OUTPUT->footer();
+        if (empty($confirm)) {
+            notice_yesno(get_string("moduledeleteconfirm", "", $strmodulename), 
+                         "modules.php?delete=$delete&amp;confirm=$delete&amp;sesskey=$USER->sesskey", 
+                         "modules.php");
+            print_footer();
             exit;
 
         } else {  // Delete everything!!
 
             if ($delete == "forum") {
-                print_error("cannotdeleteforummodule", 'forum');
+                error("You can not delete the forum module!!");
             }
 
-            uninstall_plugin('mod', $delete);
+            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");
+                        }
+                    }
+                }
+            }  
+
+            rebuild_course_cache();  // Because things have changed
+
+
             $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);
-
 /// 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) {
+        $strmodulename = get_string("modulename", "$module->name");
+        $modulebyname[$strmodulename] = $module;
+    }
+    ksort($modulebyname);
 
-        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;
-        }
+/// Print the table of all modules
 
-        $delete = "<a href=\"modules.php?delete=$module->name&amp;sesskey=".sesskey()."\">$strdelete</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";
 
-        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>";
+    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("$module->name");
 
-        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 />";
 
+    print_footer();
 
+?>

admin/multilangupgrade.php

@@ -1,117 +0,0 @@
-<?php
-      /// Search and replace strings throughout all texts in the whole database
-
-define('NO_OUTPUT_BUFFERING', true);
-
-require_once('../config.php');
-require_once($CFG->dirroot.'/course/lib.php');
-require_once($CFG->libdir.'/adminlib.php');
-
-admin_externalpage_setup('multilangupgrade');
-
-$go = optional_param('go', 0, PARAM_BOOL);
-
-###################################################################
-echo $OUTPUT->header();
-
-echo $OUTPUT->heading(get_string('multilangupgrade', 'admin'));
-
-$strmultilangupgrade = get_String('multilangupgradeinfo', 'admin');
-
-if (!$go or !data_submitted() or !confirm_sesskey()) {   /// Print a form
-    $optionsyes = array('go'=>1, 'sesskey'=>sesskey());
-    echo $OUTPUT->confirm($strmultilangupgrade, new moodle_url('multilangupgrade.php', $optionsyes), 'index.php');
-    echo $OUTPUT->footer();
-    die;
-}
-
-
-if (!$tables = $DB->get_tables() ) {    // No tables yet at all.
-    print_error('notables', 'debug');
-}
-
-echo $OUTPUT->box_start();
-
-/// Turn off time limits, sometimes upgrades can be slow.
-
-@set_time_limit(0);
-
-echo '<strong>Progress:</strong>';
-$i = 0;
-$skiptables = array('config', 'user_students', 'user_teachers');
-
-foreach ($tables as $table) {
-    if (strpos($table,'pma') === 0) { // Not our tables
-        continue;
-    }
-    if (in_array($table, $skiptables)) { // Don't process these
-        continue;
-    }
-    $fulltable = $DB->get_prefix().$table;
-    if ($columns = $DB->get_columns($table)) {
-        if (!array_key_exists('id', $columns)) {
-            continue; // moodle tables have id
-        }
-        foreach ($columns as $column => $data) {
-            if (in_array($data->type, array('text','mediumtext','longtext','varchar'))) {  // Text stuff only
-                // first find candidate records
-                $sql = "SELECT id, $column FROM $fulltable WHERE $column LIKE '%</lang>%' OR $column LIKE '%<span lang=%'";
-                $rs = $DB->get_recordset_sql($sql);
-                foreach ($rs as $data) {
-                    $text = $data->$column;
-                    $id   = $data->id;
-                    if ($i % 600 == 0) {
-                        echo '<br />';
-                    }
-                    if ($i % 10 == 0) {
-                        echo '.';
-                    }
-                    $i++;
-
-                    if (empty($text) or is_numeric($text)) {
-                        continue; // nothing to do
-                    }
-
-                    $search = '/(<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)(\s*<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)+/is';
-                    $newtext = preg_replace_callback($search, 'multilangupgrade_impl', $text);
-
-                    if (is_null($newtext)) {
-                        continue; // regex error
-                    }
-
-                    if ($newtext != $text) {
-                        $DB->execute("UPDATE $fulltable SET $column=? WHERE id=?", array($newtext, $id));
-                    }
-                }
-                $rs->close();
-            }
-        }
-    }
-}
-
-// set conversion flag - switches to new plugin automatically
-set_config('filter_multilang_converted', 1);
-
-echo $OUTPUT->box_end();
-
-/// Rebuild course cache which might be incorrect now
-echo $OUTPUT->notification('Rebuilding course cache...', 'notifysuccess');
-rebuild_course_cache();
-echo $OUTPUT->notification('...finished', 'notifysuccess');
-
-echo $OUTPUT->continue_button('index.php');
-
-echo $OUTPUT->footer();
-die;
-
-
-function multilangupgrade_impl($langblock) {
-    $searchtosplit = '/<(?:lang|span) lang="([a-zA-Z0-9_-]*)".*?>(.+?)<\/(?:lang|span)>/is';
-    preg_match_all($searchtosplit, $langblock[0], $rawlanglist);
-    $return = '';
-    foreach ($rawlanglist[1] as $index=>$lang) {
-        $return .= '<span lang="'.$lang.'" class="multilang">'.$rawlanglist[2][$index].'</span>';
-    }
-    return $return;
-}
-

admin/oacleanup.php

@@ -3,68 +3,49 @@
 if (!isset($CFG)) {
 
     require('../config.php');
-    require_once($CFG->libdir.'/adminlib.php');
 
-    admin_externalpage_setup('oacleanup');
+    require_login();
+
+    if (!isadmin()) {
+        error('You must be an admin to use this script');
+        exit;
+    }
+    
+    print_header_simple('Online Assignment Cleanup','Online Assignment Cleanup', 'Admin');
 
-    echo $OUTPUT->header();
     online_assignment_cleanup(true);
-    echo $OUTPUT->footer();
+
+    print_footer();
 
 }
 
 
 
 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>';
     }
 
-
-    /// 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'));
-    if ((int)$amv < 2005041400) {
-        if ($output) {
-            echo '</center>';
-        }
-        return;
-    }
-
-
-    /// get the module id for assignments from db
-    $arecord = $DB->get_record('modules', array('name', 'assignment'));
+    // get the module id for assignments from db
+    $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_courses();
 
     /// 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;
         }
@@ -81,14 +62,17 @@ function online_assignment_cleanup($output=false) {
                 /// cycle through the instances
                 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);
+                    $sql = "SELECT a.id 
+                        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 +80,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 +103,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,9 +125,9 @@ 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 +136,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 +145,4 @@ function online_assignment_cleanup($output=false) {
     echo '</center>';
 }
 
-
+?>

admin/phpinfo.php

@@ -1,33 +1,34 @@
-<?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');
+    require_login();
 
-    echo $OUTPUT->header();
+    if (!isadmin()) {
+        error("Only the admin can use this page");
+    }
 
-    echo '<div class="phpinfo">';
+    if (isset($topframe)) {
+        $stradministration = get_string("administration");
+        $site = get_site();
+    
+        print_header("$site->shortname: phpinfo", "$site->fullname", 
+                     "<a target=\"$CFG->framename\" href=\"index.php\">$stradministration</a> -> PHP info");
+        exit;
+    }
 
-    ob_start();
-    phpinfo(INFO_GENERAL + INFO_CONFIGURATION + INFO_MODULES);
-    $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();
+    if (isset($bottomframe)) {
+        phpinfo();
+        exit;
+    }
 
+?>
+<head>
+<title>PHP info</title>
+</head>
 
+<frameset rows="80,*">
+   <frame src="phpinfo.php?topframe=true">
+   <frame src="phpinfo.php?bottomframe=true">
+</frameset>

admin/plugins.php

@@ -1,41 +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');
-$output = $PAGE->get_renderer('core', 'admin');
-$pluginman = plugin_manager::instance();
-
-echo $output->header();
-echo $output->heading(get_string('pluginsoverview', 'core_admin'));
-echo $output->box_start('generalbox');
-echo $output->plugins_control_panel($pluginman->get_plugins());
-echo $output->box_end();
-echo $output->footer();

admin/portfolio.php

@@ -1,247 +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);
-            $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);
-                $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
-
+<?
+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 . '/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');
-
-// 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;
-    $archetypal[$behaviour] = question_engine::is_behaviour_archetypal($behaviour);
-}
-
-foreach ($behaviours as $behaviour => $notused) {
-    foreach (question_engine::get_behaviour_required_behaviours($behaviour) as $reqbehaviour) {
-        $needed[$reqbehaviour] = true;
-    }
-}
-foreach ($counts as $behaviour => $count) {
-    if (!array_key_exists($behaviour, $behaviours)) {
-        $counts['missingtype'] += $count;
-    }
-}
-
-// 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_SAFEDIR)) && 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_SAFEDIR)) && 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_SAFEDIR)) && 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_SAFEDIR)) && 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_SAFEDIR)) && 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 = explode(',', $config->behavioursortorder);
-    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->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.
-    $requiredbehaviours = question_engine::get_behaviour_required_behaviours($behaviour);
-    if (!empty($requiredbehaviours)) {
-        $strrequiredbehaviours = array();
-        foreach ($requiredbehaviours as $required) {
-            $strrequiredbehaviours[] = $sortedbehaviours[$required];
-        }
-        $row[] = implode(', ', $strrequiredbehaviours);
-    } else {
-        $row[] = '';
-    }
-
-    // Are people allowed to create new questions of this type?
-    $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 . '/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();
-
-// 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;
-    $counts[$qtypename]->numquestions -= $counts[$qtypename]->numhidden;
-}
-$needed['missingtype'] = true; // The system needs the missing question type.
-foreach ($qtypes as $qtypename => $qtype) {
-    foreach ($qtype->requires_qtypes() as $reqtype) {
-        $needed[$reqtype] = true;
-    }
-}
-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_SAFEDIR)) && 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_SAFEDIR)) && 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_SAFEDIR)) && 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_SAFEDIR)) && 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_SAFEDIR)) && 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->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('/admin/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.
-    $requiredtypes = $qtype->requires_qtypes();
-    $strtypes = array();
-    if (!empty($requiredtypes)) {
-        foreach ($requiredtypes as $required) {
-            $strtypes[] = $qtypes[$required]->local_name();
-        }
-        $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,194 @@
+<?php  // $Id$
+       // register.php - allows admin to register their site on moodle.org
+
+    include("../config.php");
+
+    require_login();
+
+    if (!isadmin()) {
+        error("Only the admin can use this page");
+    }
+
+    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));
+    }
+
+
+/// 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')-1;
+    echo get_string("users").": ".$count;
+    echo "<input type=\"hidden\" name=\"users\" value=\"$count\">\n";
+    echo '<br />';
+
+    $count = count_records('user_students');
+    echo get_string("enrolments").": ".$count;
+    echo "<input type=\"hidden\" name=\"enrolments\" value=\"$count\">\n";
+    echo '<br />';
+
+    $count = count_records('user_teachers');
+    echo get_string("teachers").": ".$count;
+    echo "<input type=\"hidden\" name=\"teachers\" 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('quiz_questions');
+    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('registrationindex');
-
-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,467 +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 (strlen($hub['name']) > 100) {
-                $hubname = 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);
-        $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');
-
-        $mform->addElement('static', 'urlstring', get_string('siteurl', 'hub'), $CFG->wwwroot);
-        $mform->addHelpButton('urlstring', 'siteurl', 'hub');
-
-        $languages = get_string_manager()->get_list_of_languages();
-        textlib_get_instance()->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('static', 'versionstring', get_string('siteversion', 'hub'), $CFG->version);
-        $mform->addElement('hidden', 'moodleversion', $CFG->version);
-        $mform->setType('moodleversion', PARAM_INT);
-        $mform->addHelpButton('versionstring', 'siteversion', 'hub');
-
-        $mform->addElement('static', 'releasestring', get_string('siterelease', 'hub'), $CFG->release);
-        $mform->addElement('hidden', 'moodlerelease', $CFG->release);
-        $mform->setType('moodlerelease', PARAM_TEXT);
-        $mform->addHelpButton('releasestring', 'siterelease', 'hub');
-
-        $mform->addElement('textarea', 'address', get_string('postaladdress', 'hub'),
-                array('rows' => 4, 'cols' => 41));
-        $mform->setType('address', PARAM_TEXT);
-        $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);
-        /// 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/hubselector.php

@@ -1,68 +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
- *
- * Thsi page displays a hub selector or a hub URL + password. Then it will redirect to
- * the site registration form (with the selected hub as parameter)
-*/
-
-require('../../config.php');
-
-require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->dirroot.'/' . $CFG->admin . '/registration/forms.php');
-
-admin_externalpage_setup('registrationselector');
-
-$hubselectorform = new hub_selector_form();
-$fromform = $hubselectorform->get_data();
-
-//// Redirect to the registration form if an URL has been choosen ////
-
-$selectedhuburl = optional_param('publichub', false, PARAM_URL);
-$unlistedhuburl = optional_param('unlistedurl', false, PARAM_TEXT);
-$password = optional_param('password', '', PARAM_RAW);
-
-if (!empty($unlistedhuburl)) {
-    if (clean_param($unlistedhuburl, PARAM_URL) !== '') {
-        $huburl = $unlistedhuburl;
-    }
-} else if (!empty($selectedhuburl)) {
-    $huburl = $selectedhuburl;
-}
-
-
-//redirect
-if (!empty($huburl) and confirm_sesskey()) {
-    $hubname = optional_param(clean_param($huburl, PARAM_ALPHANUMEXT), '', PARAM_TEXT);
-    $params = array('sesskey' => sesskey(), 'huburl' => $huburl,
-            'password' => $password, 'hubname' => $hubname);
-    redirect(new moodle_url($CFG->wwwroot."/" . $CFG->admin . "/registration/register.php",
-            $params));
-}
-
-
-//// OUTPUT ////
-
-echo $OUTPUT->header();
-echo $OUTPUT->heading(get_string('registeron', 'hub'), 3, 'main');
-$hubselectorform->display();
-echo $OUTPUT->footer();

admin/registration/index.php

@@ -1,168 +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 select if he wants to register on Moodle.org or
- * a specific hub
- */
-
-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('registrationindex');
-
-$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);
-    }
-}
-
-echo $OUTPUT->header();
-
-//do not check sesskey if confirm = false because this script is linked into email message
-if (!empty($errormessage)) {
-    echo $OUTPUT->notification(get_string('unregistrationerror', 'hub', $errormessage));
-}
-if (empty($cancel) and $unregistration and !$confirm) {
-    $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;
-    }
-
-    echo $OUTPUT->heading(get_string('registeron', 'hub'), 3, 'main');
-    echo $renderer->registrationselector($registeredonmoodleorg);
-
-    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,149 +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.
- * 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');
-
-admin_externalpage_setup('registrationindex');
-
-$huburl = required_param('huburl', PARAM_URL);
-$huburl = rtrim($huburl, "/");
-$password = optional_param('password', '', PARAM_TEXT);
-$hubname = optional_param('hubname', '', PARAM_TEXT);
-if (!confirm_sesskey()) {
-    throw new moodle_exception('missingparameter');
-}
-
-$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;
-}
-
-$siteregistrationform->display();
-echo $OUTPUT->footer();

admin/registration/renderer.php

@@ -1,129 +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 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 page to register on Moodle.org or on a specific hub
-     */
-    public function registrationselector($updatemoodleorg = false) {
-        global $CFG;
-        $table = new html_table();
-        $table->head = array(get_string('moodleorg', 'hub'), get_string('specifichub', 'hub'));
-        $table->size = array('50%', '50%');
-        //$table->attributes['class'] = 'registerindextable';
-        //Moodle.org information cell
-        $moodleorgcell = get_string('moodleorgregistrationdetail', 'hub');
-        $moodleorgcell .= html_writer::empty_tag('br') . html_writer::empty_tag('br');
-        $moodleorgcell = html_writer::tag('div', $moodleorgcell, array('class' => 'justifytext'));
-
-        //Specific hub information cell
-        $specifichubcell = get_string('specifichubregistrationdetail', 'hub');
-        $specifichubcell .= html_writer::empty_tag('br') . html_writer::empty_tag('br');
-        $specifichubcell = html_writer::tag('div', $specifichubcell, array('class' => 'justifytext'));
-
-        //add information cells
-        $cells = array($moodleorgcell, $specifichubcell);
-        $row = new html_table_row($cells);
-        $table->data[] = $row;
-
-        //Moodle.org button cell
-        $registeronmoodleorgurl = new moodle_url("/" . $CFG->admin . "/registration/register.php",
-                        array('sesskey' => sesskey(), 'huburl' => HUB_MOODLEORGHUBURL
-                            , 'hubname' => 'Moodle.org'));
-        $registeronmoodleorgbutton = new single_button($registeronmoodleorgurl,
-                        $updatemoodleorg ? get_string('updatesite', 'hub', 'Moodle.org') : get_string('registeronmoodleorg', 'hub'));
-        $registeronmoodleorgbutton->class = 'centeredbutton';
-        $registeronmoodleorgbuttonhtml = $this->output->render($registeronmoodleorgbutton);
-        $moodleorgcell = $registeronmoodleorgbuttonhtml;
-
-        //Specific hub button cell
-        $registeronspecifichuburl = new moodle_url("/" . $CFG->admin . "/registration/hubselector.php",
-                        array('sesskey' => sesskey()));
-        $registeronspecifichubbutton = new single_button($registeronspecifichuburl,
-                        get_string('registeronspecifichub', 'hub'));
-        $registeronspecifichubbutton->class = 'centeredbutton';
-        $registeronspecifichubbuttonhtml = $this->output->render($registeronspecifichubbutton);
-        $specifichubcell = $registeronspecifichubbuttonhtml;
-
-        //add button cells
-        $cells = array($moodleorgcell, $specifichubcell);
-        $row = new html_table_row($cells);
-        $table->data[] = $row;
-
-        return html_writer::table($table);
-    }
-
-    /**
-     * Display the listing of registered on hub
-     */
-    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('registrationindex');
-
-//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/renderer.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/>.
-
-/**
- * Renderer for core_admin subsystem
- *
- * @package    core
- * @subpackage admin
- * @copyright  2011 David Mudrak <david@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-require_once($CFG->libdir . '/pluginlib.php');
-
-/**
- * Standard HTML output renderer for core_admin subsystem
- */
-class core_admin_renderer extends plugin_renderer_base {
-
-    /**
-     * Displays all known plugins and information about their installation or upgrade
-     *
-     * This default implementation renders all plugins into one big table. The rendering
-     * options support:
-     *     (bool)full = false: whether to display up-to-date plugins, too
-     *
-     * @param array $plugininfo as returned by {@see plugin_manager::get_plugins()}
-     * @param array $options rendering options
-     * @return string HTML code
-     */
-    public function plugins_check(array $plugininfo, array $options = null) {
-
-        if (empty($plugininfo)) {
-            return '';
-        }
-
-        if (empty($options)) {
-            $options = array(
-                'full' => false,
-            );
-        }
-
-        $pluginman = plugin_manager::instance();
-
-        $table = new html_table();
-        $table->id = 'plugins-check';
-        $table->head = array(
-            get_string('displayname', 'core_plugin'),
-            get_string('rootdir', 'core_plugin'),
-            get_string('source', 'core_plugin'),
-            get_string('versiondb', 'core_plugin'),
-            get_string('versiondisk', 'core_plugin'),
-            get_string('status', 'core_plugin'),
-        );
-        $table->colclasses = array(
-            'displayname', 'rootdir', 'source', 'versiondb', 'versiondisk', 'status',
-        );
-        $table->data = array();
-
-        $numofhighlighted = array();    // number of highlighted rows per this subsection
-
-        foreach ($plugininfo as $type => $plugins) {
-
-            $header = new html_table_cell($pluginman->plugintype_name_plural($type));
-            $header->header = true;
-            $header->colspan = count($table->head);
-            $header = new html_table_row(array($header));
-            $header->attributes['class'] = 'plugintypeheader type-' . $type;
-
-            $numofhighlighted[$type] = 0;
-
-            if (empty($plugins) and $options['full']) {
-                $msg = new html_table_cell(get_string('noneinstalled', 'core_plugin'));
-                $msg->colspan = count($table->head);
-                $row = new html_table_row(array($msg));
-                $row->attributes['class'] .= 'msg msg-noneinstalled';
-                $table->data[] = $header;
-                $table->data[] = $row;
-                continue;
-            }
-
-            $plugintyperows = array();
-
-            foreach ($plugins as $name => $plugin) {
-                $row = new html_table_row();
-                $row->attributes['class'] = 'type-' . $plugin->type . ' name-' . $plugin->type . '_' . $plugin->name;
-
-                if ($this->page->theme->resolve_image_location('icon', $plugin->type . '_' . $plugin->name)) {
-                    $icon = $this->output->pix_icon('icon', '', $plugin->type . '_' . $plugin->name, array('class' => 'smallicon pluginicon'));
-                } else {
-                    $icon = $this->output->pix_icon('spacer', '', 'moodle', array('class' => 'smallicon pluginicon noicon'));
-                }
-                $displayname  = $icon . ' ' . $plugin->displayname;
-                $displayname = new html_table_cell($displayname);
-
-                $rootdir = new html_table_cell($plugin->get_dir());
-
-                if ($isstandard = $plugin->is_standard()) {
-                    $row->attributes['class'] .= ' standard';
-                    $source = new html_table_cell(get_string('sourcestd', 'core_plugin'));
-                } else {
-                    $row->attributes['class'] .= ' extension';
-                    $source = new html_table_cell(get_string('sourceext', 'core_plugin'));
-                }
-
-                $versiondb = new html_table_cell($plugin->versiondb);
-                $versiondisk = new html_table_cell($plugin->versiondisk);
-
-                $statuscode = $plugin->get_status();
-                $row->attributes['class'] .= ' status-' . $statuscode;
-
-                $status = new html_table_cell(get_string('status_' . $statuscode, 'core_plugin'));
-
-                if ($isstandard and in_array($statuscode, array(plugin_manager::PLUGIN_STATUS_NODB, plugin_manager::PLUGIN_STATUS_UPTODATE))) {
-                    if (empty($options['full'])) {
-                        continue;
-                    }
-                } else {
-                    $numofhighlighted[$type]++;
-                }
-
-                $row->cells = array($displayname, $rootdir, $source, $versiondb, $versiondisk, $status);
-                $plugintyperows[] = $row;
-            }
-
-            if (empty($numofhighlighted[$type]) and empty($options['full'])) {
-                continue;
-            }
-
-            $table->data[] = $header;
-            $table->data = array_merge($table->data, $plugintyperows);
-        }
-
-        $sumofhighlighted = array_sum($numofhighlighted);
-
-        if ($sumofhighlighted == 0) {
-            $out  = $this->output->container_start('nonehighlighted', 'plugins-check-info');
-            $out .= $this->output->heading(get_string('nonehighlighted', 'core_plugin'));
-            if (empty($options['full'])) {
-                $out .= html_writer::link(new moodle_url('/admin/index.php',
-                    array('confirmupgrade' => 1, 'confirmrelease' => 1, 'showallplugins' => 1)),
-                    get_string('nonehighlightedinfo', 'core_plugin'));
-            }
-            $out .= $this->output->container_end();
-
-        } else {
-            $out  = $this->output->container_start('somehighlighted', 'plugins-check-info');
-            $out .= $this->output->heading(get_string('somehighlighted', 'core_plugin', $sumofhighlighted));
-            if (empty($options['full'])) {
-                $out .= html_writer::link(new moodle_url('/admin/index.php',
-                    array('confirmupgrade' => 1, 'confirmrelease' => 1, 'showallplugins' => 1)),
-                    get_string('somehighlightedinfo', 'core_plugin'));
-            }
-            $out .= $this->output->container_end();
-        }
-
-        if ($sumofhighlighted > 0 or $options['full']) {
-            $out .= html_writer::table($table);
-        }
-
-        return $out;
-    }
-
-    /**
-     * Displays all known plugins and links to manage them
-     *
-     * This default implementation renders all plugins into one big table.
-     *
-     * @param array $plugininfo as returned by {@see plugin_manager::get_plugins()}
-     * @return string HTML code
-     */
-    public function plugins_control_panel(array $plugininfo) {
-
-        if (empty($plugininfo)) {
-            return '';
-        }
-
-        $pluginman = plugin_manager::instance();
-
-        $table = new html_table();
-        $table->id = 'plugins-control-panel';
-        $table->head = array(
-            get_string('displayname', 'core_plugin'),
-            get_string('systemname', 'core_plugin'),
-            get_string('source', 'core_plugin'),
-            get_string('version', 'core_plugin'),
-            get_string('availability', 'core_plugin'),
-            get_string('settings', 'core_plugin'),
-            get_string('uninstall','core_plugin'),
-        );
-        $table->colclasses = array(
-            'displayname', 'systemname', 'source', 'version', 'availability', 'settings', 'uninstall',
-        );
-
-        foreach ($plugininfo as $type => $plugins) {
-
-            $header = new html_table_cell($pluginman->plugintype_name_plural($type));
-            $header->header = true;
-            $header->colspan = count($table->head);
-            $header = new html_table_row(array($header));
-            $header->attributes['class'] = 'plugintypeheader type-' . $type;
-            $table->data[] = $header;
-
-            if (empty($plugins)) {
-                $msg = new html_table_cell(get_string('noneinstalled', 'core_plugin'));
-                $msg->colspan = count($table->head);
-                $row = new html_table_row(array($msg));
-                $row->attributes['class'] .= 'msg msg-noneinstalled';
-                $table->data[] = $row;
-                continue;
-            }
-
-            foreach ($plugins as $name => $plugin) {
-                $row = new html_table_row();
-                $row->attributes['class'] = 'type-' . $plugin->type . ' name-' . $plugin->type . '_' . $plugin->name;
-
-                if ($this->page->theme->resolve_image_location('icon', $plugin->type . '_' . $plugin->name)) {
-                    $icon = $this->output->pix_icon('icon', '', $plugin->type . '_' . $plugin->name, array('class' => 'smallicon pluginicon'));
-                } else {
-                    $icon = $this->output->pix_icon('spacer', '', 'moodle', array('class' => 'smallicon pluginicon noicon'));
-                }
-                if ($plugin->get_status() === plugin_manager::PLUGIN_STATUS_MISSING) {
-                    $msg = html_writer::tag('span', get_string('status_missing', 'core_plugin'), array('class' => 'notifyproblem'));
-                    $row->attributes['class'] .= ' missingfromdisk';
-                } else {
-                    $msg = '';
-                }
-                $displayname  = $icon . ' ' . $plugin->displayname . ' ' . $msg;
-                $displayname = new html_table_cell($displayname);
-
-                $systemname = new html_table_cell($plugin->type . '_' . $plugin->name);
-
-                if ($plugin->is_standard()) {
-                    $row->attributes['class'] .= ' standard';
-                    $source = new html_table_cell(get_string('sourcestd', 'core_plugin'));
-                } else {
-                    $row->attributes['class'] .= ' extension';
-                    $source = new html_table_cell(get_string('sourceext', 'core_plugin'));
-                }
-
-                $version = new html_table_cell($plugin->versiondb);
-
-                $isenabled = $plugin->is_enabled();
-                if (is_null($isenabled)) {
-                    $availability = new html_table_cell('');
-                } else if ($isenabled) {
-                    $row->attributes['class'] .= ' enabled';
-                    $icon = $this->output->pix_icon('i/hide', get_string('pluginenabled', 'core_plugin'));
-                    $availability = new html_table_cell($icon . ' ' . get_string('pluginenabled', 'core_plugin'));
-                } else {
-                    $row->attributes['class'] .= ' disabled';
-                    $icon = $this->output->pix_icon('i/show', get_string('plugindisabled', 'core_plugin'));
-                    $availability = new html_table_cell($icon . ' ' . get_string('plugindisabled', 'core_plugin'));
-                }
-
-                $settingsurl = $plugin->get_settings_url();
-                if (is_null($settingsurl)) {
-                    $settings = new html_table_cell('');
-                } else {
-                    $settings = html_writer::link($settingsurl, get_string('settings', 'core_plugin'));
-                    $settings = new html_table_cell($settings);
-                }
-
-                $uninstallurl = $plugin->get_uninstall_url();
-                if (is_null($uninstallurl)) {
-                    $uninstall = new html_table_cell('');
-                } else {
-                    $uninstall = html_writer::link($uninstallurl, get_string('uninstall', 'core_plugin'));
-                    $uninstall = new html_table_cell($uninstall);
-                }
-
-                $row->cells = array(
-                    $displayname, $systemname, $source, $version, $availability, $settings, $uninstall
-                );
-                $table->data[] = $row;
-            }
-        }
-
-        return html_writer::table($table);
-    }
-}

admin/replace.php

@@ -1,59 +1,58 @@
-<?php
+<?php /// $Id$
       /// Search and replace strings throughout all texts in the whole database
 
-define('NO_OUTPUT_BUFFERING', true);
+require('../config.php');
 
-require_once('../config.php');
-require_once($CFG->dirroot.'/course/lib.php');
-require_once($CFG->libdir.'/adminlib.php');
+$search  = optional_param('search', '');
+$replace = optional_param('replace', '');
 
-admin_externalpage_setup('replace');
+require_login();
 
-$search  = optional_param('search', '', PARAM_RAW);
-$replace = optional_param('replace', '', PARAM_RAW);
-$sure    = optional_param('sure', 0, PARAM_BOOL);
+if (!isadmin()) {
+    error("Admins only");
+}
 
 ###################################################################
-echo $OUTPUT->header();
+print_header('Search and replace throughout the whole database', 'Replace text within the whole database');
 
-echo $OUTPUT->heading('Search and replace text throughout the whole database');
 
-if ($DB->get_dbfamily() !== 'mysql' and $DB->get_dbfamily() !== 'postgres') {
-    //TODO: add $DB->text_replace() to DML drivers
-    echo $OUTPUT->notification('Sorry, this feature is implemented only for MySQL and PostgreSQL databases.');
-    echo $OUTPUT->footer();
-    die;
-}
+if (!$search or !$replace or !confirm_sesskey()) {   /// Print a form
 
-if (!data_submitted() or !$search or !$replace or !confirm_sesskey() or !$sure) {   /// Print a form
-    echo $OUTPUT->notification('This script is not supported, always make complete backup before proceeding!<br />This operation can not be reverted!');
-
-    echo $OUTPUT->box_start();
-    echo '<div class="mdl-align">';
-    echo '<form action="replace.php" method="post"><div>';
-    echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
-    echo '<div><label for="search">Search whole database for: </label><input id="search" type="text" name="search" size="40" /> (usually previous server URL)</div>';
-    echo '<div><label for="replace">Replace with this string: </label><input type="text" id="replace" name="replace" size="40" /> (usually new server URL)</div>';
-    echo '<div><label for="sure">I understand the risks of this operation: </label><input type="checkbox" id="sure" name="sure" value="1" /></div>';
-    echo '<div class="buttons"><input type="submit" class="singlebutton" value="Yes, do it now" /></div>';
-    echo '</div></form>';
+    print_simple_box_start('center');
+    echo '<div align="center">';
+    echo '<form action="replace.php">';
+    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>';
-    echo $OUTPUT->box_end();
-    echo $OUTPUT->footer();
+    print_simple_box_end();
     die;
 }
 
-echo $OUTPUT->box_start();
-db_replace($search, $replace);
-echo $OUTPUT->box_end();
 
-/// Rebuild course cache which might be incorrect now
-echo $OUTPUT->notification('Rebuilding course cache...', 'notifysuccess');
-rebuild_course_cache();
-echo $OUTPUT->notification('...finished', 'notifysuccess');
+if (!$tables = $db->Metatables() ) {    // No tables yet at all.
+    error("no tables");
+}
 
-echo $OUTPUT->continue_button('index.php');
-
-echo $OUTPUT->footer();
+print_simple_box_start('center');
+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 {$CFG->prefix}$table SET $column = REPLACE($column, '$search', '$replace');");
+                $db->debug = false;
+            }
+        }
+    }
+}
+print_simple_box_end();
 
+print_continue('index.php');
 
+?>

admin/report/backups/index.php

@@ -1,128 +0,0 @@
-<?php
-      // index.php - scheduled backup logs
-
-    require_once('../../../config.php');
-    require_once($CFG->libdir.'/adminlib.php');
-    require_once($CFG->dirroot.'/backup/lib.php');
-
-    $courseid = optional_param('courseid', 0, PARAM_INT);
-
-    admin_externalpage_setup('reportbackups');
-    echo $OUTPUT->header();
-
-/// Automated backups aren't active by the site admin
-    $backup_config = backup_get_config();
-    if (empty($backup_config->backup_auto_active)) {
-        echo $OUTPUT->notification(get_string('automatedbackupsinactive', 'backup'));
-    }
-
-/// Get needed strings
-    $backuploglaststatus = get_string("backuploglaststatus");
-    $backuplogdetailed = get_string("backuplogdetailed");
-    $stradmin = get_string("administration");
-    $strconfiguration = get_string("configuration");
-    $strbackup = get_string("backup");
-    $strbackupdetails = get_string("backupdetails");
-    $strlogs = get_string("logs");
-    $strftimedatetime = get_string("strftimerecent");
-    $strftimetime = get_string("strftimetime").":%S";
-    $strerror = get_string("error");
-    $strok = get_string("ok");
-    $strunfinished = get_string("unfinished");
-    $strskipped = get_string("skipped");
-    $strcourse = get_string("course");
-    $strtimetaken = get_string("timetaken","quiz");
-    $strstatus = get_string("status");
-    $strnext = get_string("backupnext");
-
-/// Decide when to show last execution logs or detailed logs
-/// Lastlog view
-    if (!$courseid) {
-        echo $OUTPUT->heading($backuploglaststatus);
-        echo $OUTPUT->box_start();
-    /// Now, get every record from backup_courses
-        $courses = $DB->get_records("backup_courses");
-
-        if (!$courses) {
-            echo $OUTPUT->notification(get_string('nologsfound'));
-        } else {
-            echo "<table border=\"0\" align=\"center\" cellpadding=\"3\" cellspacing=\"3\">";
-            //Print table header
-            echo "<tr>";
-            echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"3\">$strcourse</font></td>";
-            echo "<td nowrap=\"nowrap\" align=\"center\" colspan=\"3\"><font size=\"3\">$strtimetaken</font></td>";
-            echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"3\">$strstatus</font></td>";
-            echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"3\">$strnext</font></td></tr>";
-            foreach ($courses as $course) {
-            /// Get the course shortname
-                $coursename = $DB->get_field ("course", "fullname", array("id"=>$course->courseid));
-                if ($coursename) {
-                    echo "<tr>";
-                    echo "<td nowrap=\"nowrap\"><font size=\"2\"><a href=\"index.php?courseid=$course->courseid\">".$coursename."</a></font></td>";
-                    echo "<td nowrap=\"nowrap\"><font size=\"2\">".userdate($course->laststarttime,$strftimedatetime)."</font></td>";
-                    echo "<td nowrap=\"nowrap\"><font size=\"2\"> - </font></td>";
-                    echo "<td nowrap=\"nowrap\"><font size=\"2\">".userdate($course->lastendtime,$strftimedatetime)."</font></td>";
-                    if ($course->laststatus == 1) {
-                        echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"2\" color=\"green\">".$strok."</font></td>";
-                    } else if ($course->laststatus == 2) {
-                        echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"2\" color=\"red\">".$strunfinished."</font></td>";
-                    } else if ($course->laststatus == 3) {
-                        echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"2\" color=\"green\">".$strskipped."</font></td>";
-                    } else {
-                        echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"2\" color=\"red\">".$strerror."</font></td>";
-                    }
-                    echo "<td nowrap=\"nowrap\"><font size=\"2\">".userdate($course->nextstarttime,$strftimedatetime)."</font></td>";
-                    echo "</tr>";
-                }
-            }
-            echo "</table>";
-        }
-        echo $OUTPUT->box_end();
-/// Detailed View !!
-    } else {
-        echo $OUTPUT->heading($backuplogdetailed);
-
-        $coursename = $DB->get_field("course", "fullname", array("id"=>"$courseid"));
-        echo $OUTPUT->heading("$strcourse: $coursename");
-
-        echo $OUTPUT->box_start();
-
-    /// First, me get all the distinct backups for that course in backup_log
-        $executions = $DB->get_records_sql("SELECT DISTINCT laststarttime
-                                              FROM {backup_log}
-                                             WHERE courseid = ? AND backuptype = ?
-                                          ORDER BY laststarttime DESC", array($courseid,'scheduledbackup'));
-
-    /// Iterate over backup executions
-        if (!$executions) {
-            echo $OUTPUT->notification(get_string('nologsfound'));
-        } else {
-            echo "<table border=\"0\" align=\"center\" cellpadding=\"3\" cellspacing=\"3\">";
-            foreach($executions as $execution) {
-                echo "<tr>";
-                echo "<td nowrap=\"nowrap\" align=\"center\" colspan=\"3\">";
-                echo $OUTPUT->box(userdate($execution->laststarttime));
-                echo "</td>";
-                echo "</tr>";
-                $logs = $DB->get_records_sql("SELECT *
-                                                FROM {backup_log}
-                                               WHERE courseid = ? AND laststarttime = ? AND backuptype = ?
-                                            ORDER BY id", array($courseid, $execution->laststarttime,'scheduledbackup'));
-                if ($logs) {
-                    foreach ($logs as $log) {
-                        echo "<tr>";
-                        echo "<td nowrap=\"nowrap\"><font size=\"2\">".userdate($log->time,$strftimetime)."</font></td>";
-                        $log->info = str_replace("- ERROR!!","- <font color=\"red\">ERROR!!</font>",$log->info);
-                        $log->info = str_replace("- OK","- <font color=\"green\">OK</font>",$log->info);
-                        echo "<td nowrap=\"nowrap\"><font size=\"2\">".str_replace("  ","&nbsp;&nbsp;&nbsp;&nbsp;",$log->info)."</font></td>";
-                        echo "</tr>";
-                    }
-                }
-            }
-            echo "</table>";
-        }
-        echo $OUTPUT->box_end();
-    }
-
-    echo $OUTPUT->footer();
-

admin/report/backups/settings.php

@@ -1,5 +0,0 @@
-<?php
-
-defined('MOODLE_INTERNAL') || die;
-
-$ADMIN->add('reports', new admin_externalpage('reportbackups', get_string('backups', 'admin'), "$CFG->wwwroot/$CFG->admin/report/backups/index.php",'moodle/backup:backupcourse'));

admin/report/capability/index.php

@@ -1,214 +0,0 @@
-<?php
-/**
- * For a given capability, show what permission it has for every role, and
- * everywhere that it is overridden.
- *
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package roles
- */
-
-/** */
-require_once(dirname(__FILE__).'/../../../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-
-// Check permissions.
-require_login();
-$systemcontext = get_context_instance(CONTEXT_SYSTEM);
-require_capability('moodle/role:manage', $systemcontext);
-
-// Get URL parameters.
-$capability = optional_param('capability', '', PARAM_CAPABILITY);
-$roleids = optional_param('roles', array('0'), PARAM_INTEGER);
-
-// Clean the passed in list of role ids. If 'All' selected as an option, or
-// if none were selected, do all roles.
-$allroles = get_all_roles();
-$cleanedroleids = array();
-foreach ($roleids as $roleid) {
-    if ($roleid == 0) {
-        $cleanedroleids = array_keys($allroles);
-        break;
-    }
-    if (array_key_exists($roleid, $allroles)) {
-        $cleanedroleids[] = $roleid;
-    }
-}
-if (empty($cleanedroleids)) {
-    $cleanedroleids = array_keys($allroles);
-}
-
-// Include the required JavaScript.
-$PAGE->requires->js_init_call('M.report_capability.init', array(get_string('search')));
-
-// Log.
-add_to_log(SITEID, "admin", "report capability", "report/capability/index.php?capability=$capability", $capability);
-
-// Print the header.
-admin_externalpage_setup('reportcapability');
-echo $OUTPUT->header();
-
-// Prepare the list of capabilities to choose from
-$allcapabilities = fetch_context_capabilities($systemcontext);
-$capabilitychoices = array();
-foreach ($allcapabilities as $cap) {
-    $capabilitychoices[$cap->name] = $cap->name . ': ' . get_capability_string($cap->name);
-}
-
-// Prepare the list of roles to choose from
-$rolechoices = array('0' => get_string('all'));
-foreach ($allroles as $role) {
-    $rolechoices[$role->id] = $role->name;
-}
-if (count($cleanedroleids) == count($allroles)) {
-    // Select 'All', rather than each role individually.
-    $selectedroleids = array('0');
-} else {
-    $selectedroleids = $cleanedroleids;
-}
-
-// Print the settings form.
-echo $OUTPUT->box_start('generalbox boxwidthwide boxaligncenter');
-echo '<form method="get" action="." id="settingsform"><div>';
-echo $OUTPUT->heading(get_string('reportsettings', 'report_capability'));
-echo '<p id="intro">', get_string('intro', 'report_capability') , '</p>';
-echo '<p><label for="menucapability"> ' . get_string('capabilitylabel', 'report_capability') . '</label></p>';
-echo  html_writer::select($capabilitychoices, 'capability', $capability, array(''=>'choose'), array('size'=>10));
-echo '<p><label for="menuroles"> ' . get_string('roleslabel', 'report_capability') . '</label></p>';
-echo  html_writer::select($rolechoices, 'roles[]', $selectedroleids, false, array('size'=>10, 'multiple'=>'multiple'));
-echo '<p><input type="submit" id="settingssubmit" value="' . get_string('getreport', 'report_capability') . '" /></p>';
-echo '</div></form>';
-echo $OUTPUT->box_end();
-
-// If we have a capability, generate the report.
-if ($capability) {
-
-    // Work out the bits needed for the SQL WHERE clauses.
-    $params = array($capability);
-    $sqlroletest = '';
-    if (count($cleanedroleids) != count($allroles)) {
-        list($sqlroletest, $roleparams) = $DB->get_in_or_equal($cleanedroleids);
-        $params = array_merge($params, $roleparams);
-        $sqlroletest = 'AND roleid ' . $sqlroletest;
-    }
-
-    // Get all the role_capabilities rows for this capability - that is, all
-    // role definitions, and all role overrides.
-    $rolecaps = $DB->get_records_sql("
-            SELECT id, roleid, contextid, permission
-            FROM {role_capabilities}
-            WHERE capability = ? $sqlroletest", $params);
-
-    // In order to display a nice tree of contexts, we need to get all the
-    // ancestors of all the contexts in the query we just did.
-    $relevantpaths = $DB->get_records_sql_menu("
-            SELECT DISTINCT con.path, 1
-            FROM {context} con JOIN {role_capabilities} rc ON rc.contextid = con.id
-            WHERE capability = ? $sqlroletest", $params);
-    $requiredcontexts = array($systemcontext->id);
-    foreach ($relevantpaths as $path => $notused) {
-        $requiredcontexts = array_merge($requiredcontexts, explode('/', trim($path, '/')));
-    }
-    $requiredcontexts = array_unique($requiredcontexts);
-
-    // Now load those contexts.
-    list($sqlcontexttest, $contextparams) = $DB->get_in_or_equal($requiredcontexts);
-    $contexts = get_sorted_contexts('ctx.id ' . $sqlcontexttest, $contextparams);
-
-    // Prepare some empty arrays to hold the data we are about to compute.
-    foreach ($contexts as $conid => $con) {
-        $contexts[$conid]->children = array();
-        $contexts[$conid]->rolecapabilities = array();
-    }
-
-    // Put the contexts into a tree structure.
-    foreach ($contexts as $conid => $con) {
-        $parentcontextid = get_parent_contextid($con);
-        if ($parentcontextid) {
-            $contexts[$parentcontextid]->children[] = $conid;
-        }
-    }
-
-    // Put the role capabilities into the context tree.
-    foreach ($rolecaps as $rolecap) {
-        $contexts[$rolecap->contextid]->rolecapabilities[$rolecap->roleid] = $rolecap->permission;
-    }
-
-    // Fill in any missing rolecaps for the system context.
-    foreach ($cleanedroleids as $roleid) {
-        if (!isset($contexts[$systemcontext->id]->rolecapabilities[$roleid])) {
-            $contexts[$systemcontext->id]->rolecapabilities[$roleid] = CAP_INHERIT;
-        }
-    }
-
-    // Print the report heading.
-    echo $OUTPUT->heading(get_string('reportforcapability', 'report_capability', get_capability_string($capability)), 2, 'main', 'report');
-    if (count($cleanedroleids) != count($allroles)) {
-        $rolenames = array();
-        foreach ($cleanedroleids as $roleid) {
-            $rolenames[] = $allroles[$roleid]->name;
-        }
-        echo '<p>', get_string('forroles', 'report_capability', implode(', ', $rolenames)), '</p>';
-    }
-
-    // Now, recursively print the contexts, and the role information.
-    print_report_tree($systemcontext->id, $contexts, $allroles);
-}
-
-// Footer.
-echo $OUTPUT->footer();
-
-function print_report_tree($contextid, $contexts, $allroles) {
-    global $CFG;
-
-    // Array for holding lang strings.
-    static $strpermissions = null;
-    if (is_null($strpermissions)) {
-        $strpermissions = array(
-            CAP_INHERIT => get_string('notset','role'),
-            CAP_ALLOW => get_string('allow','role'),
-            CAP_PREVENT => get_string('prevent','role'),
-            CAP_PROHIBIT => get_string('prohibit','role')
-        );
-    }
-
-    // Start the list item, and print the context name as a link to the place to
-    // make changes.
-    if ($contextid == get_system_context()->id) {
-        $url = "$CFG->wwwroot/$CFG->admin/roles/manage.php";
-        $title = get_string('changeroles', 'report_capability');
-    } else {
-        $url = "$CFG->wwwroot/$CFG->admin/roles/override.php?contextid=$contextid";
-        $title = get_string('changeoverrides', 'report_capability');
-    }
-    echo '<h3><a href="' . $url . '" title="' . $title . '">', print_context_name($contexts[$contextid]), '</a></h3>';
-
-    // If there are any role overrides here, print them.
-    if (!empty($contexts[$contextid]->rolecapabilities)) {
-        $rowcounter = 0;
-        echo '<table class="generaltable rolecaps"><tbody>';
-        foreach ($allroles as $role) {
-            if (isset($contexts[$contextid]->rolecapabilities[$role->id])) {
-                $permission = $contexts[$contextid]->rolecapabilities[$role->id];
-                echo '<tr class="r' . ($rowcounter % 2) . '"><th class="cell">', $role->name,
-                        '</th><td class="cell">' . $strpermissions[$permission] . '</td></tr>';
-                $rowcounter++;
-            }
-        }
-        echo '</tbody></table>';
-    }
-
-    // After we have done the site context, change the string for CAP_INHERIT
-    // from 'notset' to 'inherit'.
-    $strpermissions[CAP_INHERIT] = get_string('inherit','role');
-
-    // If there are any child contexts, print them recursively.
-    if (!empty($contexts[$contextid]->children)) {
-        echo '<ul>';
-        foreach ($contexts[$contextid]->children as $childcontextid) {
-            echo '<li>';
-            print_report_tree($childcontextid, $contexts, $allroles);
-            echo '</li>';
-        }
-        echo '</ul>';
-    }
-}

admin/report/capability/lang/en/report_capability.php

@@ -1,36 +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/>.
-
-/**
- * Strings for component 'report_capability', language 'en', branch 'MOODLE_20_STABLE'
- *
- * @package   report_capability
- * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-$string['capabilitylabel'] = 'Capability:';
-$string['capabilityreport'] = 'Capability report';
-$string['forroles'] = 'For roles {$a}';
-$string['getreport'] = 'Get the report';
-$string['changeoverrides'] = 'Change overrides in this context';
-$string['changeroles'] = 'Change role definitions';
-$string['intro'] = 'This report shows, for a particular capability, what permission that capability has in the definition of every role (or a selection of roles), and everywhere in the site where that capability is overridden.';
-$string['pluginname'] = 'Capability report';
-$string['reportforcapability'] = 'Report for capability \'{$a}\'';
-$string['reportsettings'] = 'Report settings';
-$string['roleslabel'] = 'Roles:';

admin/report/capability/module.js

@@ -1,75 +0,0 @@
-
-M.report_capability = {
-    select: null,
-    input: null,
-    button: null,
-
-    init: function(Y, strsearch) {
-        var context = M.report_capability;
-
-        // Find the form controls.
-        context.select = document.getElementById('menucapability');
-        context.button = document.getElementById('settingssubmit');
-
-        // Create a div to hold the search UI.
-        var div = document.createElement('div');
-        div.id = 'capabilitysearchui';
-
-        // Find the capability search input.
-        var input = document.createElement('input');
-        input.type = 'text';
-        input.id = 'capabilitysearch';
-        context.input = input;
-
-        // Create a label for the search input.
-        var label = document.createElement('label');
-        label.htmlFor = input.id;
-        label.appendChild(document.createTextNode(strsearch + ' '));
-
-        // Tie it all together
-        div.appendChild(label);
-        div.appendChild(input);
-        context.select.parentNode.insertBefore(div, context.select);
-        Y.on('keyup', context.typed, input);
-        Y.on('change', context.validate, context.select);
-        context.select.options[0].style.display = 'none';
-        context.validate();
-    },
-
-    typed: function() {
-        var context = M.report_capability;
-
-        var filtertext = context.input.value;
-        var options = context.select.options;
-        var onlycapability = -1;
-        for (var i = 1; i < options.length; i++) {
-            if (options[i].text.indexOf(filtertext) >= 0) {
-                options[i].disabled = false;
-                options[i].style.display = 'block';
-                if (onlycapability == -1) {
-                    onlycapability = i;
-                } else {
-                    onlycapability = -2;
-                }
-            } else {
-                options[i].disabled = true;
-                options[i].selected = false;
-                options[i].style.display = 'none';
-            }
-        }
-        if (onlycapability >= 0) {
-            options[onlycapability].selected = true;
-        }
-        if (onlycapability == -1) {
-            context.input.className = "error";
-        } else {
-            context.input.className = "";
-        }
-        context.validate();
-    },
-
-    validate: function() {
-        var context = M.report_capability;
-        context.button.disabled = (context.select.value == '');
-    }
-}

admin/report/capability/settings.php

@@ -1,5 +0,0 @@
-<?php
-
-defined('MOODLE_INTERNAL') || die;
-
-$ADMIN->add('roles', new admin_externalpage('reportcapability', get_string('pluginname', 'report_capability'), "$CFG->wwwroot/$CFG->admin/report/capability/index.php",'moodle/role:manage'));

admin/report/configlog/index.php

@@ -1,110 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__).'/../../../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-
-// page parameters
-$page    = optional_param('page', 0, PARAM_INT);
-$perpage = optional_param('perpage', 30, PARAM_INT);    // how many per page
-$sort    = optional_param('sort', 'timemodified', PARAM_ALPHA);
-$dir     = optional_param('dir', 'DESC', PARAM_ALPHA);
-
-admin_externalpage_setup('reportconfiglog');
-echo $OUTPUT->header();
-
-echo $OUTPUT->heading(get_string('configlog', 'report_configlog'));
-
-$changescount = $DB->count_records('config_log');
-
-$columns = array('firstname'    => get_string('firstname'),
-                 'lastname'     => get_string('lastname'),
-                 'timemodified' => get_string('timemodified', 'report_configlog'),
-                 'plugin'       => get_string('plugin', 'report_configlog'),
-                 'name'         => get_string('setting', 'report_configlog'),
-                 'value'        => get_string('value', 'report_configlog'),
-                 'oldvalue'     => get_string('oldvalue', 'report_configlog'),
-                );
-$hcolumns = array();
-
-
-if (!isset($columns[$sort])) {
-    $sort = 'lastname';
-}
-
-foreach ($columns as $column=>$strcolumn) {
-    if ($sort != $column) {
-        $columnicon = '';
-        if ($column == 'lastaccess') {
-            $columndir = 'DESC';
-        } else {
-            $columndir = 'ASC';
-        }
-    } else {
-        $columndir = $dir == 'ASC' ? 'DESC':'ASC';
-        if ($column == 'lastaccess') {
-            $columnicon = $dir == 'ASC' ? 'up':'down';
-        } else {
-            $columnicon = $dir == 'ASC' ? 'down':'up';
-        }
-        $columnicon = " <img src=\"" . $OUTPUT->pix_url('t/' . $columnicon) . "\" alt=\"\" />";
-
-    }
-    $hcolumns[$column] = "<a href=\"index.php?sort=$column&amp;dir=$columndir&amp;page=$page&amp;perpage=$perpage\">".$strcolumn."</a>$columnicon";
-}
-
-$baseurl = new moodle_url('index.php', array('sort' => $sort, 'dir' => $dir, 'perpage' => $perpage));
-echo $OUTPUT->paging_bar($changescount, $page, $perpage, $baseurl);
-
-$override = new stdClass();
-$override->firstname = 'firstname';
-$override->lastname = 'lastname';
-$fullnamelanguage = get_string('fullnamedisplay', '', $override);
-if (($CFG->fullnamedisplay == 'firstname lastname') or
-    ($CFG->fullnamedisplay == 'firstname') or
-    ($CFG->fullnamedisplay == 'language' and $fullnamelanguage == 'firstname lastname' )) {
-    $fullnamedisplay = $hcolumns['firstname'].' / '.$hcolumns['lastname'];
-} else { // ($CFG->fullnamedisplay == 'language' and $fullnamelanguage == 'lastname firstname')
-    $fullnamedisplay = $hcolumns['lastname'].' / '.$hcolumns['firstname'];
-}
-
-$table = new html_table();
-$table->head  = array($hcolumns['timemodified'], $fullnamedisplay, $hcolumns['plugin'], $hcolumns['name'], $hcolumns['value'], $hcolumns['oldvalue']);
-$table->align = array('left',                    'left',           'left',              'left',            'left',             'left');
-$table->size  = array('30%',                     '10%',            '10%',               '10%',             '20%',              '20%');
-$table->width = '95%';
-$table->data  = array();
-
-if ($sort == 'firstname' or $sort == 'lastname') {
-    $orderby = "u.$sort $dir";
-} else {
-    $orderby = "cl.$sort $dir";
-}
-
-$ufields = user_picture::fields('u');
-$sql = "SELECT $ufields,
-               cl.timemodified, cl.plugin, cl.name, cl.value, cl.oldvalue
-          FROM {config_log} cl
-          JOIN {user} u ON u.id = cl.userid
-      ORDER BY $orderby";
-
-$rs = $DB->get_recordset_sql($sql, array(), $page*$perpage, $perpage);
-foreach ($rs as $log) {
-    $row = array();
-    $row[] = userdate($log->timemodified);
-    $row[] = fullname($log);
-    if (is_null($log->plugin)) {
-        $row[] = 'core';
-    } else {
-        $row[] = $log->plugin;
-    }
-    $row[] = $log->name;
-    $row[] = s($log->value);
-    $row[] = s($log->oldvalue);
-
-    $table->data[] = $row;
-}
-$rs->close();
-
-echo html_writer::table($table);
-
-echo $OUTPUT->footer();