OKAY! THIS IS IT! MOODLE 1.6!

links to blogs stay in the same context.

COPYING.txt

@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  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
-this service 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 make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  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.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-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
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the 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 a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE 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.
-
-		     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
-convey 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 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.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision 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, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This 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.

README.txt

@@ -1,4 +1,4 @@
-README      $Id$
+README     $Id$
 ------
 
 QUICK INSTALL

admin/admin.html

@@ -0,0 +1,103 @@
+
+<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";
+              } else {
+                  if ($usercount > MAX_USERS_PER_PAGE) {
+                      echo '<optgroup label="'.get_string('toomanytoshow').'"><option></option></optgroup>'."\n"
+                          .'<optgroup label="'.get_string('trysearching').'"><option></option></optgroup>'."\n";
+                  } else {
+                      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 p($searchtext, true) ?>" 
+                  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,125 @@
+<?PHP // $Id$
+      // Admin-only script to assign administrative rights to users
+
+    require_once('../config.php');
+    
+    define("MAX_USERS_PER_PAGE", 50);
+
+    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 (isset($frm->previoussearch) and $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)) {
+
+        $usercount =  get_users(false, '', true, $adminlist, 'firstname ASC, lastname ASC', '', '',
+                                0, 99999, 'id, firstname, lastname, email');
+
+        $users = array();
+
+        if ($usercount <= MAX_USERS_PER_PAGE) {
+            if (!$users = get_users(true, '', true, $adminlist, 'firstname ASC, lastname ASC', '', '',
+                               0, 99999, 'id, firstname, lastname, email') ) {
+                $users = array();
+            }
+        }
+    }
+
+    $searchtext = (isset($frm->searchtext)) ? $frm->searchtext : "";
+    $previoussearch = ($previoussearch) ? '1' : '0';
+
+    include('./admin.html');
+
+    print_footer();
+
+?>

admin/auth.php

@@ -1,102 +1,335 @@
-<?php
+<?PHP  // $Id$
+       // config.php - allows admin to edit all configuration variables
 
-/**
- * Allows admin to edit all auth plugin settings.
- *
- * JH: copied and Hax0rd from admin/enrol.php and admin/filters.php
- *
- */
+    require_once('../config.php');
 
-require_once('../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->libdir.'/tablelib.php');
+    $auth = optional_param('auth', '', PARAM_SAFEDIR);
 
-require_login();
-require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
+    require_login();
 
-$returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageauths";
+    if (!$site = get_site()) {
+        redirect("index.php");
+    }
 
-$action = optional_param('action', '', PARAM_ACTION);
-$auth   = optional_param('auth', '', PARAM_SAFEDIR);
+    if (!isadmin()) {
+        error("Only the admin can use this page");
+    }
 
-// get currently installed and enabled auth plugins
-$authsavailable = get_list_of_plugins('auth');
+    if (!confirm_sesskey()) {
+        error(get_string('confirmsesskeybad', 'error'));
+    }
 
-get_enabled_auth_plugins(true); // fix the list of enabled auths
-if (empty($CFG->auth)) {
-    $authsenabled = array();
-} else {
-    $authsenabled = explode(',', $CFG->auth);
+    $focus = '';
+
+/// If data submitted, then process and store.
+
+    if ($config = data_submitted()) {
+
+        $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) {
+            foreach ($config as $name => $value) {
+                if (preg_match('/^pluginconfig_(.+?)$/', $name, $matches)) {
+                    $plugin = "auth/$auth";
+                    $name   = $matches[1];
+                    if (! set_config($name, $value, $plugin)) {                        
+                        notify("Problem saving config $name as $value for plugin $plugin");
+                    }
+                } else { // normal handling for 
+                    if (! set_config($name, $value)) {
+                        notify("Problem saving config $name as $value");
+                    }
+                }
+            }
+            redirect("auth.php?sesskey=$USER->sesskey", get_string("changessaved"), 1);
+            exit;
+
+        } else {
+            foreach ($err as $key => $value) {
+                $focus = "form.$key";
+            }
+        }
+    }
+
+/// Otherwise fill and print the form.
+
+    if (empty($config)) {
+        $config = $CFG;
+    }
+
+    $modules = get_list_of_plugins("auth");
+    $options = array();
+    foreach ($modules as $module) {
+        $options[$module] = get_string("auth_$module"."title", "auth");
+    }
+    asort($options);
+    if (!empty($auth) && in_array($auth, $modules)) {
+    } else {
+        $auth = $config->auth;
+    }
+
+    // changepassword link replaced by individual auth setting
+    if (!empty($config->changepassword)) {
+        if (empty($config->{'auth_'.$auth.'_changepasswordurl'})) {
+            $config->{'auth_'.$auth.'_changepasswordurl'} = $config->changepassword;
+        }
+        set_config('changepassword','');
+    }
+
+    $auth = clean_param($auth,PARAM_SAFEDIR);
+    require_once("$CFG->dirroot/auth/$auth/lib.php"); //just to make sure that current authentication functions are loaded
+    if (! isset($config->guestloginbutton)) {
+        $config->guestloginbutton = 1;
+    }
+    if (! isset($config->alternateloginurl)) {
+        $config->alternateloginurl = '';
+    }
+    if (! isset($config->auth_instructions)) {
+        $config->auth_instructions = "";
+    }
+    if (! isset($config->changepassword)) {
+        $config->changepassword = "";
+    }
+    if (! isset($config->{'auth_'.$auth.'_changepasswordurl'})) {
+        $config->{'auth_'.$auth.'_changepasswordurl'} = '';
+    }
+    if (! isset($config->{'auth_'.$auth.'_changepasswordhelp'})) {
+        $config->{'auth_'.$auth.'_changepasswordhelp'} = '';
+    }
+    $user_fields = array("firstname", "lastname", "email", "phone1", "phone2", "department", "address", "city", "country", "description", "idnumber", "lang");
+
+    $guestoptions[0] = get_string("hide");
+    $guestoptions[1] = get_string("show");
+
+    $createoptions[0] = get_string("no");
+    $createoptions[1] = get_string("yes");
+
+    $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");
+    $CFG->pagepath = 'auth/' . $auth;
+    
+    echo '<tr><td colspan="3">';
+    print_heading(get_string('auth_common_settings', 'auth'));
+    echo '<td/></tr>';
+
+    if ($auth != "email" and $auth != "none" and $auth != "manual") {
+        // display box for URL to change password. NB now on a per-method basis (multiple auth)
+        echo "<tr valign=\"top\">";
+        echo "<td align=\"right\" nowrap=\"nowrap\">";
+        print_string("changepassword", "auth");
+        echo ":</td>";
+        echo "<td>";
+        $passurl = $config->{'auth_'.$auth.'_changepasswordurl'};
+        echo "<input type=\"text\" name=\"auth_{$auth}_changepasswordurl\" size=\"40\" value=\"$passurl\" />";
+        echo "</td>";
+        echo "<td>";
+        print_string("auth_changepasswordurl_expl","auth",$auth);
+        echo "</td></tr>";
+
+        // display textbox for lost password help. NB now on a per-method basis (multiple auth)
+        echo "<tr valign=\"top\">";
+        echo "<td align=\"right\" nowrap=\"nowrap\">";
+        print_string("auth_changepasswordhelp", "auth");
+        echo ":</td>";
+        echo "<td>";
+        $passhelp = $config->{'auth_'.$auth.'_changepasswordhelp'};
+        echo "<textarea name=\"auth_{$auth}_changepasswordhelp\" cols=\"30\" rows=\"10\" wrap=\"virtual\">";
+        echo $passhelp;
+        echo "</textarea>\n";
+        echo "</td>";
+        echo "<td>";
+        print_string("auth_changepasswordhelp_expl","auth",$auth);
+        echo "</td></tr>";
+
+    }
+
+    echo "<tr valign=\"top\">";
+    echo "<td align=\"right\" nowrap=\"nowrap\">";
+    print_string("guestloginbutton", "auth");
+    echo ":</td>";
+    echo "<td>";
+    choose_from_menu($guestoptions, "guestloginbutton", $config->guestloginbutton, "");
+    echo "</td>";
+    echo "<td>";
+    print_string("showguestlogin","auth");
+    echo "</td></tr>";
+
+    if (function_exists('auth_user_create')){
+        echo "<tr valign=\"top\">";
+        echo "<td align=\"right\" nowrap=\"nowrap\">";
+        print_string("auth_user_create", "auth");
+        echo ":</td>";
+        echo "<td>";
+        choose_from_menu($createoptions, "auth_user_create", $config->auth_user_create, "");
+        echo "</td>";
+        echo "<td>";
+        print_string("auth_user_creation","auth");
+        echo "</td></tr>";
+    }
+
+
+/// An alternate url for the login form. It means we can use login forms that are integrated
+/// into non-moodle pages
+    echo '<tr valign="top">';
+    echo '<td algin="right" nowrap="nowrap">';
+    print_string('alternateloginurl', 'auth');
+    echo '</td>';
+    echo '<td>';
+    echo '<input type="text" size="40" name="alternateloginurl" alt="'.get_string('alternateloginurl', 'auth').'" value="'.$config->alternateloginurl.'" />';
+    echo '</td>';
+    echo '<td>';
+    print_string('alternatelogin', 'auth', htmlspecialchars($CFG->wwwroot.'/login/index.php'));
+    echo '</td>';
+    echo '</tr>';
+
+
+    echo '</table>';
+    echo '<p align="center"><input type="submit" value="'.get_string('savechanges').'"></p>';
+    echo '</form>';
+
+    print_simple_box_end();
+
+    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', $url, $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
+        if(empty($pluginconfig->{"field_map_$field"})) {
+            $pluginconfig->{"field_map_$field"} = '';
+        }
+        if(empty($pluginconfig->{"field_updatelocal_$field"})) {
+            $pluginconfig->{"field_updatelocal_$field"} = '';
+        }  
+        if (empty($pluginconfig->{"field_updateremote_$field"})) {
+            $pluginconfig->{"field_updateremote_$field"} = '';
+        }
+        if (empty($pluginconfig->{"field_lock_$field"})) {
+            $pluginconfig->{"field_lock_$field"} = '';
+        }
+
+        // define the fieldname we display to the  user
+        $fieldname = $field;
+        if ($fieldname === 'lang') {
+            $fieldname = get_string('language');
+        } elseif (preg_match('/^(.+?)(\d+)$/', $fieldname, $matches)) {
+            $fieldname =  get_string($matches[1]) . ' ' . $matches[2];
+        } else {
+            $fieldname = get_string($fieldname);
+        }
+
+        echo '<tr valign="top"><td align="right">';
+        echo $fieldname;
+        echo '</td><td>';
+
+        if ($retrieveopts) {
+            $varname = 'field_map_' . $field;
+
+            echo "<input name=\"pluginconfig_{$varname}\" type=\"text\" size=\"30\" value=\"{$pluginconfig->$varname}\">";
+            echo '<div align="right">';
+            echo  get_string('auth_updatelocal', 'auth') . '&nbsp;&nbsp;';
+            choose_from_menu($updatelocaloptions, "pluginconfig_field_updatelocal_{$field}", $pluginconfig->{"field_updatelocal_$field"}, "");
+            echo '<br />';
+            if ($updateopts) {
+                echo  get_string('auth_updateremote', 'auth') . '&nbsp;&nbsp;';
+                 '&nbsp;&nbsp;';
+                choose_from_menu($updateextoptions, "pluginconfig_field_updateremote_{$field}", $pluginconfig->{"field_updateremote_$field"}, "");
+                echo '<br />';
+
+
+            }
+            echo  get_string('auth_fieldlock', 'auth') . '&nbsp;&nbsp;';
+            choose_from_menu($lockoptions, "pluginconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, "");
+            echo '</div>';
+        } else {
+            choose_from_menu($lockoptions, "pluginconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, "");
+        }
+        echo '</td>';
+        if (!empty($helptext)) {
+            echo '<td rowspan="' . count($user_fields) . '">' . $helptext . '</td>';
+            $helptext = '';
+        }
+        echo '</tr>';
+    }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// 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', '');
-        }
-        break;
-
-    case 'enable':
-        // add to enabled list
-        if (!in_array($auth, $authsenabled)) {
-            $authsenabled[] = $auth;
-            $authsenabled = array_unique($authsenabled);
-            set_config('auth', implode(',', $authsenabled));
-        }
-        break;
-
-    case 'down':
-        $key = array_search($auth, $authsenabled);
-        // check auth plugin is valid
-        if ($key === false) {
-            print_error('pluginnotenabled', 'auth', $url, $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', $url, $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,181 +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);
-
-$CFG->pagepath = '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()) {
-    $frm = stripslashes_recursive($frm);
-
-    $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];
-                    if (!set_config($name, $value, $plugin)) {
-                        error("Problem saving config $name as $value for plugin $plugin");
-                    }
-                }
-            }
-            redirect($returnurl);
-            exit;
-        }
-    } else {
-        foreach ($err as $key => $value) {
-            $focus = "form.$key";
-        }
-    }
-} else {
-    $frm = get_config("auth/$auth");
-}
-
-$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
-admin_externalpage_print_header();
-
-// choose an authentication method
-echo "<form $CFG->frametarget id=\"authmenu\" method=\"post\" action=\"auth_config.php\">\n";
-echo "<div>\n";
-echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\" />\n";
-echo "<input type=\"hidden\" name=\"auth\" value=\"".$auth."\" />\n";
-
-// auth plugin description
-print_simple_box_start('center', '80%');
-print_heading($authtitle);
-print_simple_box_start('center', '80%', '', 5, 'informationbox');
-echo $authdescription;
-print_simple_box_end();
-echo "<hr />\n";
-$authplugin->config_form($frm, $err, $user_fields);
-print_simple_box_end();
-echo '<p style="text-align: center"><input type="submit" value="' . get_string("savechanges") . "\" /></p>\n";
-echo "</div>\n";
-echo "</form>\n";
-
-admin_externalpage_print_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) {
-
-    echo '<tr><td colspan="3">';
-    if ($retrieveopts) {
-        print_heading(get_string('auth_data_mapping', 'auth'));
-    } else {
-        print_heading(get_string('auth_fieldlocks', 'auth'));
-    }
-    echo '</td></tr>';
-
-    $lockoptions = array ('unlocked'        => get_string('unlocked', 'auth'),
-                          'unlockedifempty' => get_string('unlockedifempty', 'auth'),
-                          'locked'          => get_string('locked', 'auth'));
-    $updatelocaloptions = array('oncreate'  => get_string('update_oncreate', 'auth'),
-                                'onlogin'   => get_string('update_onlogin', 'auth'));
-    $updateextoptions = array('0'  => get_string('update_never', 'auth'),
-                              '1'   => get_string('update_onupdate', 'auth'));
-
-    $pluginconfig = get_config("auth/$auth");
-
-    // helptext is on a field with rowspan
-    if (empty($helptext)) {
-                $helptext = '&nbsp;';
-    }
-
-    foreach ($user_fields as $field) {
-
-        // Define some vars we'll work with
-        if (!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;';
-            choose_from_menu($updatelocaloptions, "lockconfig_field_updatelocal_{$field}", $pluginconfig->{"field_updatelocal_$field"}, "");
-            echo '<br />';
-            if ($updateopts) {
-                echo '<label for="menulockconfig_field_updateremote_'.$field.'">'.get_string('auth_updateremote', 'auth') . '</label>&nbsp;';
-                choose_from_menu($updateextoptions, "lockconfig_field_updateremote_{$field}", $pluginconfig->{"field_updateremote_$field"}, "");
-                echo '<br />';
-
-
-            }
-            echo '<label for="menulockconfig_field_lock_'.$field.'">'.get_string('auth_fieldlock', 'auth') . '</label>&nbsp;';
-            choose_from_menu($lockoptions, "lockconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, "");
-            echo '</div>';
-        } else {
-            echo '<tr valign="top"><td align="right">';
-            echo '<label for="menulockconfig_field_lock_'.$field.'">'.$fieldname.'</label>';
-            echo '</td><td>';
-            choose_from_menu($lockoptions, "lockconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, "");
-        }
-        echo '</td>';
-        if (!empty($helptext)) {
-            echo '<td rowspan="' . count($user_fields) . '">' . $helptext . '</td>';
-            $helptext = '';
-        }
-        echo '</tr>';
-    }
-}
-
-?>

admin/backup.php

@@ -0,0 +1,132 @@
+<?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
+
+        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

@@ -3,16 +3,22 @@
 // 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)) {
-        error('This block does not exist');
+    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) {
@@ -31,7 +37,7 @@
     if ($config = data_submitted()) {
 
         if (!confirm_sesskey()) {
-             print_error('confirmsesskeybad', 'error');
+             error(get_string('confirmsesskeybad', 'error'));
         }
         if(!$block->has_config()) {
             error('This block does not support global configuration');
@@ -47,14 +53,23 @@
 
     /// Otherwise print the form.
 
+    $stradmin = get_string('administration');
+    $strconfiguration = get_string('configuration');
     $strmanageblocks = get_string('manageblocks');
     $strblockname = $block->get_title();
-
-    admin_externalpage_print_header();
+    
+    // $CFG->pagepath is used to generate the body and id attributes for the body tag
+    // of the page. It is also used to generate the link to the Moodle Docs for this view.
+    $CFG->pagepath = 'block/' . $block->name() . '/config';
+    
+    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);
 
     print_heading($strblockname);
 
-    print_simple_box(get_string('configwarning', 'admin'), 'center', '50%');
+    print_simple_box('<center>'.get_string('configwarning', 'admin').'</center>', 'center', '50%');
     echo '<br />';
 
     echo '<form method="post" action="block.php">';

admin/blocks.php

@@ -3,12 +3,8 @@
     // Allows the admin to configure blocks (hide/show, delete and configure)
 
     require_once('../config.php');
-    require_once($CFG->libdir.'/adminlib.php');
     require_once($CFG->libdir.'/blocklib.php');
     require_once($CFG->libdir.'/tablelib.php');
-    require_once($CFG->libdir.'/ddllib.php');
-
-    admin_externalpage_setup('manageblocks');
 
     $confirm  = optional_param('confirm', 0, PARAM_BOOL);
     $hide     = optional_param('hide', 0, PARAM_INT);
@@ -16,8 +12,21 @@
     $delete   = optional_param('delete', 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');
@@ -27,7 +36,12 @@
     $strcourses = get_string('blockinstances', 'admin');
     $strname = get_string('name');
     $strmultiple = get_string('blockmultiple', 'admin');
-    $strshowblockcourse = get_string('showblockcourse');
+
+    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.
 
@@ -36,7 +50,6 @@
             error("Block doesn't exist!");
         }
         set_field('block', 'visible', '0', 'id', $block->id);      // Hide block
-        admin_get_root(true, false);  // settings not required - only pages
     }
 
     if (!empty($show) && confirm_sesskey() ) {
@@ -44,7 +57,6 @@
             error("Block doesn't exist!");
         }
         set_field('block', 'visible', '1', 'id', $block->id);      // Show block
-        admin_get_root(true, false);  // settings not required - only pages
     }
 
     if (!empty($multiple) && confirm_sesskey()) {
@@ -53,12 +65,9 @@
         }
         $block->multiple = !$block->multiple;
         update_record('block', $block);
-        admin_get_root(true, false);  // settings not required - only pages
     }
 
     if (!empty($delete) && confirm_sesskey()) {
-        admin_externalpage_print_header();
-        print_heading($strmanageblocks);
 
         if (!$block = blocks_get_record($delete)) {
             error("Block doesn't exist!");
@@ -76,38 +85,34 @@
             notice_yesno(get_string('blockdeleteconfirm', '', $strblockname),
                          'blocks.php?delete='.$block->id.'&amp;confirm=1&amp;sesskey='.$USER->sesskey,
                          'blocks.php');
-            admin_externalpage_print_footer();
+            print_footer();
             exit;
 
         } else {
-            // Inform block it's about to be deleted
-            $blockobject = block_instance($block->name);
-            if ($blockobject) {
-                $blockobject->before_delete();  //only if we can create instance, block might have been already removed
-            }
-
-            // First delete instances and then block
-            $instances = get_records('block_instance', 'blockid', $block->id);
-            if(!empty($instances)) {
-                foreach($instances as $instance) {
-                    blocks_delete_instance($instance);
-                    blocks_delete_instance($instance, true);
-                }
-            }
-
             // Delete block
             if (!delete_records('block', 'id', $block->id)) {
                 notify("Error occurred while deleting the $strblockname record from blocks table");
             }
 
-            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);
+            $instances = get_records('block_instance', 'blockid', $block->id);
+            if(!empty($instances)) {
+                foreach($instances as $instance) {
+                    blocks_delete_instance($instance);
+                }
+            }
 
-            // Delete the capabilities that were defined by this block
-            capabilities_cleanup('block/'.$block->name);
+            // Then the tables themselves
 
-            // remove entent 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;
@@ -115,9 +120,6 @@
         }
     }
 
-    admin_externalpage_print_header();
-    print_heading($strmanageblocks);
-
 /// Main display starts here
 
 /// Get and sort the existing blocks
@@ -130,7 +132,7 @@
 
     foreach ($blocks as $block) {
         if(!block_is_compatible($block->name)) {
-            notify('Block '. $block->name .' is not compatible with the current version of Moodle and needs to be updated by a programmer.');
+            notify('Block '. $block->name .' is not compatible with the current version of Mooodle and needs to be updated by a programmer.');
             $incompatible[] = $block;
             continue;
         }
@@ -154,52 +156,34 @@
 
     $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'multiple', 'delete', 'settings'));
     $table->define_headers(array($strname, $strcourses, $strversion, $strhide.'/'.$strshow, $strmultiple, $strdelete, $strsettings));
-    $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
+    $table->define_baseurl($CFG->wwwroot.'/admin/blocks.php');
+
+    $table->set_attribute('cellspacing', '0');
     $table->set_attribute('id', 'blocks');
-    $table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
+    $table->set_attribute('class', 'generaltable generalbox');
+
     $table->setup();
 
     foreach ($blockbyname as $blockname => $blockid) {
 
         $blockobject = $blockobjects[$blockid];
-        $block       = $blocks[$blockid];
 
         $delete = '<a href="blocks.php?delete='.$blockid.'&amp;sesskey='.$USER->sesskey.'">'.$strdelete.'</a>';
 
         $settings = ''; // By default, no configuration
-        if ($blockobject->has_config()) {
-            if (file_exists($CFG->dirroot.'/blocks/'.$block->name.'/settings.php')) {
-                $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 = count_records('block_instance', 'blockid', $blockid);
-
-        $count = count_records_sql('SELECT COUNT(*)
-                                        FROM '.$CFG->prefix.'block_instance
-                                        WHERE blockid = '.$blockid.' AND
-                                        pagetype = \'course-view\'');
-
-        if ($count>0) {
-            $blocklist = "<a href=\"{$CFG->wwwroot}/course/search.php?blocklist=$blockid&amp;sesskey={$USER->sesskey}\" ";
-            $blocklist .= "title=\"$strshowblockcourse\" >$totalcount</a>";
-        }
-        else {
-            $blocklist = "$totalcount";
-        }
+        $count = count_records('block_instance', 'blockid', $blockid);
         $class = ''; // Nothing fancy, by default
 
         if ($blocks[$blockid]->visible) {
             $visible = '<a href="blocks.php?hide='.$blockid.'&amp;sesskey='.$USER->sesskey.'" title="'.$strhide.'">'.
-                       '<img src="'.$CFG->pixpath.'/i/hide.gif" class="icon" alt="'.$strhide.'" /></a>';
+                       '<img src="'.$CFG->pixpath.'/i/hide.gif" height="16" width="16" alt="" /></a>';
         } else {
             $visible = '<a href="blocks.php?show='.$blockid.'&amp;sesskey='.$USER->sesskey.'" title="'.$strshow.'">'.
-                       '<img src="'.$CFG->pixpath.'/i/show.gif" class="icon" alt="'.$strshow.'" /></a>';
+                       '<img src="'.$CFG->pixpath.'/i/show.gif" height="16" width="16" alt="" /></a>';
             $class = ' class="dimmed_text"'; // Leading space required!
         }
         if ($blockobject->instance_allow_multiple()) {
@@ -216,8 +200,8 @@
 
         $table->add_data(array(
             '<span'.$class.'>'.$blockobject->get_title().'</span>',
-            $blocklist,
-            '<span'.$class.'>'.$blockobject->get_version().'</span>',
+            $count,
+            $blockobject->get_version(),
             $visible,
             $multiple,
             $delete,
@@ -231,14 +215,15 @@
         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->define_baseurl($CFG->wwwroot.'/admin/blocks.php');
+    
+        $table->set_attribute('cellspacing', '0');
         $table->set_attribute('id', 'incompatible');
-        $table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
-
+        $table->set_attribute('class', 'generaltable generalbox');
+    
         $table->setup();
 
         foreach ($incompatible as $block) {
@@ -250,6 +235,6 @@
         $table->print_html();
     }
 
-    admin_externalpage_print_footer();
+    print_footer();
 
 ?>

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,98 @@
+<?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->timezone = clean_param($form->timezone, PARAM_PATH); //not a path, but it looks like it anyway
+            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/config.php

@@ -0,0 +1,187 @@
+<?php  // $Id$
+       // config.php - allows admin to edit all configuration variables
+
+    require_once('../config.php');
+
+    $focus = '';
+
+    if ($site = get_site()) {   // If false then this is a new installation
+        require_login();
+        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) {
+            foreach ($config as $name => $value) {
+                if ($name == "sessioncookie") {
+                    $value = eregi_replace("[^a-zA-Z0-9_]", "", $value);
+                }
+                if ($name == "defaultallowedmodules") {
+                    $value = implode(',',$value);
+                }
+                if ($name == 'hiddenuserfields') {
+                    if (in_array('none', $value)) {
+                        $value = '';
+                    } else {
+                        $value = implode(',',$value);
+                    }
+                }
+                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;
+        }
+    }
+
+    $sesskey = !empty($USER->id) ? $USER->sesskey : '';
+
+
+    $stradmin = get_string('administration');
+    $strconfiguration = get_string('configuration');
+    $strconfigvariables = get_string('configvariables', 'admin');
+
+    if ($site) {
+        print_header("$site->shortname: $strconfigvariables", $site->fullname,
+                      "<a href=\"index.php\">$stradmin</a> -> ".
+                      "<a href=\"configure.php\">$strconfiguration</a> -> $strconfigvariables", $focus);
+        print_heading($strconfigvariables);
+    } else {
+        print_header();
+        print_heading($strconfigvariables);
+        print_simple_box(get_string('configintro', 'admin'), 'center', "50%");
+        echo '<br />';
+    }
+
+
+
+/// Get all the configuration fields and helptext
+    require('configvars.php');
+
+/// Cycle through the sections to get the sectionnames
+    $linktext = '';
+    foreach($configvars as $sectionname=>$section) {
+        if ($linktext !== '') {
+            $linktext .= ' | ';
+        }
+        $linktext .= '<a href="#configsection'.$sectionname.'">'.get_string('configsection'.$sectionname, 'admin').'</a>';
+    }
+        
+    echo "<center>$linktext</center>\n";
+
+    
+    echo '<form method="post" action="config.php" name="form">';
+    echo '<center><input type="submit" value="'.get_string('savechanges').'" /></center>';
+
+/// Cycle through each section of the configuration
+    foreach ($configvars as $sectionname=>$section) {
+
+        print_heading('<a name="configsection'.$sectionname.'"></a>'.get_string('configsection'.$sectionname, 'admin'));
+
+        $table = NULL;
+        $table->data = array();
+        foreach ($section as $configvariable=>$configobject) {
+            $table->data[] = array ( $configvariable.': ',
+                                     $configobject->field
+                                   );
+            if ($configobject->display_warning()) {
+                $table->data[] = array ( '&nbsp;',
+                                         '<span class="configwarning">'.$configobject->warning.'</span>'
+                                       );
+            }
+            $table->data[] = array ( '&nbsp;',
+                                     '<span class="confighelp">'.$configobject->help.'</span>'
+                                   );
+            $table->align = array ('right', 'left');
+        }
+        print_table($table);
+
+    }
+    echo '<center>';
+    echo '<input type="hidden" name="sesskey" value="'.$sesskey.'" />';
+    echo '<input type="submit" value="'.get_string('savechanges').'" />';
+    echo '</center>';
+                
+    echo '</form>';
+    
+
+
+    
+
+    /// Lock some options
+
+    $httpsurl = str_replace('http://', 'https://', $CFG->wwwroot);
+    if ($httpsurl != $CFG->wwwroot) {
+        if (ini_get('allow_url_fopen')) {
+            if ((($fh = @fopen($httpsurl, 'r')) == false) and ($config->loginhttps == 0)) {
+                echo '<script type="text/javascript">'."\n";
+                echo '<!--'."\n";
+                echo "eval('document.form.loginhttps.disabled=true');\n";
+                echo '-->'."\n";
+                echo '</script>'."\n";
+            }
+        }
+    }
+
+
+    if ($site) {
+        print_footer();
+    }
+
+    exit;
+
+/// Functions /////////////////////////////////////////////////////////////////
+
+function validate_form(&$form, &$err) {
+
+    // Currently no checks are needed ...
+
+    return true;
+}
+
+?>

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

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 p($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,113 @@
+<?PHP // $Id$
+      // Admin only script to assign course creator rights to users
+
+    require_once('../config.php');
+
+    define("MAX_USERS_PER_PAGE", 50);
+
+    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%");
+        $frm = new object();
+
+/// 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 (isset($frm->previoussearch) && $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,4 +1,4 @@
-<?php // $Id$
+<?PHP // $Id$
 
 /// This script looks through all the module directories for cron.php files
 /// and runs them.  These files can contain cleanup functions, email functions
@@ -10,18 +10,14 @@
 ///
 /// eg   wget -q -O /dev/null 'http://moodle.somewhere.edu/admin/cron.php'
 /// or   php /web/moodle/admin/cron.php 
-    set_time_limit(0);
+
     $starttime = microtime();
 
 /// The following is a hack necessary to allow this script to work well 
 /// from the command line.
 
     define('FULLME', 'cron');
-
-
-/// Do not set moodle cookie because we do not need it here, it is better to emulate session
-    $nomoodlecookie = true;
-
+    
 /// 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()
@@ -31,77 +27,32 @@
     }
 
     require_once(dirname(__FILE__) . '/../config.php');
-    require_once($CFG->libdir.'/adminlib.php');
-    require_once($CFG->libdir.'/gradelib.php');
+    require_once($CFG->dirroot.'/lib/adminlib.php');
 
-/// Extra debugging (set in config.php)
-    if (!empty($CFG->showcronsql)) {
-        $db->debug = true;
-    }
-    if (!empty($CFG->showcrondebugging)) {
-        $CFG->debug = DEBUG_DEVELOPER;
-        $CFG->debugdisplay = true;
+    if (!$alreadyadmin = isadmin()) {
+        unset($_SESSION['USER']);
+        unset($USER);
+        unset($_SESSION['SESSION']);
+        unset($SESSION);
+        $USER = get_admin();      /// Temporarily, to provide environment for this script
+        // we need to override the admin timezone to the moodle timezone!
+        $USER->timezone = $CFG->timezone;
     }
 
-/// extra safety
-    @session_write_close();
-
-/// check if execution allowed
-    if (isset($_SERVER['REMOTE_ADDR'])) { // if the script is accessed via the web.
-        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;
-            }
-        }
-    }
-
-
-/// emulate normal session
-    $SESSION = new object();
-    $USER = get_admin();      /// Temporarily, to provide environment for this script
-
-/// ignore admins timezone, language and locale - use site deafult instead!
-    $USER->timezone = $CFG->timezone;
-    $USER->lang = '';
-    $USER->theme = '';
-    course_setup(SITEID);
-
-/// 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');
-    }
-
-/// no more headers and buffers
-    while(@ob_end_flush());
-
-/// increase memory limit (PHP 5.2 does different calculation, we need more memory now)
-    @raise_memory_limit('128M');
+    //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");
-    get_mailer('buffer');
-    if ($mods = get_records_select("modules", "cron > 0 AND (($timenow - lastcron) > cron) AND visible = 1 ")) {
+    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)) {
@@ -109,32 +60,20 @@
                 $cron_function = $mod->name."_cron";
                 if (function_exists($cron_function)) {
                     mtrace("Processing module function $cron_function ...", '');
-                    $pre_dbqueries = null;
-                    if (!empty($PERF->dbqueries)) {
-                        $pre_dbqueries = $PERF->dbqueries;
-                        $pre_time      = microtime(1);
-                    }
                     if ($cron_function()) {
                         if (! set_field("modules", "lastcron", $timenow, "id", $mod->id)) {
                             mtrace("Error: could not update timestamp for $mod->fullname");
                         }
                     }
-                    if (isset($pre_dbqueries)) {
-                        mtrace("... used " . ($PERF->dbqueries - $pre_dbqueries) . " dbqueries");
-                        mtrace("... used " . (microtime(1) - $pre_time) . " seconds");
-                    }
-                /// Reset possible changes by modules to time_limit. MDL-11597
-                    @set_time_limit(0);
                     mtrace("done.");
                 }
             }
         }
     }
-    get_mailer('close');
     mtrace("Finished activity modules");
 
     mtrace("Starting blocks");
-    if ($blocks = get_records_select("block", "cron > 0 AND (($timenow - lastcron) > cron) AND visible = 1")) {
+    if ($blocks = get_records_select("block", "cron > 0 AND (($timenow - lastcron) > cron)")) {
         // we will need the base class.
         require_once($CFG->dirroot.'/blocks/moodleblock.class.php');
         foreach ($blocks as $block) {
@@ -150,79 +89,19 @@
                             mtrace('Error: could not update timestamp for '.$block->name);
                         }
                     }
-                /// Reset possible changes by blocks to time_limit. MDL-11597
-                    @set_time_limit(0);
                     mtrace('done.');
                 }
             }
 
         }
     }
-    mtrace('Finished blocks');
-
-    mtrace('Starting admin reports');
-    // Admin reports do not have a database table that lists them. Instead a
-    // report includes cron.php with function report_reportname_cron() if it wishes
-    // to be cronned. It is up to cron.php to handle e.g. if it only needs to
-    // actually do anything occasionally.
-    $reports = get_list_of_plugins($CFG->admin.'/report');
-    foreach($reports as $report) {
-        $cronfile = $CFG->dirroot.'/'.$CFG->admin.'/report/'.$report.'/cron.php';
-        if (file_exists($cronfile)) {
-            require_once($cronfile);
-            $cronfunction = 'report_'.$report.'_cron';
-            mtrace('Processing cron function for '.$report.'...', '');
-            $pre_dbqueries = null;
-            if (!empty($PERF->dbqueries)) {
-                $pre_dbqueries = $PERF->dbqueries;
-                $pre_time      = microtime(true);
-            }
-            $cronfunction();
-            if (isset($pre_dbqueries)) {
-                mtrace("... used " . ($PERF->dbqueries - $pre_dbqueries) . " dbqueries");
-                mtrace("... used " . round(microtime(true) - $pre_time, 2) . " seconds");
-            }
-            mtrace('done.');
-        }
-    }
-    mtrace('Finished admin reports');
+    mtrace("Finished blocks");
 
     if (!empty($CFG->langcache)) {
         mtrace('Updating languages cache');
-        get_list_of_languages(true);
+        get_list_of_languages();
     }
 
-    mtrace('Removing expired enrolments ...', '');     // See MDL-8785
-    $timenow = time();
-    $somefound = false;
-    // The preferred way saves memory, dmllib.php
-    // find courses where limited enrolment is enabled
-    global $CFG;
-    $rs_enrol = get_recordset_sql("SELECT ra.roleid, ra.userid, ra.contextid
-        FROM {$CFG->prefix}course c
-        INNER JOIN {$CFG->prefix}context cx ON cx.instanceid = c.id
-        INNER JOIN {$CFG->prefix}role_assignments ra ON ra.contextid = cx.id
-        WHERE cx.contextlevel = '".CONTEXT_COURSE."'
-        AND ra.timeend > 0
-        AND ra.timeend < '$timenow'
-        AND c.enrolperiod > 0
-        ");
-    while ($oldenrolment = rs_fetch_next_record($rs_enrol)) {
-        role_unassign($oldenrolment->roleid, $oldenrolment->userid, 0, $oldenrolment->contextid);
-        $somefound = true;
-    }
-    rs_close($rs_enrol);
-    if($somefound) {
-        mtrace('Done');
-    } else {
-        mtrace('none found');
-    }
-
-
-    mtrace('Starting main gradebook job ...');
-    grade_cron();
-    mtrace('done.');
-
 
 /// 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 
@@ -237,107 +116,67 @@
         /// Unenrol users who haven't logged in for $CFG->longtimenosee
 
         if ($CFG->longtimenosee) { // value in days
-            $cuttime = $timenow - ($CFG->longtimenosee * 3600 * 24);
-            $rs = get_recordset_sql ("SELECT id, userid, courseid
-                                        FROM {$CFG->prefix}user_lastaccess
-                                       WHERE courseid != ".SITEID."
-                                         AND timeaccess < $cuttime ");
-            while ($assign = rs_fetch_next_record($rs)) {
-                if ($context = get_context_instance(CONTEXT_COURSE, $assign->courseid)) {
-                    if (role_unassign(0, $assign->userid, 0, $context->id)) {
-                        mtrace("removing user $assign->userid from course $assign->courseid as they have not accessed the course for over $CFG->longtimenosee 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");
                     }
                 }
             }
-            rs_close($rs);
-        /// Execute the same query again, looking for remaining records and deleting them
-        /// if the user hasn't moodle/course:view in the CONTEXT_COURSE context (orphan records)
-            $rs = get_recordset_sql ("SELECT id, userid, courseid
-                                        FROM {$CFG->prefix}user_lastaccess
-                                       WHERE courseid != ".SITEID."
-                                         AND timeaccess < $cuttime ");
-            while ($assign = rs_fetch_next_record($rs)) {
-                if ($context = get_context_instance(CONTEXT_COURSE, $assign->courseid)) {
-                    if (!has_capability('moodle/course:view', $context, $assign->userid)) {
-                        delete_records('user_lastaccess', 'userid', $assign->userid, 'courseid', $assign->courseid);
-                        mtrace("Deleted orphan user_lastaccess for user $assign->userid from course $assign->courseid");
-                    }
-                }
-            }
-            rs_close($rs);
         }
-        flush();
-
-
+    
+    
         /// Delete users who haven't confirmed within required period
 
-        if (!empty($CFG->deleteunconfirmed)) {
-            $cuttime = $timenow - ($CFG->deleteunconfirmed * 3600);
-            $rs = get_recordset_sql ("SELECT id, firstname, lastname
-                                        FROM {$CFG->prefix}user
-                                       WHERE confirmed = 0
-                                         AND firstaccess > 0
-                                         AND firstaccess < $cuttime");
-            while ($user = rs_fetch_next_record($rs)) {
+        $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)");
                 }
             }
-            rs_close($rs);
         }
         flush();
 
 
+
         /// Delete users who haven't completed profile within required period
 
-        if (!empty($CFG->deleteincompleteusers)) {
-            $cuttime = $timenow - ($CFG->deleteincompleteusers * 3600);
-            $rs = get_recordset_sql ("SELECT id, username
-                                        FROM {$CFG->prefix}user
-                                       WHERE confirmed = 1
-                                         AND lastaccess > 0
-                                         AND lastaccess < $cuttime
-                                         AND deleted = 0
-                                         AND (lastname = '' OR firstname = '' OR email = '')");
-            while ($user = rs_fetch_next_record($rs)) {
-                if (delete_user($user)) {
+        $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
+        if ($users = get_users_not_fully_set_up($oneweek)) {
+            foreach ($users as $user) {
+                if (delete_records('user', 'id', $user->id)) {
                     mtrace("Deleted not fully setup user $user->username ($user->id)");
                 }
             }
-            rs_close($rs);
         }
         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);
-            if (delete_records_select("log", "time < '$loglifetime'")) {
-                mtrace("Deleted old log records");
-            }
+            delete_records_select("log", "time < '$loglifetime'");
         }
         flush();
 
-
         /// Delete old cached texts
 
         if (!empty($CFG->cachetext)) {   // Defined in config.php
             $cachelifetime = time() - $CFG->cachetext - 60;  // Add an extra minute to allow for really heavy sites
-            if (delete_records_select('cache_text', "timemodified < '$cachelifetime'")) {
-                mtrace("Deleted old cache_text records");
-            }
+            delete_records_select('cache_text', "timemodified < '$cachelifetime'");
         }
         flush();
 
         if (!empty($CFG->notifyloginfailures)) {
             notify_login_failures();
-            mtrace('Notified login failured');
         }
         flush();
 
         sync_metacourses();
-        mtrace('Synchronised metacourses');
 
         //
         // generate new password emails for users 
@@ -350,7 +189,7 @@
                                                 p.id as prefid 
                                         FROM {$CFG->prefix}user u 
                                              JOIN {$CFG->prefix}user_preferences p ON u.id=p.userid
-                                        WHERE p.name='create_password' AND p.value='1' AND u.email !='' ");
+                                        WHERE p.name='create_password' AND p.value=1 AND u.email !='' ");
 
             foreach ($newusers as $newuserid => $newuser) {
                 $newuser->emailstop = 0; // send email regardless
@@ -363,33 +202,15 @@
                 }
             }
         }
-        
-        if (!empty($CFG->usetags)) {
-            require_once($CFG->dirroot.'/tag/lib.php');
-            tag_cron();
-            mtrace ('Executed tag cron');
-        }
-        
-        // Accesslib stuff
-        cleanup_contexts();
-        mtrace ('Cleaned up contexts');
-        gc_cache_flags();
-        mtrace ('Cleaned cache flags');
-        // If you suspect that the context paths are somehow corrupt
-        // replace the line below with: build_context_path(true); 
-        build_context_path();
-        mtrace ('Built context paths');
-
-        mtrace("Finished clean-up tasks...");
 
     } // End of occasional clean-up tasks
 
 
-    if (empty($CFG->disablescheduledbackups)) {   // Defined in config.php
+    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("192M");
+        @raise_memory_limit("128M");
         if (function_exists('apache_child_terminate')) {
             // if we are running from Apache, give httpd a hint that 
             // it can recycle the process after it's done. Apache's 
@@ -425,23 +246,6 @@
         }
     }
 
-/// Run the auth cron, if any
-/// before enrolments because it might add users that will be needed in enrol plugins
-    $auths = get_enabled_auth_plugins();
-
-    mtrace("Running auth crons if required...");
-    foreach ($auths as $auth) {
-        $authplugin = get_auth_plugin($auth);
-        if (method_exists($authplugin, 'cron')) {
-            mtrace("Running cron for auth/$auth...");
-            $authplugin->cron();
-            if (!empty($authplugin->log)) {
-                mtrace($authplugin->log);
-            }
-        }
-        unset($authplugin);
-    }
-
 /// Run the enrolment cron, if any
     if (!($plugins = explode(',', $CFG->enrol_plugins_enabled))) {
         $plugins = array($CFG->enrol);
@@ -458,76 +262,51 @@
         unset($enrol);
     }
 
-    if (!empty($CFG->enablestats) and empty($CFG->disablestatsprocessing)) {
-        require_once($CFG->dirroot.'/lib/statslib.php');
+    if (!empty($CFG->enablestats)) {
+
         // check we're not before our runtime
-        $timetocheck = stats_get_base_daily() + $CFG->statsruntimestarthour*60*60 + $CFG->statsruntimestartminute*60;
+        $timetocheck = strtotime("$CFG->statsruntimestarthour:$CFG->statsruntimestartminute today");
 
         if (time() > $timetocheck) {
-            // process configured number of days as max (defaulting to 31)
-            $maxdays = empty($CFG->statsruntimedays) ? 31 : abs($CFG->statsruntimedays);
-            if (stats_cron_daily($maxdays)) {
-                if (stats_cron_weekly()) {
-                    if (stats_cron_monthly()) {
-                        stats_clean_old();
-                    }
+            $time = 60*60*20; // set it to 20 here for first run... (overridden by $CFG)
+            $clobber = true;
+            if (!empty($CFG->statsmaxruntime)) {
+                $time = $CFG->statsmaxruntime+(60*30); // add on half an hour just to make sure (it could take that long to break out of the loop)
+            }
+            if (!get_field_sql('SELECT id FROM '.$CFG->prefix.'stats_daily LIMIT 1')) {
+                // first run, set another lock. we'll check for this in subsequent runs to set the timeout to later for the normal lock.
+                set_cron_lock('statsfirstrunlock',true,$time,true);
+                $firsttime = true;
+            }
+            $time = 60*60*2; // this time set to 2.. (overridden by $CFG)
+            if (!empty($CFG->statsmaxruntime)) {
+                $time = $CFG->statsmaxruntime+(60*30); // add on half an hour to make sure (it could take that long to break out of the loop)
+            }
+            if ($config = get_record('config','name','statsfirstrunlock')) {
+                if (!empty($config->value)) {
+                    $clobber = false; // if we're on the first run, just don't clobber it.
                 }
             }
-            @set_time_limit(0);
-        } else {
-            mtrace('Next stats run after:'. userdate($timetocheck));
-        }
-    }
-
-    // run gradebook import/export/report cron
-    if ($gradeimports = get_list_of_plugins('grade/import')) {
-        foreach ($gradeimports as $gradeimport) {           
-            if (file_exists($CFG->dirroot.'/grade/import/'.$gradeimport.'/lib.php')) {
-                require_once($CFG->dirroot.'/grade/import/'.$gradeimport.'/lib.php');
-                $cron_function = 'grade_import_'.$gradeimport.'_cron';                                    
-                if (function_exists($cron_function)) {
-                    mtrace("Processing gradebook import function $cron_function ...", '');
-                    $cron_function;  
+            if (set_cron_lock('statsrunning',true,$time, $clobber)) {
+                require_once($CFG->dirroot.'/lib/statslib.php');
+                $return = stats_cron_daily();
+                if (stats_check_runtime() && $return == STATS_RUN_COMPLETE) {
+                    stats_cron_weekly();
                 }
-            }
-        }      
-    }
-
-    if ($gradeexports = get_list_of_plugins('grade/export')) {
-        foreach ($gradeexports as $gradeexport) {           
-            if (file_exists($CFG->dirroot.'/grade/export/'.$gradeexport.'/lib.php')) {
-                require_once($CFG->dirroot.'/grade/export/'.$gradeexport.'/lib.php');
-                $cron_function = 'grade_export_'.$gradeexport.'_cron';                                    
-                if (function_exists($cron_function)) {
-                    mtrace("Processing gradebook export function $cron_function ...", '');
-                    $cron_function;  
+                if (stats_check_runtime() && $return == STATS_RUN_COMPLETE) {
+                    $return = $return && stats_cron_monthly();
+                }
+                if (stats_check_runtime() && $return == STATS_RUN_COMPLETE) {
+                    stats_clean_old();
+                }
+                set_cron_lock('statsrunning',false);
+                if (!empty($firsttime)) {
+                    set_cron_lock('statsfirstrunlock',false);
                 }
             }
         }
     }
 
-    if ($gradereports = get_list_of_plugins('grade/report')) {
-        foreach ($gradereports as $gradereport) {           
-            if (file_exists($CFG->dirroot.'/grade/report/'.$gradereport.'/lib.php')) {
-                require_once($CFG->dirroot.'/grade/report/'.$gradereport.'/lib.php');
-                $cron_function = 'grade_report_'.$gradereport.'_cron';                                    
-                if (function_exists($cron_function)) {
-                    mtrace("Processing gradebook report function $cron_function ...", '');
-                    $cron_function;  
-                }
-            }
-        }
-    }
-    
-    // run any customized cronjobs, if any
-    // looking for functions in lib/local/cron.php
-    if (file_exists($CFG->dirroot.'/local/cron.php')) {
-        mtrace('Processing customized cron script ...', '');
-        include_once($CFG->dirroot.'/local/cron.php');
-        mtrace('done.');
-    }
-
-
     //Unset session variables and destroy it
     @session_unset();
     @session_destroy();
@@ -537,9 +316,4 @@
     $difftime = microtime_diff($starttime, microtime());
     mtrace("Execution took ".$difftime." seconds"); 
 
-/// finish the IE hack
-    if (check_browser_version('MSIE')) {
-        echo "</xmp>";
-    }
-
 ?>

admin/dbperformance.php

@@ -3,26 +3,23 @@
 
     require_once('../config.php');
 
-    // disable moodle specific debug messages that would be breaking the frames
-    disable_debugging();
-
     $topframe    = optional_param('topframe', 0, PARAM_BOOL);
     $bottomframe = optional_param('bottomframe', 0, PARAM_BOOL);
     $do          = optional_param('do', '', PARAM_ALPHA);
 
     require_login();
 
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
+    if (!isadmin()) {
+        error("Only the admin can use this page");
+    }
 
     $strdatabaseperformance = get_string("databaseperformance");
     $stradministration = get_string("administration");
     $site = get_site();
 
-    $navigation = build_navigation(array(
-        array('name'=>$stradministration, 'link'=>'index.php', 'type'=>'misc'),
-        array('name'=>$strdatabaseperformance, 'link'=>null, 'type'=>'misc')));
     if (!empty($topframe)) {
-        print_header("$site->shortname: $strdatabaseperformance", "$site->fullname", $navigation);
+        print_header("$site->shortname: $strdatabaseperformance", "$site->fullname", 
+                     "<a target=\"$CFG->framename\" href=\"index.php\">$stradministration</a> -> Database performance");
         exit;
     }
 

admin/delete.php

@@ -4,35 +4,25 @@
 // 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);
 
-    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!
 
-    admin_externalpage_print_header();
-    print_heading('Purge moodledata');
-
     if (empty($sure)) {
-        $optionsyes = array('sure'=>'yes', 'sesskey'=>sesskey());
-        notice_yesno ('Are you completely sure you want to delete everything inside the directory '. $deletedir .' ?',
-            'delete.php', 'index.php', $optionsyes, NULL, 'post', 'get');
-        admin_externalpage_print_footer();
+        notice_yesno ('Are you completely sure you want to delete everything inside the directory '. $deletedir .' ?', 'delete.php?sure=yes&sesskey='.sesskey(), 'index.php');
         exit;
     }
 
-    if (!data_submitted() or empty($reallysure)) {
-        $optionsyes = array('sure'=>'yes', 'sesskey'=>sesskey(), 'reallysure'=>'yes');
-        notice_yesno ('Are you REALLY REALLY completely sure you want to delete everything inside the directory '. $deletedir .' (this includes all user images, and any other course files that have been created) ?',
-            'delete.php', 'index.php', $optionsyes, NULL, 'post', 'get');
-        admin_externalpage_print_footer();
+    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&reallysure=yes&sesskey='.sesskey(), 'index.php');
         exit;
     }
 
@@ -46,7 +36,6 @@
 
     echo '<h1 align="center">Done!</h1>';
     print_continue($CFG->wwwroot);
-    admin_externalpage_print_footer();
     exit;
 
 
@@ -54,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') {
@@ -77,5 +66,5 @@ function delete_subdirectories($rootdir) {
     }
     closedir($dir);
 }
-
+  
 ?>

admin/editor.html

@@ -0,0 +1,331 @@
+<form method="post" action="editor.php">
+<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+<input type="hidden" name="tab" value="<?php p($currentpage) ?>" />
+<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>
+<?php if ( $currenttab == 'htmlarea' ) { ?>
+<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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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/htmlarea/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>
+<?php
+    }
+    else if ( $currenttab == 'tinymce' ) {
+    ?>
+<tr>
+    <td>tinymcetheme:</td>
+    <td><?php
+    $options = array('advanced' => 'Advanced','simple' => 'Simple');
+    choose_from_menu ($options, "tinymcetheme", $CFG->tinymcetheme, "", "", "");
+    ?></td>
+    <td>&nbsp;</td>
+</tr>
+<tr>
+    <td valign="top">tinymceplugins:</td>
+    <td nowrap="nowrap"><?php
+    $pluginsdir = $CFG->libdir .'/editor/tinymce/jscripts/tiny_mce/plugins';
+    $plugins = editor_get_tiny_plugins();
+    $pluginsinuse = explode(",", $CFG->tinymceplugins);
+
+    sort($plugins);
+    $cnt = 0;
+    echo '<table border="0" cellpadding="2">';
+    foreach ( $plugins as $plugin ) {
+        $num = ($cnt % 2);
+        if ( $num < 1 ) {
+            echo '<tr>';
+        }
+        echo '<td><input type="checkbox" name="tinymceplugins[]" value="'. s($plugin) .'"';
+        if ( in_array($plugin, $pluginsinuse) ) {
+            echo ' checked="checked"';
+        }
+        echo ' /> '. $plugin .'</td>'."\n";
+
+        if ( $num > 0 ) {
+            echo '</tr>';
+        }
+        $cnt++;
+    }
+    echo '</table>';
+    ?></td>
+    <td>&nbsp;</td>
+</tr>
+<tr>
+    <td>tinymcecontentcss:</td>
+    <td><input type="text" name="tinymcecontentcss" value="<?php
+    !empty($CFG->tinymcecontentcss) ? p($CFG->tinymcecontentcss) : ''; ?>" size="40" /></td>
+    <td>&nbsp;</td>
+</tr>
+<tr>
+    <td>tinymcepopupcss:</td>
+    <td><input type="text" name="tinymcepopupcss" value="<?php
+    !empty($CFG->tinymcepopupcss) ? p($CFG->tinymcepopupcss) : ''; ?>" size="40" /></td>
+    <td>&nbsp;</td>
+</tr>
+<tr>
+    <td>tinymceeditorcss:</td>
+    <td><input type="text" name="tinymceeditorcss" value="<?php
+    !empty($CFG->tinymceeditorcss) ? p($CFG->tinymceeditorcss) : ''; ?>" size="40" /></td>
+    <td>&nbsp;</td>
+</tr>
+    <?php
+    }
+    ?>
+<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 ?>" />
+<input type="hidden" name="tab" value="<?php p($currentpage) ?>" />
+<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,306 @@
+<?php // $Id$
+/// configuration routines for HTMLArea editor
+
+    require_once('../config.php');
+
+    $currentpage = optional_param('tab', 1, PARAM_INT);
+
+    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($currentpage))) {
+                error("Editor settings could not be restored!");
+            }
+        } else {
+
+            if (!(editor_update_config($data, $currentpage))) {
+                error("Editor settings could not be updated!");
+            }
+        }
+        redirect("$CFG->wwwroot/$CFG->admin/editor.php?tab=$currentpage", get_string("changessaved"), 1);
+
+    } else {
+        // Generate edit form
+
+        $inactive = array();
+        switch ( $currentpage ) {
+            case 1:
+                $currenttab = 'htmlarea';
+                break;
+            case 2:
+                $currenttab = 'tinymce';
+                break;
+            default:
+                error("Unknown currentpage: $currentpage");
+        }
+
+        //$url = 'editor.php?tab=';
+        //$tabrow = array();
+        //$tabrow[] = new tabobject('htmlarea',$url . '1', 'HTMLArea');
+        //$tabrow[] = new tabobject('tinymce',$url . '2', 'TinyMCE');
+        //$tabs = array($tabrow);
+
+        $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_tabs($tabs, $currenttab, $inactive);
+
+        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, $editor) {
+
+/// Updates the editor config values.
+
+    if (!is_object($data)) {
+        return false;
+    }
+
+    switch($editor) {
+        case 1: // HTMLArea.
+    // 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);
+        break;
+
+        case 2: // TinyMCE.
+        $updatedata = array();
+        $updatedata['htmleditor'] = !empty($data->htmleditor) ? $data->htmleditor : 0;
+
+        // Process plugins
+        if ( !empty($data->tinymceplugins) ) {
+            foreach ( $data->tinymceplugins as $key => $value ) {
+                $value = stripslashes(clean_param($value, PARAM_ALPHA));
+                $data->tinymceplugins[$key] = addslashes($value);
+            }
+        }
+        $updatedata['tinymceplugins'] = !empty($data->tinymceplugins) ? implode(",", $data->tinymceplugins) : '';
+        $updatedata['tinymcetheme'] = !empty($data->tinymcetheme) ?
+                                           clean_param($data->tinymcetheme, PARAM_ALPHA) : '';
+        $updatedata['tinymcecontentcss'] = !empty($data->tinymcecontentcss) ?
+                                           clean_param($data->tinymcecontentcss, PARAM_URL) : '';
+        $updatedata['tinymcepopupcss'] = !empty($data->tinymcepopupcss) ?
+                                           clean_param($data->tinymcepopupcss, PARAM_URL) : '';
+        $updatedata['tinymceeditorcss'] = !empty($data->tinymceeditorcss) ?
+                                           clean_param($data->tinymceeditorcss, PARAM_URL) : '';
+        break;
+    }
+
+    foreach ($updatedata as $name => $value) {
+        if (!(set_config($name, $value))) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+function reset_to_defaults ($editor) {
+/// Reset the values to default
+
+    global $CFG;
+    include_once($CFG->dirroot .'/lib/defaults.php');
+
+    $updatedata = array();
+
+    switch ( $editor ) {
+        case 1: // HTMLArea.
+    $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'] = '';
+        break;
+
+        case 2: // TinyMCE.
+        $updatedata['tinymceplugins'] = $defaults['tinymceplugins'];
+        $updatedata['tinymcetheme']   = $defaults['tinymcetheme'];
+        $updatedata['tinymcecontentcss'] = $defaults['tinymcecontentcss'];
+        $updatedata['tinymcepopupcss'] = $defaults['tinymcepopupcss'];
+        $updatedata['tinymceeditorcss'] = $defaults['tinymceeditorcss'];
+        break;
+    }
+
+    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(escapeshellarg($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;
+
+}
+
+function editor_get_tiny_plugins() {
+    global $CFG;
+
+    $plugins = array();
+    $plugindir = $CFG->libdir .'/editor/tinymce/jscripts/tiny_mce/plugins';
+
+    if ( !$fp = opendir($plugindir) ) {
+        return $plugins;
+        exit;
+    }
+
+    while ( ($file = readdir($fp)) !== false ) {
+
+        if  ( preg_match("/^\.+/", $file) ) {
+            continue;
+        }
+
+        if ( is_dir($plugindir .'/'. $file) ) {
+            array_push($plugins, $file);
+        }
+
+    }
+
+    if ( $fp ) {
+        closedir($fp);
+    }
+
+    return $plugins;
+
+}
+?>

admin/enrol.php

@@ -3,28 +3,29 @@
        //             Yes, enrol is correct English spelling.
 
     require_once('../config.php');
-    require_once($CFG->libdir.'/adminlib.php');
-
-    $enrol        = optional_param('enrol', $CFG->enrol, PARAM_SAFEDIR);
-    $savesettings = optional_param('savesettings', 0, PARAM_BOOL);
 
+    $enrol = optional_param('enrol', $CFG->enrol, PARAM_SAFEDIR);
     $CFG->pagepath = 'enrol';
+    
+    require_login();
 
-    admin_externalpage_setup('enrolment');
-
-    if (!isset($CFG->sendcoursewelcomemessage)) {
-        set_config('sendcoursewelcomemessage', 1);
+    if (!$site = get_site()) {
+        redirect("index.php");
     }
 
+    if (!isadmin()) {
+        error("Only the admin can use this page");
+    }
+
+    if (!confirm_sesskey()) {
+        error(get_string('confirmsesskeybad', 'error'));
+    }
 
     require_once("$CFG->dirroot/enrol/enrol.class.php");   /// Open the factory class
 
 /// Save settings
 
-    if ($frm = data_submitted() and !$savesettings) {
-        if (!confirm_sesskey()) {
-            print_error('confirmsesskeybad', 'error');
-        }
+    if ($frm = data_submitted()) {
         if (empty($frm->enable)) {
             $frm->enable = array();
         }
@@ -38,20 +39,16 @@
         $frm->enable = array_merge(array('manual'), $frm->enable); // make sure manual plugin is called first
         set_config('enrol_plugins_enabled', implode(',', $frm->enable));
         set_config('enrol', $frm->default);
-        redirect("enrol.php", get_string("changessaved"), 1);
-
-    } else if ($frm = data_submitted() and $savesettings) {
-        if (!confirm_sesskey()) {
-            print_error('confirmsesskeybad', 'error');
-        }
-        set_config('sendcoursewelcomemessage', required_param('sendcoursewelcomemessage', PARAM_BOOL));
+        redirect("enrol.php?sesskey=$USER->sesskey", get_string("changessaved"), 1);
     }
 
 /// Print the form
 
     $str = get_strings(array('enrolmentplugins', 'users', 'administration', 'settings', 'edit'));
 
-    admin_externalpage_print_header();
+    print_header("$site->shortname: $str->enrolmentplugins", "$site->fullname",
+                  "<a href=\"index.php\">$str->administration</a> -> 
+                   <a href=\"users.php\">$str->users</a> -> $str->enrolmentplugins");
 
     $modules = get_list_of_plugins("enrol");
     $options = array();
@@ -62,9 +59,8 @@
 
     print_simple_box(get_string('configenrolmentplugins', 'admin'), 'center', '700');
 
-    echo "<form $CFG->frametarget id=\"enrolmenu\" method=\"post\" action=\"enrol.php\">";
-    echo "<div>";
-    echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\" />";
+    echo "<form target=\"{$CFG->framename}\" name=\"enrolmenu\" method=\"post\" action=\"enrol.php\">";
+    echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\">";
 
     $table = new stdClass();
     $table->head = array(get_string('name'), get_string('enable'), get_string('default'), $str->settings);
@@ -74,7 +70,6 @@
     $table->data = array();
 
     $modules = get_list_of_plugins("enrol");
-    $enabledplugins = explode(',', $CFG->enrol_plugins_enabled);
     foreach ($modules as $module) {
 
         // skip if directory is empty
@@ -85,7 +80,7 @@
         $name = get_string("enrolname", "enrol_$module");
         $plugin = enrolment_factory::factory($module);
         $enable = '<input type="checkbox" name="enable[]" value="'.$module.'"';
-        if (in_array($module, $enabledplugins)) {
+        if (stristr($CFG->enrol_plugins_enabled, $module) !== false) {
             $enable .= ' checked="checked"';
         }
         if ($module == 'manual') {
@@ -102,43 +97,15 @@
             $default = '';
         }
         $table->data[$name] = array($name, $enable, $default,
-                                '<a href="enrol_config.php?enrol='.$module.'">'.$str->edit.'</a>');
+                                '<a href="enrol_config.php?sesskey='.$USER->sesskey.'&amp;enrol='.$module.'">'.$str->edit.'</a>');
     }
     asort($table->data);
 
     print_table($table);
 
-    echo "<div style=\"text-align:center\"><input type=\"submit\" value=\"".get_string("savechanges")."\" /></div>\n";
-    echo "</div>";
+    echo "<center><input type=\"submit\" value=\"".get_string("savechanges")."\"></center>\n";
     echo "</form>";
 
-    echo '<hr />';
+    print_footer();
 
-    $yesnooptions = array(0=>get_string('no'), 1=>get_string('yes'));
-
-    echo '<form '.$CFG->frametarget.' id="adminsettings" method="post" action="enrol.php">';
-    echo '<div class="settingsform clearfix">';
-    print_heading(get_string('commonsettings', 'admin'));
-    echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
-    echo '<input type="hidden" name="savesettings" value="1" />';
-    echo '<fieldset>';
-    echo '<div class="form-item clearfix" id="admin-sendcoursewelcomemessage">';
-    
-    echo '<div class="form-label"><label for = "menusendcoursewelcomemessage">' . get_string('sendcoursewelcomemessage', 'admin');
-    echo '<span class="form-shortname">sendcoursewelcomemessage</span>';
-    echo '</label></div>';
-    echo '<div class="form-setting"><div class="form-checkbox defaultsnext">';
-    choose_from_menu($yesnooptions, 'sendcoursewelcomemessage', $CFG->sendcoursewelcomemessage, '');
-    echo '</div><div class="form-defaultinfo">'.get_string('defaultsettinginfo', 'admin', get_string('yes')).'</div></div>';
-    echo '<div class="form-description">' . get_string('configsendcoursewelcomemessage', 'admin') . '</div>';
-    echo '</div>';
-
-    echo '</fieldset>';
-
-    echo '<div class="form-buttons"><input class="form-submit" type="submit" value="'.get_string('savechanges', 'admin').'" /></div>';
-    echo '</div>';
-    echo '</form>';
-
-    admin_externalpage_print_footer();
-
-?>
+?>

admin/enrol_config.php

@@ -3,13 +3,23 @@
        //                    Yes, enrol is correct English spelling.
 
     require_once("../config.php");
-    require_once($CFG->libdir.'/adminlib.php');
-
-    admin_externalpage_setup('enrolment');
 
     $enrol = required_param('enrol', PARAM_ALPHA);
     $CFG->pagepath = 'enrol/' . $enrol;
+    
+    require_login();
 
+    if (!$site = get_site()) {
+        redirect("index.php");
+    }
+
+    if (!isadmin()) {
+        error("Only the admin can use this page");
+    }
+
+    if (!confirm_sesskey()) {
+        error(get_string('confirmsesskeybad', 'error'));
+    }
 
     require_once("$CFG->dirroot/enrol/enrol.class.php");   /// Open the factory class
 
@@ -18,9 +28,6 @@
 /// If data submitted, then process and store.
 
     if ($frm = data_submitted()) {
-        if (!confirm_sesskey()) {
-            print_error('confirmsesskeybad', 'error');
-        }
         if ($enrolment->process_config($frm)) {
             redirect("enrol.php?sesskey=$USER->sesskey", get_string("changessaved"), 1);
         }
@@ -33,7 +40,6 @@
     /// get language strings
     $str = get_strings(array('enrolmentplugins', 'configuration', 'users', 'administration'));
 
-    unset($options);
 
     $modules = get_list_of_plugins("enrol");
     foreach ($modules as $module) {
@@ -41,14 +47,25 @@
     }
     asort($options);
 
-    admin_externalpage_print_header();
+    print_header("$site->shortname: $str->enrolmentplugins", "$site->fullname",
+                  "<a href=\"index.php\">$str->administration</a> -> 
+                   <a href=\"users.php\">$str->users</a> -> 
+                   <a href=\"enrol.php?sesskey=$USER->sesskey\">$str->enrolmentplugins</a> -> 
+                   $str->configuration");
 
-    echo "<form $CFG->frametarget id=\"enrolmenu\" method=\"post\" action=\"enrol_config.php\">";
-    echo "<div>";
-    echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\" />";
-    echo "<input type=\"hidden\" name=\"enrol\" value=\"".$enrol."\" />";
+    echo "<form target=\"{$CFG->framename}\" name=\"enrolmenu\" method=\"post\" action=\"enrol_config.php\">";
+    echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\">";
+    echo "<div align=\"center\"><p><b>";
 
-/// Print current enrolment type description
+
+/// Choose an enrolment method
+    echo get_string('chooseenrolmethod').': ';
+    choose_from_menu ($options, "enrol", $enrol, "",
+                      "document.location='enrol_config.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]);
 
@@ -57,15 +74,15 @@
     print_simple_box_end();
 
     echo "<hr />";
-
+    
     $enrolment->config_form($frm);
 
-    echo "<p class=\"centerpara\"><input type=\"submit\" value=\"".get_string("savechanges")."\" /></p>\n";
-    print_simple_box_end();
-    echo "</div>";
+    echo "<center><p><input type=\"submit\" value=\"".get_string("savechanges")."\"></p></center>\n";
     echo "</form>";
 
-    admin_externalpage_print_footer();
+    print_simple_box_end();
+
+    print_footer();
 
     exit;
 ?>

admin/environment.php

@@ -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); //
 
+/// 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');
@@ -49,10 +57,10 @@
     $strmoodleversion = get_string('moodleversion');
     $strupdate = get_string('updatecomponent', 'admin');
     $strupwards = get_string('upwards', 'admin');
-    $strmisc = get_string('miscellaneous');
 
 /// Print the header stuff
-    admin_externalpage_print_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='.$USER->sesskey.'">'.$strupdate.'</a></div>';
@@ -65,10 +73,10 @@
         if ($cd = new component_installer('http://download.moodle.org', 
                                           'environment', 
                                           'environment.zip')) {
-            $status = $cd->install(); //returns COMPONENT_(ERROR | UPTODATE | INSTALLED)
+            $status = $cd->install(); //returns ERROR | UPTODATE | INSTALLED
             switch ($status) {
-                case COMPONENT_ERROR:
-                    if ($cd->get_error() == 'remotedownloaderror') {
+                case ERROR:
+                    if ($cd->get_error() == 'remotedownloadnotallowed') {
                         $a = new stdClass();
                         $a->url = 'http://download.moodle.org/environment/environment.zip';
                         $a->dest= $CFG->dataroot.'/';
@@ -77,10 +85,10 @@
                         print_simple_box(get_string($cd->get_error(), 'error'), 'center', '', '', 5, 'errorbox');
                     }
                     break;
-                case COMPONENT_UPTODATE:
+                case UPTODATE:
                     print_simple_box(get_string($cd->get_error(), 'error'), 'center');
                     break;
-                case COMPONENT_INSTALLED:
+                case INSTALLED:
                     print_simple_box(get_string('componentinstalled', 'admin'), 'center');
                     break;
             }
@@ -90,7 +98,7 @@
 /// Start of main box
     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;
@@ -120,17 +128,22 @@
     }
 
 /// Print form and popup menu
-    echo '<div style="text-align:center">'.$strmoodleversion.' ';
-    popup_form("$CFG->wwwroot/$CFG->admin/environment.php?version=",
-        $versions, 'selectversion', $version, '');
-    echo '</div>';
-
+    echo '<center><form method="post" action="environment.php">';
+    echo $strmoodleversion.' ';
+    choose_from_menu ($versions, 'version', $version, null, 'this.form.submit();' );
+    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+    echo '</form></center>';
 /// End of main box
     print_simple_box_end();
 
 /// Gather and show results
     $status = check_moodle_environment($version, $environment_results);
 
+/// Other links
+    echo '<div align="center">';
+    print_single_button('phpinfo.php', NULL, get_string('phpinfo'));
+    echo '</div>';
+
 /// Print footer
-    admin_externalpage_print_footer();
+    print_footer();
 ?>

admin/environment.xml

@@ -35,11 +35,6 @@
     </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>
@@ -48,14 +43,10 @@
         <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="mssql" version="8.0" />
       <VENDOR name="oracle" version="9.0" />
     </DATABASE>
-    <PHP version="4.3.0" level="required">
-      <RESTRICT function="restrict_php50_version" message="php50restricted" />
-    </PHP>
+    <PHP version="4.3.0" level="required" />
     <PHP_EXTENSIONS>
       <PHP_EXTENSION name="iconv" level="optional">
         <FEEDBACK>
@@ -69,233 +60,4 @@
       </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_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="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="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="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_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_CHECKS>
-  </MOODLE>
 </COMPATIBILITY_MATRIX>

admin/filter.php

@@ -3,19 +3,30 @@
     // Edit text filter settings
 
     require_once('../config.php');
-    require_once($CFG->libdir.'/adminlib.php');
     require_once($CFG->libdir.'/tablelib.php');
 
-    $filterfull = required_param('filter', PARAM_PATH);
-    $forcereset  = optional_param('reset', 0, PARAM_BOOL);
+    // check for allowed access
+    require_login();
+    if (!isadmin()) {
+        error( 'Only administrators can use the filters administration page' );
+    }
+    if (!$site = get_site()) {
+        error( 'Site is not defined in filters administration page' );
+    }
 
-    $filtername =  substr($filterfull, strpos( $filterfull, '/' )+1 ) ;
+    // get parameters
+    $param = new Object;
 
-    admin_externalpage_setup('filtersetting'.str_replace('/', '', $filterfull));
-
-    $returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=managefilters";
+    $param->filter = required_param('filter', PARAM_PATH);
+    $param->submit = optional_param('submit', 0, PARAM_BOOL);
+    $param->reset  = optional_param('reset', 0, PARAM_BOOL);
 
+    $filtername =  substr($param->filter, strpos( $param->filter, '/' )+1 ) ;
 
+    // $CFG->pagepath is used to generate the body and id attributes for the body tag
+    // of the page. It is also used to generate the link to the Moodle Docs for this view.
+    $CFG->pagepath = 'filter/' . $filtername . '/config';
+    
     // get translated strings for use on page
     $txt = new Object;
     $txt->managefilters = get_string( 'managefilters' );
@@ -27,7 +38,12 @@
     //======================
 
     // if reset pressed let filter config page handle it
-    if ($config = data_submitted() and !$forcereset) {
+    $forcereset = false;
+    if (!empty($param->reset)) {
+        $forcereset = true;
+    }
+    else
+    if ($config = data_submitted()) {
 
         // check session key
         if (!confirm_sesskey()) {
@@ -48,43 +64,45 @@
             // run through submitted data
             // reject if does not start with filter_
             foreach ($config as $name => $value) {
-                set_config($name, stripslashes($value));
+                set_config( $name,$value );
             }
         }
-
-        reset_text_filters_cache();
-
-        redirect($returnurl);
+        redirect( "$CFG->wwwroot/$CFG->admin/filters.php", get_string('changessaved'), 1);
         exit;
     }
 
     //==============================
     // Display logic
     //==============================
-
+    
     $filtername = ucfirst($filtername);
-    admin_externalpage_print_header();
-    print_heading( $filtername );
+    print_header( "$site->shortname: $txt->managefilters", "$site->fullname",
+        "<a href=\"index.php\">$txt->administration</a> -> <a href=\"configure.php\">$txt->configuration</a> " .
+        "-> <a href=\"filters.php\">$txt->managefilters</a> -> $filtername" );
 
-    print_simple_box(get_string("configwarning", "admin"), "center", "50%");
+    print_heading( $txt->managefilters );
+
+    print_simple_box("<center>".get_string("configwarning", "admin")."</center>", "center", "50%");
     echo "<br />";
 
     print_simple_box_start("center",'');
 
     ?>
-    <form action="filter.php?filter=<?php echo urlencode($filterfull); ?>" method="post">
-    <div style="text-align: center">
+    <form action="filter.php?filter=<?php echo urlencode($param->filter); ?>" method="post">
     <input type="hidden" name="sesskey" value="<?php echo sesskey(); ?>" />
 
-    <?php include "$CFG->dirroot/$filterfull/filterconfig.html"; ?>
+    <?php include "$CFG->dirroot/$param->filter/filterconfig.html"; ?>
 
+    <center>
         <input type="submit" name="submit" value="<?php print_string('savechanges'); ?>" />
         <input type="submit" name="reset" value="<?php echo print_string('resettodefaults'); ?>" />
-    </div>
+    </center>
     </form>
 
     <?php
     print_simple_box_end();
 
-    admin_externalpage_print_footer();
+    print_simple_box_end();
+
+    print_footer();
 ?>

admin/filters.php

@@ -1,73 +1,142 @@
 <?php // $Id$
+    // filters.php
+    // Edit list of available text filters
 
     require_once('../config.php');
+    require_once($CFG->libdir.'/tablelib.php');
 
-    $action     = optional_param('action', '', PARAM_ACTION);
-    $filterpath = optional_param('filterpath', '', PARAM_PATH);
+    // defines
+    define('FILTER_TABLE','filter_administration_table');
 
+    // check for allowed access
     require_login();
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
 
-    $returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=managefilters";
-
-    if (!confirm_sesskey()) {
-        redirect($returnurl);
+    if (!isadmin()) {
+        error('Only administrators can use the filters administration page');
+    }
+    if (!$site = get_site()) {
+        error('Site is not defined in filters administration page');
     }
 
-    // get a list of installed filters
+    // get values from page
+    $params = new object();
+    $params->action     = optional_param('action', '', PARAM_ACTION);
+    $params->filterpath = optional_param('filterpath', '', PARAM_PATH);
+    $params->cachetext  = optional_param('cachetext', 0, PARAM_INT);
+    $params->filterall  = optional_param('filterall', 0, PARAM_BOOL);
+    $params->filteruploadedfiles   = optional_param('filteruploadedfiles', 0, PARAM_INT);
+    $params->filtermatchoneperpage = optional_param('filtermatchoneperpage', 0, PARAM_BOOL);
+    $params->filtermatchonepertext = optional_param('filtermatchonepertext', 0, PARAM_BOOL);
+
+    // some basic information
+    $url = 'filters.php';
+    $myurl = "$url?sesskey=" . sesskey();
+    $img = "$CFG->pixpath/t";
+
+    // get translated strings for use on page
+    $txt = new object();
+    $txt->managefilters = get_string('managefilters');
+    $txt->administration = get_string('administration');
+    $txt->configuration = get_string('configuration');
+    $txt->name = get_string('name');
+    $txt->hide = get_string('hide');
+    $txt->show = get_string('show');
+    $txt->hideshow = "$txt->hide/$txt->show";
+    $txt->settings = get_string('settings');
+    $txt->up = get_string('up');
+    $txt->down = get_string('down');
+    $txt->updown = "$txt->up/$txt->down";
+    $txt->cachetext = get_string('cachetext', 'admin');
+    $txt->configcachetext = get_string('configcachetext', 'admin');
+    $txt->filteruploadedfiles = get_string('filteruploadedfiles','admin');
+    $txt->configfilteruploadedfiles = get_string('configfilteruploadedfiles','admin');
+    $txt->filterall = get_string('filterall','admin');
+    $txt->filtermatchoneperpage = get_string('filtermatchoneperpage','admin');
+    $txt->filtermatchonepertext = get_string('filtermatchonepertext','admin');
+    $txt->configfilterall = get_string('configfilterall','admin');
+    $txt->configfiltermatchoneperpage = get_string('configfiltermatchoneperpage','admin');
+    $txt->configfiltermatchonepertext = get_string('configfiltermatchonepertext','admin');
+    $txt->cachecontrols = get_string('cachecontrols');
+    $txt->yes = get_string('yes');
+    $txt->no = get_string('no');
+    $txt->none = get_string('none');
+    $txt->allfiles = get_string('allfiles');
+    $txt->htmlfilesonly = get_string('htmlfilesonly');
+
+    // get a list of possible filters (and translate name if possible)
+    // note filters can be in the dedicated filters area OR in their
+    // associated modules
     $installedfilters = array();
+    $filtersettings = array();
     $filterlocations = array('mod','filter');
     foreach ($filterlocations as $filterlocation) {
         $plugins = get_list_of_plugins($filterlocation);
         foreach ($plugins as $plugin) {
             $pluginpath = "$CFG->dirroot/$filterlocation/$plugin/filter.php";
+            $settingspath = "$CFG->dirroot/$filterlocation/$plugin/filterconfig.html";
             if (is_readable($pluginpath)) {
-                $installedfilters["$filterlocation/$plugin"] = "$filterlocation/$plugin";
+                $name = trim(get_string("filtername", $plugin));
+                if (empty($name) or ($name == '[[filtername]]')) {
+                    $name = ucfirst($plugin);
+                }
+                $installedfilters["$filterlocation/$plugin"] = $name;
+                if (is_readable($settingspath)) {
+                    $filtersettings[] = "$filterlocation/$plugin";
+                }
             }
         }
     }
 
     // get all the currently selected filters
     if (!empty($CFG->textfilters)) {
-        $activefilters = explode(',', $CFG->textfilters);
+        $oldactivefilters = explode(',', $CFG->textfilters);
+        $oldactivefilters = array_unique($oldactivefilters);
     } else {
-        $activefilters = array();
+        $oldactivefilters = array();
+    }
+
+    // take this opportunity to clean up filters
+    $activefilters = array();
+    foreach ($oldactivefilters as $oldactivefilter) {
+        if (!empty($oldactivefilter) and array_key_exists($oldactivefilter, $installedfilters)) {
+            $activefilters[] = $oldactivefilter;
+        }
     }
 
     //======================
     // Process Actions
     //======================
 
-    switch ($action) {
-
-    case 'hide':
-        $key=array_search($filterpath, $activefilters);
+    if ($params->action=="") {
+        // store cleaned active filers in db
+        set_config('textfilters', implode(',', $activefilters));
+    } elseif (($params->action=="hide") and confirm_sesskey()) {
+        $key=array_search($params->filterpath, $activefilters);
         // check filterpath is valid
         if ($key===false) {
-            break;
+            // ignore it - doubleclick??
+        } else {
+            // just delete it
+            unset($activefilters[$key]);
+            set_config('textfilters', implode(',', $activefilters));
         }
-        // just delete it
-        unset($activefilters[$key]);
-        break;
-
-    case 'show':
+    } elseif (($params->action=="show") and confirm_sesskey()) {
         // check filterpath is valid
-        if (!array_key_exists($filterpath, $installedfilters)) {
-            error("Filter $filterpath is not currently installed", $url);
-        } elseif (array_search($filterpath,$activefilters)) {
+        if (!array_key_exists($params->filterpath, $installedfilters)) {
+            error("Filter $params->filterpath is not currently installed", $url);
+        } elseif (array_search($params->filterpath,$activefilters)) {
             // filterpath is already active - doubleclick??
         } else {
             // add it to installed filters
-            $activefilters[] = $filterpath;
+            $activefilters[] = $params->filterpath;
             $activefilters = array_unique($activefilters);
+            set_config('textfilters', implode(',', $activefilters));
         }
-        break;
-
-    case 'down':
-        $key=array_search($filterpath, $activefilters);
+    } elseif (($params->action=="down") and confirm_sesskey()) {
+        $key=array_search($params->filterpath, $activefilters);
         // check filterpath is valid
         if ($key===false) {
-            error("Filter $filterpath is not currently active", $url);
+            error("Filter $params->filterpath is not currently active", $url);
         } elseif ($key>=(count($activefilters)-1)) {
             // cannot be moved any further down - doubleclick??
         } else {
@@ -75,14 +144,13 @@
             $fsave = $activefilters[$key];
             $activefilters[$key] = $activefilters[$key+1];
             $activefilters[$key+1] = $fsave;
+            set_config('textfilters', implode(',', $activefilters));
         }
-        break;
-
-    case 'up':
-        $key=array_search($filterpath, $activefilters);
+    } elseif (($params->action=="up") and confirm_sesskey()) {
+        $key=array_search($params->filterpath, $activefilters);
         // check filterpath is valid
         if ($key===false) {
-            error("Filter $filterpath is not currently active", $url);
+            error("Filter $params->filterpath is not currently active", $url);
         } elseif ($key<1) {
             //cannot be moved any further up - doubleclick??
         } else {
@@ -90,13 +158,177 @@
             $fsave = $activefilters[$key];
             $activefilters[$key] = $activefilters[$key-1];
             $activefilters[$key-1] = $fsave;
+            set_config('textfilters', implode(',', $activefilters));
         }
-        break;
+    } elseif (($params->action=="config") and confirm_sesskey()) {
+        set_config('cachetext', $params->cachetext);
+        set_config('filteruploadedfiles', $params->filteruploadedfiles);
+        set_config('filterall', $params->filterall);
+        set_config('filtermatchoneperpage', $params->filtermatchoneperpage);
+        set_config('filtermatchonepertext', $params->filtermatchonepertext);
     }
 
-    // save, reset cache and return
-    set_config('textfilters', implode(',', $activefilters));
-    reset_text_filters_cache();
-    redirect($returnurl);
+    //======================
+    // Build Display Objects
+    //======================
+
+    // construct the display array with installed filters
+    // at the top in the right order
+    $displayfilters = array();
+    foreach ($activefilters as $activefilter) {
+        $name = $installedfilters[$activefilter];
+        $displayfilters[$activefilter] = $name;
+    }
+    foreach ($installedfilters as $key => $filter) {
+        if (!array_key_exists($key, $displayfilters)) {
+            $displayfilters[$key] = $filter;
+        }
+    }
+
+    // construct the flexible table ready to display
+    $table = new flexible_table(FILTER_TABLE);
+    $table->define_columns(array('name', 'hideshow', 'order', 'settings'));
+    $table->column_style('hideshow', 'text-align', 'center');
+    $table->column_style('order', 'text-align', 'center');
+    $table->column_style('settings', 'text-align', 'center');
+    $table->define_headers(array($txt->name, $txt->hideshow, $txt->updown, $txt->settings));
+    $table->define_baseurl("$CFG->wwwroot/admin/filters.php");
+    $table->set_attribute('id', 'blocks');
+    $table->set_attribute('class', 'flexible generaltable generalbox');
+    $table->set_attribute('style', 'margin:auto;');
+    $table->set_attribute('cellpadding', '5');
+    $table->setup();
+
+    // iterate through filters adding to display table
+    $updowncount = 1;
+    $activefilterscount = count($activefilters);
+    foreach ($displayfilters as $path => $name) {
+        $upath = urlencode($path);
+        // get hide/show link
+        if (in_array($path, $activefilters)) {
+            $hideshow = "<a href=\"$myurl&amp;action=hide&amp;filterpath=$upath\">";
+            $hideshow .= "<img src=\"{$CFG->pixpath}/i/hide.gif\" height=\"16\" width=\"16\" alt=\"hide\" /></a>";
+            $hidden = false;
+            $displayname = "<span>$name</span>";
+        }
+        else {
+            $hideshow = "<a href=\"$myurl&amp;action=show&amp;filterpath=$upath\">";
+            $hideshow .= "<img src=\"{$CFG->pixpath}/i/show.gif\" height=\"16\" width=\"16\" alt=\"show\" /></a>";
+            $hidden = true;
+            $displayname = "<span class=\"dimmed_text\">$name</span>";
+        }
+
+        // get up/down link (only if not hidden)
+        $updown = '';
+        if (!$hidden) {
+            if ($updowncount>1) {
+                $updown .= "<a href=\"$myurl&amp;action=up&amp;filterpath=$upath\">";
+                $updown .= "<img src=\"$img/up.gif\" alt=\"up\" /></a>&nbsp;";
+            }
+            else {
+                $updown .= "<img src=\"$CFG->pixpath/spacer.gif\" height=\"16\" width=\"16\" alt=\"\" />&nbsp;";
+            }
+            if ($updowncount<$activefilterscount) {
+                $updown .= "<a href=\"$myurl&amp;action=down&amp;filterpath=$upath\">";
+                $updown .= "<img src=\"$img/down.gif\" alt=\"down\" /></a>";
+            }
+            else {
+                $updown .= "<img src=\"$CFG->pixpath/spacer.gif\" height=\"16\" width=\"16\" alt=\"\" />";
+            }
+            ++$updowncount;
+        }
+
+        // settings link (if defined)
+        $settings = '';
+        if (in_array($path, $filtersettings)) {
+            $settings = "<a href=\"filter.php?filter=" . urlencode($path) . "\">";
+            $settings .= "{$txt->settings}</a>";
+        }
+
+        // write data into the table object
+        $table->add_data(array($displayname, $hideshow, $updown, $settings));
+    }
+
+    // build options list for cache lifetime
+    $seconds = array(604800,86400,43200,10800,7200,3600,2700,1800,900,600,540,480,420,360,300,240,180,120,60,30,0);
+    unset($lifetimeoptions);
+    foreach ($seconds as $second) {
+        if ($second>=86400) {
+            $options[$second] = get_string('numdays','',$second/86400);
+        }
+        elseif ($second>=3600) {
+            $options[$second] = get_string('numhours','',$second/3600);
+        }
+        elseif ($second>=60) {
+            $options[$second] = get_string('numminutes','',$second/60);
+        }
+        elseif ($second>=1) {
+            $options[$second] = get_string('numseconds','',$second);
+        }
+        else {
+            $options[$second] = get_string('no');
+        }
+    }
+
+    //==============================
+    // Display logic
+    //==============================
+
+    print_header("$site->shortname: $txt->managefilters", "$site->fullname",
+        "<a href=\"index.php\">$txt->administration</a> -> <a href=\"configure.php\">$txt->configuration</a> " .
+        "-> $txt->managefilters");
+
+    print_heading_with_help($txt->managefilters, 'filters');
+
+    // print the table of all the filters
+    $table->print_html();
+
+    // print the table for the cache controls
+    print_heading($txt->cachecontrols);
+    print_simple_box_start('center');
+    ?>
+
+    <form name="options" id="options" method="post" action="<?php echo $url; ?>" >
+        <input type="hidden" name="sesskey" value="<?php echo sesskey(); ?>" />
+        <input type="hidden" name="action" value="config" />
+        <table cellpadding="20">
+            <tr valign="top">
+                <td nowrap="nowrap" align="right"><?php echo $txt->cachetext; ?></td>
+                <td><?php choose_from_menu($options, "cachetext", $CFG->cachetext, "", "", ""); ?></td>
+                <td><?php echo $txt->configcachetext; ?></td>
+            </tr>
+            <tr valign="top">
+                <td nowrap="nowrap" align="right"><?php echo $txt->filteruploadedfiles; ?></td>
+                <td><?php choose_from_menu(array($txt->none,$txt->allfiles,$txt->htmlfilesonly),
+                    "filteruploadedfiles", $CFG->filteruploadedfiles,"","",""); ?></td>
+                <td><?php echo $txt->configfilteruploadedfiles; ?></td>
+            </tr>
+            <tr valign="top">
+                <td nowrap="nowrap" align="right"><?php echo $txt->filtermatchoneperpage; ?></td>
+                <td><?php choose_from_menu(array($txt->no,$txt->yes), "filtermatchoneperpage", $CFG->filtermatchoneperpage,"","",""); ?></td>
+                <td><?php echo $txt->configfiltermatchoneperpage; ?></td>
+        <tr valign="top">
+        <td nowrap="nowrap" align="right"><?php echo $txt->filtermatchonepertext; ?></td>
+        <td><?php choose_from_menu(array($txt->no,$txt->yes), "filtermatchonepertext", $CFG->filtermatchonepertext,"","",""); ?></td>
+        <td><?php echo $txt->configfiltermatchonepertext; ?></td>
+        </tr>
+            </tr>
+            <tr valign="top">
+                <td nowrap="nowrap" align="right"><?php echo $txt->filterall; ?></td>
+                <td><?php choose_from_menu(array($txt->no,$txt->yes), "filterall", $CFG->filterall,"","",""); ?></td>
+                <td><?php echo $txt->configfilterall; ?></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();
+
+    print_footer();
 
 ?>

admin/fixuserpix.php

@@ -1,275 +0,0 @@
-<?php
-
-require_once('../config.php');
-/**
- * SCRIPT CONFIGURATION
- */
-$starttimer = time()+microtime();
-
-$settings = array();
-$settings['verbose'] = false;
-$settings['username'] = null;
-$settings['password'] = null;
-$settings['eolchar'] = '<br />'; // Character used to break lines
-
-// Argument arrays: 0=>short name, 1=>long name
-$arguments = array(
- array('short'=>'u', 'long'=>'username', 'help' => 'Your moodle username', 'type'=>'STRING', 'default' => ''),
- array('short'=>'pw', 'long'=>'password', 'help' => 'Your moodle password', 'type'=>'STRING', 'default' => ''),
- array('short'=>'v', 'long' => 'verbose', 'help' => 'Display extra information about the process')
-);
-
-// Building the USAGE output of the command line version
-if (isset($argv) && isset($argc)) {
-    $help = "Moodle User Pix Fix. Restores user profile images that were not properly moved during 1.8.2 upgrade to newer versions.\n\n"
-          . "Usage: {$argv[0]}; [OPTION] ...\n"
-          . "Options:\n"
-          . "  -h,    -?, -help, --help               This output\n";
-
-    foreach ($arguments as $arg_array) {
-        $equal = '';
-        if (!empty($arg_array['type'])) {
-            $equal = "={$arg_array['type']}";
-        }
-
-        $padding1 = 5 - strlen($arg_array['short']);
-        $padding2 = 30 - (strlen($arg_array['long']) + strlen($equal));
-        $paddingstr1 = '';
-        for ($i = 0; $i < $padding1; $i++) {
-            $paddingstr1 .= ' ';
-        }
-        $paddingstr2 = '';
-        for ($i = 0; $i < $padding2; $i++) {
-            $paddingstr2 .= ' ';
-        }
-
-        $help .= "  -{$arg_array['short']},$paddingstr1--{$arg_array['long']}$equal$paddingstr2{$arg_array['help']}\n";
-    }
-
-    $help .= "\nEmail nicolasconnault@gmail.com for any suggestions or bug reports.\n";
-
-    if ($argc == 1 || in_array($argv[1], array('--help', '-help', '-h', '-?'))) {
-        echo $help;
-        die();
-
-    } else {
-
-        $settings['eolchar'] = "\n";
-        $argv = arguments($argv);
-        $argscount = 0;
-
-        foreach ($arguments as $arg_array) {
-            $value = null;
-            if (in_array($arg_array['short'], array_keys($argv))) {
-                $value = $argv[$arg_array['short']];
-                unset($argv[$arg_array['short']]);
-            } elseif (in_array($arg_array['long'], array_keys($argv))) {
-                $value = $argv[$arg_array['long']];
-                unset($argv[$arg_array['long']]);
-            }
-            if (!is_null($value)) {
-                $settings[$arg_array['long']] = $value;
-                $argscount++;
-            }
-        }
-
-        // If some params are left in argv, it means they are not supported
-        if ($argscount == 0 || count($argv) > 0) {
-            echo $help;
-            die();
-        }
-    }
-}
-
-/**
- * SCRIPT SETUP
- */
-require_once($CFG->libdir . '/formslib.php');
-require_once($CFG->dirroot .'/course/lib.php');
-verbose("Loading libraries...");
-$systemcontext = get_context_instance(CONTEXT_SYSTEM);
-
-/**
- * WEB INTERFACE FORM
- */
-
-class pixfix_form extends moodleform {
-    function definition() {
-        global $arguments;
-        $mform =& $this->_form;
-
-        foreach ($arguments as $arg_array) {
-            $type = 'advcheckbox';
-
-            $label = ucfirst(str_replace('-', ' ', $arg_array['long']));
-            if (!empty($arg_array['type'])) {
-                $type = 'text';
-            }
-
-            if ($arg_array['long'] == 'password' || $arg_array['long'] == 'username') {
-                continue;
-            }
-
-            $mform->addElement($type, $arg_array['long'], $label);
-
-            if (isset($arg_array['default'])) {
-                $mform->setDefault($arg_array['long'], $arg_array['default']);
-            }
-        }
-        $this->add_action_buttons(false, 'Restore Images');
-    }
-
-    function definition_after_data() {
-
-    }
-}
-
-$run_script = true;
-$web_interface = false;
-
-// If eolchar is still <br />, load the web interface
-if ($settings['eolchar'] == '<br />') {
-    print_header("User Pix-Fix");
-    print_heading("User Pix-Fix");
-    $mform = new pixfix_form();
-
-    if ($data = $mform->get_data(false)) {
-        foreach ($arguments as $arg_array) {
-            if (!empty($data->{$arg_array['long']})) {
-                $settings[$arg_array['long']] = $data->{$arg_array['long']};
-            }
-        }
-    } else {
-        $run_script = false;
-    }
-
-    if (!has_capability('moodle/site:doanything', $systemcontext)) {
-        // If not logged in, give link to login page for current site
-        notify("You must be logged in as administrator before using this script.");
-        require_login();
-    } else {
-        $mform->display();
-    }
-
-    $web_interface = true;
-}
-
-if ($run_script) {
-
-    // User authentication
-    if (!$web_interface) {
-        if (empty($settings['username'])) {
-            echo "You must enter a valid username for a moodle administrator account on this site.{$settings['eolchar']}";
-            die();
-        } elseif (empty($settings['password'])) {
-            echo "You must enter a valid password for a moodle administrator account on this site.{$settings['eolchar']}";
-            die();
-        } else {
-            if (!$user = authenticate_user_login($settings['username'], $settings['password'])) {
-                echo "Invalid username or password!{$settings['eolchar']}";
-                die();
-            }
-            $USER = complete_user_login($user);
-            if (!has_capability('moodle/site:doanything', $systemcontext)) {
-                echo "You do not have administration privileges on this Moodle site. These are required for running the restore script.{$settings['eolchar']}";
-                die();
-            }
-        }
-    }
-
-    // Script code here
-
-    // Look for old moodledata/users directory
-    $oldusersdir = $CFG->dataroot . '/users';
-
-    if (!file_exists($oldusersdir)) {
-        notify('The old directory for user profile images ('.$oldusersdir.') does not exist. Pictures cannot be restored!');
-    } else {
-        // Find user profile images that are not yet in the new directory
-        $folders = get_directory_list($oldusersdir, '', false, true, false);
-
-        $restored_count = 0;
-
-        foreach ($folders as $userid) {
-            $olddir = $oldusersdir . '/' . $userid;
-            $files = get_directory_list($olddir);
-
-            if (empty($files)) {
-                continue;
-            }
-
-            // Create new user directory
-            if (!$newdir = make_user_directory($userid)) {
-                // some weird directory - do not stop the upgrade, just ignore it
-                continue;
-            }
-
-            // Move contents of old directory to new one
-            if (file_exists($olddir) && file_exists($newdir)) {
-                $restored = false;
-
-                foreach ($files as $file) {
-                    if (!file_exists($newdir . '/' . $file)) {
-                        copy($olddir . '/' . $file, $newdir . '/' . $file);
-                        verbose("Moved $olddir/$file into $newdir/$file");
-                        $restored = true;
-                    }
-                }
-
-                if ($restored) {
-                    $restored_count++;
-                }
-            } else {
-                notify("Could not move the contents of $olddir into $newdir!");
-                $result = false;
-                break;
-            }
-        }
-
-        if ($settings['eolchar'] == '<br />') {
-            print_box_start('generalbox centerpara');
-        }
-        if ($restored_count > 0) {
-            echo "Successfully restored profile images for $restored_count users!" . $settings['eolchar'];
-        } else {
-            echo "Did not find any user profile images in need of restoring." . $settings['eolchar'];
-        }
-        if ($settings['eolchar'] == '<br />') {
-            print_box_end();
-        }
-    }
-}
-
-if ($settings['eolchar'] == '<br />') {
-    print_footer();
-}
-
-/**
- * Converts the standard $argv into an associative array taking var=val arguments into account
- * @param array $argv
- * @return array $_ARG
- */
-function arguments($argv) {
-    $_ARG = array();
-    foreach ($argv as $arg) {
-        if (ereg('--?([^=]+)=(.*)',$arg,$reg)) {
-            $_ARG[$reg[1]] = $reg[2];
-        } elseif(ereg('-([a-zA-Z0-9]+)',$arg,$reg)) {
-           $_ARG[$reg[1]] = 'true';
-        }
-    }
-    return $_ARG;
-}
-
-/**
- * If verbose is switched on, prints a string terminated by the global eolchar string.
- * @param string $string The string to STDOUT
- */
-function verbose($string) {
-    global $settings;
-    if ($settings['verbose'] && !$settings['quiet']) {
-        echo $string . $settings['eolchar'];
-    }
-}
-
-?>

admin/handlevirus.php

@@ -40,7 +40,7 @@ while(!feof($fd)) {
     
     $user = get_record("user","id",$log->userid);
     $course = get_record("course","id",$log->course);
-    $subject = get_string('virusfoundsubject','moodle',format_string($site->fullname));
+    $subject = get_string('virusfoundsubject','moodle',$site->fullname);
     $a->date = userdate($log->time);
 
     $a->action = $action;
@@ -78,7 +78,7 @@ 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) {
         email_to_user($admin,$admin,$subject,$body);

admin/health.php

@@ -1,34 +1,26 @@
 <?php  // $Id$
 
-    ob_start(); //for whitespace test
     require_once('../config.php');
 
-    // extra whitespace test - intentionally breaks cookieless mode
-    $extraws = '';
-    while (true) {
-        $extraws .= ob_get_contents();
-        if (!@ob_end_clean()) {
-            break;
-        }
-    }
-
-    require_once($CFG->libdir.'/adminlib.php');
-
-    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 _
+    $resetsesserrorcounter = optional_param('resetsesserrorcounter', 0, PARAM_BOOL);
+    $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');
 
-    admin_externalpage_print_header();
+    print_header($site->shortname.': '.$strhealthcenter, $site->fullname,
+                  '<a href="index.php">'.$stradmin.'</a> -> '.$strhealthcenter);
 
 echo <<<STYLES
 <style type="text/css">
@@ -100,7 +92,7 @@ STYLES;
     }
 
 
-    admin_externalpage_print_footer();
+    print_footer();
 
 
 function health_find_problems() {
@@ -224,13 +216,18 @@ class problem_000001 extends problem_base {
 
 class problem_000002 extends problem_base {
     function title() {
-        return 'Extra characters at the end of config.php or other library function';
+        return 'Extra characters at the end of config.php';
     }
     function exists() {
-        global $extraws;
-
-        if($extraws === '') {
-            return false;
+        // [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;
     }
@@ -238,11 +235,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.';
     }
 }
 
@@ -353,45 +350,24 @@ class problem_000008 extends problem_base {
         return 'PHP: memory_limit cannot be controlled by Moodle';
     }
     function exists() {
-        $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 unique below 128M==134217728
-        if (empty($CFG->extramemorylimit)) {
-            raise_memory_limit('128M');
-        } else {
-            raise_memory_limit($CFG->extramemorylimit);
-        }
-        $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?';
     }
 }
 
@@ -422,7 +398,7 @@ class problem_000010 extends problem_base {
     }
     function exists() {
         if (!$this->is_enabled()) {
-            return true;
+            return true;   
         }
         if ($this->status() < 1) {
             return true;
@@ -432,7 +408,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;
         }
     }
@@ -440,12 +416,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 {
@@ -473,9 +449,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;
     }
@@ -486,13 +462,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;
@@ -523,306 +499,17 @@ class problem_000011 extends problem_base {
     }
     function solution() {
         global $CFG;
-        if (optional_param('resetsesserrorcounter', 0, PARAM_BOOL)) {
+        if (!empty($resetsesserrorcounter)) {
             if (get_field('config', 'name', 'name', 'session_error_counter')) {
                 delete_records('config', 'name', 'session_error_counter');
             }
             return 'Error counter was cleared.';
         } else {
-            return '<p>Session errors can be caused by:</p><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><a href="'.me().'&amp;resetsesserrorcounter=1">Reset counter</a></p>';
+            return '<p>Session errors can be caused by:<ul><li>unresolved problem in server software (aka random switching of users),</li><li>blocked or modified cookies,</li><li>deleting of active session files.</li></ul></p><p><a href="'.me().'&resetsesserrorcounter=1">Reset counter.</a></p>';
         }
     }
 }
 
-class problem_000012 extends problem_base {
-    function title() {
-        return 'Random questions data consistency';
-    }
-    function exists() {
-        return record_exists_select('question', "qtype = 'random' AND parent <> id");
-    }
-    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>';
-    }
-    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 $CFG;
-        $positionexpr = sql_position(sql_concat("','", "q.id", "','"), 
-                sql_concat("','", "qma.sequence", "','"));
-        return record_exists_sql("
-                SELECT * FROM {$CFG->prefix}question q
-                    JOIN {$CFG->prefix}question_multianswer qma ON $positionexpr > 0
-                WHERE qma.question <> q.parent") ||
-            record_exists_sql("
-                SELECT * FROM {$CFG->prefix}question q
-                    JOIN {$CFG->prefix}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 $CFG;
-        return record_exists_sql("
-                SELECT * FROM {$CFG->prefix}question q
-                    JOIN {$CFG->prefix}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 $CFG;
-        return record_exists_sql("
-            SELECT qc.*, (SELECT COUNT(1) FROM {$CFG->prefix}question q WHERE q.category = qc.id) AS numquestions
-            FROM {$CFG->prefix}question_categories qc
-                LEFT JOIN {$CFG->prefix}context con ON qc.contextid = con.id
-            WHERE con.id IS NULL");
-    }
-    function severity() {
-        return SEVERITY_ANNOYANCE;
-    }
-    function description() {
-        global $CFG;
-        $problemcategories = get_records_sql("
-            SELECT qc.id, qc.name, qc.contextid, (SELECT COUNT(1) FROM {$CFG->prefix}question q WHERE q.category = qc.id) AS numquestions
-            FROM {$CFG->prefix}question_categories qc
-                LEFT JOIN {$CFG->prefix}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";
-        if ($problemcategories) {
-            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 $CFG;
-        return record_exists_sql("
-            SELECT parent_qc.id AS parent, child_qc.id AS child, child_qc.contextid
-            FROM {$CFG->prefix}question_categories child_qc
-                JOIN {$CFG->prefix}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 $CFG;
-        $problemcategories = 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 {$CFG->prefix}question_categories child_qc
-                JOIN {$CFG->prefix}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";
-        if ($problemcategories) {
-            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() {
-        static $answer = null;
-
-        if (is_null($answer)) {
-            $categories = get_records('question_categories', '', '', '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;
-                }
-            }
-
-            // 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 $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() {
@@ -848,7 +535,6 @@ 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

@@ -5,49 +5,25 @@
         header('Location: ../install.php');
         die;
     }
+   
+    require_once('../config.php');
+    include_once($CFG->dirroot.'/lib/adminlib.php');  // Contains various admin-only functions
 
+    $id             = optional_param('id', '', PARAM_ALPHANUM);
+    $confirmupgrade = optional_param('confirmupgrade', 0, PARAM_BOOL);
+    $agreelicence = optional_param('agreelicence',0, PARAM_BOOL);
 /// Check that PHP is of a sufficient version
-/// Moved here because older versions do not allow while(@ob_end_clean());
-    if (version_compare(phpversion(), "4.3.0") < 0) {
+
+    if (!check_php_version("4.1.0")) { //TODO: should we bump it up to 4.3.0??
         $phpversion = phpversion();
-        echo "Sorry, Moodle requires PHP 4.3.0 or later (currently using version $phpversion)";
+        print_heading("Sorry, Moodle requires PHP 4.1.0 or later (currently using version $phpversion)");
         die;
     }
 
-/// Turn off time limits and try to flush everything all the time, sometimes upgrades can be slow.
-
-    @set_time_limit(0);
-    @ob_implicit_flush(true);
-    while(@ob_end_clean()); // ob_end_flush prevents sending of headers
-
-
-    require_once('../config.php');
-    require_once($CFG->libdir.'/adminlib.php');  // Contains various admin-only functions
-    require_once($CFG->libdir.'/ddllib.php'); // Install/upgrade related db functions
-    require_once($CFG->libdir.'/db/upgradelib.php');  // Upgrade-related functions
-
-    $id             = optional_param('id', '', PARAM_TEXT);
-    $confirmupgrade = optional_param('confirmupgrade', 0, PARAM_BOOL);
-    $confirmrelease = optional_param('confirmrelease', 0, PARAM_BOOL);
-    $agreelicense   = optional_param('agreelicense', 0, PARAM_BOOL);
-    $autopilot      = optional_param('autopilot', 0, PARAM_BOOL);
-    $ignoreupgradewarning = optional_param('ignoreupgradewarning', 0, PARAM_BOOL);
-    $confirmplugincheck = optional_param('confirmplugincheck', 0, PARAM_BOOL);
-
-/// check upgrade status first
-    if ($ignoreupgradewarning and !empty($_SESSION['upgraderunning'])) {
-        $_SESSION['upgraderunning'] = 0;
-    }
-    upgrade_check_running("Upgrade already running in this session, please wait!<br />Click on the exclamation marks to ignore this warning (<a href=\"index.php?ignoreupgradewarning=1\">!!!</a>).", 10);
-
-/// set install/upgrade autocontinue session flag
-    if ($autopilot) {
-        $_SESSION['installautopilot'] = $autopilot;
-    }
 
 /// Check some PHP server settings
 
-    $documentationlink = '<a href="http://docs.moodle.org/en/Installation">Installation docs</a>';
+    $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");
@@ -61,17 +37,6 @@
         error("The PHP server variable 'file_uploads' is not turned On - $documentationlink");
     }
 
-    if (is_float_problem()) {
-        print_error('phpfloatproblem', 'admin', '', $documentationlink);
-    }
-
-    if (empty($CFG->prefix) && $CFG->dbfamily != 'mysql') {  //Enforce prefixes for everybody but mysql
-        error('$CFG->prefix can\'t be empty for your target DB (' . $CFG->dbtype . ')');
-    }
-
-    if ($CFG->dbfamily == 'oracle' && strlen($CFG->prefix) > 2) { //Max prefix length for Oracle is 2cc
-        error('$CFG->prefix maximum allowed length for Oracle DBs is 2cc.');
-    }
 
 /// Check that config.php has been edited
 
@@ -103,13 +68,12 @@
         $CFG->version = "";
     }
 
-    if (is_readable("$CFG->dirroot/version.php")) {
-        include_once("$CFG->dirroot/version.php");              # defines $version
-    }
+/// Turn off time limits and try to flush everything all the time, sometimes upgrades can be slow.
 
-    if (!$version or !$release) {
-        error('Main version.php was not readable or specified');# without version, stop
-    }
+    @set_time_limit(0);
+    @ob_implicit_flush(true);
+    @ob_end_flush();
+ 
 
 /// Check if the main tables have been installed yet or not.
 
@@ -120,7 +84,7 @@
         $maintables = true;
         $mtables = array("config", "course", "course_categories", "course_modules",
                          "course_sections", "log", "log_display", "modules",
-                         "user");
+                         "user", "user_admins", "user_students", "user_teachers");
         foreach ($mtables as $mtable) {
             if (!in_array($CFG->prefix.$mtable, $tables)) {
                 $maintables = false;
@@ -128,110 +92,38 @@
             }
         }
     }
-    
+
     if (! $maintables) {
-    /// hide errors from headers in case debug enabled in config.php
-        $origdebug = $CFG->debug;
-        $CFG->debug = DEBUG_MINIMAL;
-        error_reporting($CFG->debug);
-        if (empty($agreelicense)) {
-            $strlicense = get_string('license');
-            $navigation = build_navigation(array(array('name'=>$strlicense, 'link'=>null, 'type'=>'misc')));
-            print_header($strlicense, $strlicense, $navigation, "", "", false, "&nbsp;", "&nbsp;");
+        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_box(text_to_html(get_string('gpl')), 'copyrightnotice');
+            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?agreelicense=1",
+            notice_yesno(get_string("doyouagree"), "index.php?agreelicence=true",
                                                    "http://docs.moodle.org/en/License");
-            print_footer('none');
             exit;
         }
-        if (empty($confirmrelease)) {
-            $strcurrentrelease = get_string("currentrelease");
-            $navigation = build_navigation(array(array('name'=>$strcurrentrelease, 'link'=>null, 'type'=>'misc')));
-            print_header($strcurrentrelease, $strcurrentrelease, $navigation, "", "", false, "&nbsp;", "&nbsp;");
-            print_heading("Moodle $release");
-            print_box(get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes'), 'generalbox boxaligncenter boxwidthwide');
-            echo '<form action="index.php"><div>';
-            echo '<input type="hidden" name="agreelicense" value="1" />';
-            echo '<input type="hidden" name="confirmrelease" value="1" />';
-            echo '</div>';
-            echo '<div class="continuebutton"><input name="autopilot" id="autopilot" type="checkbox" value="1" /><label for="autopilot">'.get_string('unattendedoperation', 'admin').'</label>';
-            echo '<br /><br /><input type="submit" value="'.get_string('continue').'" /></div>';
-            echo '</form>';
-            print_footer('none');
-            die;
-        }
-
 
         $strdatabasesetup    = get_string("databasesetup");
         $strdatabasesuccess  = get_string("databasesuccess");
-        $navigation = build_navigation(array(array('name'=>$strdatabasesetup, 'link'=>null, 'type'=>'misc')));
-        print_header($strdatabasesetup, $strdatabasesetup, $navigation,
-                        "", upgrade_get_javascript(), false, "&nbsp;", "&nbsp;");
-    /// return to original debugging level
-        $CFG->debug = $origdebug;
-        error_reporting($CFG->debug);
-        upgrade_log_start();
-        $db->debug = true;
-
-    /// Both old .sql files and new install.xml are supported
-    /// But we prioritise install.xml (XMLDB) if present
-
-        change_db_encoding(); // first try to change db encoding to utf8
-        if (!setup_is_unicodedb()) {
-            // If could not convert successfully, throw error, and prevent installation
-            print_error('unicoderequired', 'admin');
-        }
-
-        $status = false;
-        if (file_exists("$CFG->libdir/db/install.xml")) {
-            $status = install_from_xmldb_file("$CFG->libdir/db/install.xml"); //New method
-        } else if (file_exists("$CFG->libdir/db/$CFG->dbtype.sql")) {
-            $status = modify_database("$CFG->libdir/db/$CFG->dbtype.sql"); //Old method
+        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 or install.xml is not present.  See the lib/db directory.");
+            error("Error: Your database ($CFG->dbtype) is not yet fully supported by Moodle.  See the lib/db directory.");
         }
-
-        // all new installs are in unicode - keep for backwards compatibility and 1.8 upgrade checks
-        set_config('unicodedb', 1);
-
-    /// Continue with the instalation
-        $db->debug = false;
-        if ($status) {
-
-            /// Groups install is now in core above.
-
-            // Install the roles system.
-            moodle_install_roles();
-            set_config('statsrolesupgraded',time());
-
-            // install core event handlers
-            events_update_definition();
-
-            /// This is used to handle any settings that must exist in $CFG but which do not exist in
-            /// admin_get_root()/$ADMIN as admin_setting objects (there are some exceptions).
-            apply_default_exception_settings(array('auth' => 'email',
-                                                   'auth_pop3mailbox' => 'INBOX',
-                                                   'enrol' => 'manual',
-                                                   'enrol_plugins_enabled' => 'manual',
-                                                   'style' => 'default',
-                                                   'template' => 'default',
-                                                   'theme' => 'standardwhite',
-                                                   'filter_multilang_converted' => 1));
-
-            // Write default settings unconditionally (i.e. even if a setting is already set, overwrite it)
-            // (this should only have any effect during initial install).
-            admin_apply_default_settings(NULL, true);
-
-            notify($strdatabasesuccess, "green");
-            require_once $CFG->dirroot.'/mnet/lib.php';
-        } else {
-            error("Error: Main databases NOT set up successfully");
-        }
-        print_continue('index.php');
-        print_footer('none');
+        print_continue("index.php");
         die;
     }
 
@@ -239,351 +131,163 @@
 /// Check version of Moodle code on disk compared with database
 /// and upgrade if possible.
 
-    if (file_exists("$CFG->dirroot/lib/db/$CFG->dbtype.php")) {
-        include_once("$CFG->dirroot/lib/db/$CFG->dbtype.php");  # defines old upgrades
-    }
-    if (file_exists("$CFG->dirroot/lib/db/upgrade.php")) {
-        include_once("$CFG->dirroot/lib/db/upgrade.php");  # defines new upgrades
-    }
+    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
 
-        /// If the database is not already Unicode then we do not allow upgrading!
-        /// Instead, we print an error telling them to upgrade to 1.7 first.  MDL-6857
-            if (empty($CFG->unicodedb)) {
-                print_error('unicodeupgradeerror', 'error', '', $version);
-            }
-
             $a->oldversion = "$CFG->release ($CFG->version)";
             $a->newversion = "$release ($version)";
             $strdatabasechecking = get_string("databasechecking", "", $a);
 
-            // hide errors from headers in case debug is enabled
-            $origdebug = $CFG->debug;
-            $CFG->debug = DEBUG_MINIMAL;
-            error_reporting($CFG->debug);
-
-            // logo ut in case we are upgrading from pre 1.9 version in order to prevent
-            // weird session/role problems caused by incorrect data in USER and SESSION
-            if ($CFG->version < 2007101500) {
-                require_logout();
-            }
-
             if (empty($confirmupgrade)) {
-                $navigation = build_navigation(array(array('name'=>$strdatabasechecking, 'link'=>null, 'type'=>'misc')));
-                print_header($strdatabasechecking, $stradministration, $navigation,
+                print_header($strdatabasechecking, $stradministration, $strdatabasechecking,
                         "", "", false, "&nbsp;", "&nbsp;");
-
-                notice_yesno(get_string('upgradesure', 'admin', $a->newversion), 'index.php?confirmupgrade=1', 'index.php');
-                print_footer('none');
+                notice_yesno(get_string('upgradesure', 'admin', $a->newversion), 'index.php?confirmupgrade=yes', 'index.php');
                 exit;
 
-            } else if (empty($confirmrelease)){
-                $strcurrentrelease = get_string("currentrelease");
-                $navigation = build_navigation(array(array('name'=>$strcurrentrelease, 'link'=>null, 'type'=>'misc')));
-                print_header($strcurrentrelease, $strcurrentrelease, $navigation, "", "", false, "&nbsp;", "&nbsp;");
-                print_heading("Moodle $release");
-                print_box(get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes'));
-
-                require_once($CFG->libdir.'/environmentlib.php');
-                print_heading(get_string('environment', 'admin'));
-                remove_dir($CFG->dataroot . '/environment'); /// Always delete downloaded env. info to force use of the released one. MDL-9796
-                if (!check_moodle_environment($release, $environment_results, true)) {
-                    if (empty($CFG->skiplangupgrade)) {
-                        print_box_start('generalbox', 'notice'); // MDL-8330
-                        print_string('langpackwillbeupdated', 'admin');
-                        print_box_end();
-                    }
-                    notice_yesno(get_string('environmenterrorupgrade', 'admin'),
-                                 'index.php?confirmupgrade=1&amp;confirmrelease=1', 'index.php');
-                } else {
-                    notify(get_string('environmentok', 'admin'), 'notifysuccess');
-                    if (empty($CFG->skiplangupgrade)) {
-                        print_box_start('generalbox', 'notice'); // MDL-8330
-                        print_string('langpackwillbeupdated', 'admin');
-                        print_box_end();
-                    }
-                    echo '<form action="index.php"><div>';
-                    echo '<input type="hidden" name="confirmupgrade" value="1" />';
-                    echo '<input type="hidden" name="confirmrelease" value="1" />';
-                    echo '</div>';
-                    echo '<div class="continuebutton">';
-                    echo '<br /><br /><input type="submit" value="'.get_string('continue').'" /></div>';
-                    echo '</form>';
-                }
-
-                print_footer('none');
-                die;
-            } elseif (empty($confirmplugincheck)) { 
-                $strplugincheck = get_string('plugincheck');
-                $navigation = build_navigation(array(array('name'=>$strplugincheck, 'link'=>null, 'type'=>'misc')));
-                print_header($strplugincheck, $strplugincheck, $navigation, "", "", false, "&nbsp;", "&nbsp;");
-                print_heading($strplugincheck);
-                print_box_start('generalbox', 'notice'); // MDL-8330
-                print_string('pluginchecknotice');
-                print_box_end();
-                print_plugin_tables();
-                echo "<br />";
-                echo '<div class="continuebutton">';
-                echo '<a href="index.php?confirmupgrade=1&amp;confirmrelease=1" title="'.get_string('reload').'" ><img src="'.$CFG->pixpath.'/i/reload.gif" alt="" /> '.get_string('reload').'</a>';
-                echo '</div><br />';
-                echo '<form action="index.php"><div>';
-                echo '<input type="hidden" name="confirmupgrade" value="1" />';
-                echo '<input type="hidden" name="confirmrelease" value="1" />';
-                echo '<input type="hidden" name="confirmplugincheck" value="1" />';
-                echo '</div>';
-                echo '<div class="continuebutton"><input name="autopilot" id="autopilot" type="checkbox" value="1" /><label for="autopilot">'.get_string('unattendedoperation', 'admin').'</label>';
-                echo '<br /><br /><input type="submit" value="'.get_string('continue').'" /></div>';
-                echo '</form>';
-                print_footer('none');
-                die();
-    
             } else {
                 $strdatabasesuccess  = get_string("databasesuccess");
-                $navigation = build_navigation(array(array('name'=>$strdatabasesuccess, 'link'=>null, 'type'=>'misc')));
-                print_header($strdatabasechecking, $stradministration, $navigation,
-                        "", upgrade_get_javascript(), false, "&nbsp;", "&nbsp;");
-
-            /// return to original debugging level
-                $CFG->debug = $origdebug;
-                error_reporting($CFG->debug);
-                upgrade_log_start();
-
-            /// Upgrade current language pack if we can
-                if (empty($CFG->skiplangupgrade)) {
-                    upgrade_language_pack();
-                }
-
+                print_header($strdatabasechecking, $stradministration, $strdatabasechecking,
+                        "", "", false, "&nbsp;", "&nbsp;");
                 print_heading($strdatabasechecking);
                 $db->debug=true;
-            /// Launch the old main upgrade (if exists)
-                $status = true;
-                if (function_exists('main_upgrade')) {
-                    $status = main_upgrade($CFG->version);
-                }
-            /// If succesful and exists launch the new main upgrade (XMLDB), called xmldb_main_upgrade
-                if ($status && function_exists('xmldb_main_upgrade')) {
-                    $status = xmldb_main_upgrade($CFG->version);
-                }
-                $db->debug=false;
-            /// If successful, continue upgrading roles and setting everything properly
-                if ($status) {
-                    if (empty($CFG->rolesactive)) {
-
-                        /// Groups upgrade is now in core above.
-
-                        // Upgrade to the roles system.
-                        moodle_install_roles();
-                        set_config('rolesactive', 1);
-                    } else if (!update_capabilities()) {
-                        error('Had trouble upgrading the core capabilities for the Roles System');
-                    }
-                    // update core events
-                    events_update_definition();
-
-                    require_once($CFG->libdir.'/statslib.php');
-                    if (!stats_upgrade_for_roles_wrapper()) {
-                        notify('Couldn\'t upgrade the stats tables to use the new roles system');
-                    }
+                if (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("upgradesettings.php");
-                        print_footer('none');
+                        print_continue("index.php");
                         exit;
                     } else {
-                        error('Upgrade failed!  (Could not update version in config table)');
+                        notify("Upgrade failed!  (Could not update version in config table)");
                     }
-            /// Main upgrade not success
                 } else {
-                    notify('Main Upgrade failed!  See lib/db/upgrade.php');
-                    print_continue('index.php?confirmupgrade=1&amp;confirmrelease=1&amp;confirmplugincheck=1');
-                    print_footer('none');
-                    die;
+                    $db->debug=false;
+                    notify("Upgrade failed!  See /version.php");
                 }
-                upgrade_log_finish();
             }
         } else if ($version < $CFG->version) {
-            upgrade_log_start();
             notify("WARNING!!!  The code you are using is OLDER than the version that made these databases!");
-            upgrade_log_finish();
         }
+
     } else {
+        $strcurrentversion = get_string("currentversion");
+        print_header($strcurrentversion, $stradministration, $strcurrentversion,
+                     "", "", false, "&nbsp;", "&nbsp;");
+
         if (!set_config("version", $version)) {
-            error("A problem occurred inserting current version into databases");
+            $db->debug=true;
+            if (main_upgrade(0)) {
+                print_continue("index.php");
+            } else {
+                error("A problem occurred inserting current version into databases");
+            }
+            $db->debug=false;
         }
     }
 
 /// Updated human-readable release version if necessary
 
     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)) {
-            error("ERROR: Could not update release version in database!!");
+            notify("ERROR: Could not update release version in database!!");
+        }
+        notice(get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes'), 'index.php');
+        exit;
+    }
+
+/// Insert default values for any important configuration variables
+
+    include_once("$CFG->dirroot/lib/defaults.php");
+
+    foreach ($defaults as $name => $value) {
+        if (!isset($CFG->$name)) {
+            $CFG->$name = $value;
+            set_config($name, $value);
+            $configchange = true;
         }
     }
 
-/// Groups install/upgrade is now in core above.
+/// Send $CFG->unicodedb to DB to have it available for next requests
+    set_config('unicodedb', $CFG->unicodedb);
 
+/// If any new configurations were found then send to the config page to check
+
+    if (!empty($configchange)) {
+        redirect("config.php");
+    }
 
 /// Find and check all main modules and load them up or upgrade them if necessary
-/// first old *.php update and then the new upgrade.php script
     upgrade_activity_modules("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
 /// Check all questiontype plugins and upgrade if necessary
-/// first old *.php update and then the new upgrade.php script
-/// It is important that this is done AFTER the quiz module has been upgraded
+    // It is important that this is done AFTER the quiz module has been upgraded
     upgrade_plugins('qtype', 'question/type', "$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
 /// Upgrade backup/restore system if necessary
-/// first old *.php update and then the new upgrade.php script
     require_once("$CFG->dirroot/backup/lib.php");
     upgrade_backup_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
 /// Upgrade blocks system if necessary
-/// first old *.php update and then the new upgrade.php script
     require_once("$CFG->dirroot/lib/blocklib.php");
     upgrade_blocks_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
 /// Check all blocks and load (or upgrade them if necessary)
-/// first old *.php update and then the new upgrade.php script
     upgrade_blocks_plugins("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
 /// Check all enrolment plugins and upgrade if necessary
-/// first old *.php update and then the new upgrade.php script
     upgrade_plugins('enrol', 'enrol', "$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
-/// Check all auth plugins and upgrade if necessary
-    upgrade_plugins('auth','auth',"$CFG->wwwroot/$CFG->admin/index.php");
-
-/// Check all course formats and upgrade if necessary
-    upgrade_plugins('format','course/format',"$CFG->wwwroot/$CFG->admin/index.php");
-
 /// Check for local database customisations
-/// first old *.php update and then the new upgrade.php script
     require_once("$CFG->dirroot/lib/locallib.php");
     upgrade_local_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
-/// Check for changes to RPC functions
-    require_once("$CFG->dirroot/$CFG->admin/mnet/adminlib.php");
-    upgrade_RPC_functions("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
-/// Upgrade all plugins for gradebook
-    upgrade_plugins('gradeexport', 'grade/export', "$CFG->wwwroot/$CFG->admin/index.php");
-    upgrade_plugins('gradeimport', 'grade/import', "$CFG->wwwroot/$CFG->admin/index.php");
-    upgrade_plugins('gradereport', 'grade/report', "$CFG->wwwroot/$CFG->admin/index.php");
-
-/// Check all message output plugins and upgrade if necessary
-    upgrade_plugins('message','message/output',"$CFG->wwwroot/$CFG->admin/index.php");
-
-/// Check all course report plugins and upgrade if necessary
-    upgrade_plugins('coursereport', 'course/report', "$CFG->wwwroot/$CFG->admin/index.php");
-
-/// Check all admin report plugins and upgrade if necessary
-    upgrade_plugins('report', $CFG->admin.'/report', "$CFG->wwwroot/$CFG->admin/index.php");
-
-
-/// just make sure upgrade logging is properly terminated
-    upgrade_log_finish();
-
-    unset($_SESSION['installautopilot']);
-
-/// Set up the blank site - to be customized later at the end of install.
+/// Set up the overall site name etc.
     if (! $site = get_site()) {
-        // We are about to create the site "course"
-        require_once($CFG->libdir.'/blocklib.php');
-
-        $newsite = new object();
-        $newsite->fullname = "";
-        $newsite->shortname = "";
-        $newsite->summary = NULL;
-        $newsite->newsitems = 3;
-        $newsite->numsections = 0;
-        $newsite->category = 0;
-        $newsite->format = 'site';  // Only for this course
-        $newsite->teacher = get_string("defaultcourseteacher");
-        $newsite->teachers = get_string("defaultcourseteachers");
-        $newsite->student = get_string("defaultcoursestudent");
-        $newsite->students = get_string("defaultcoursestudents");
-        $newsite->timemodified = time();
-
-        if (!$newid = insert_record('course', $newsite)) {
-            error("Serious Error! Could not set up the site!");
-        }
-        // make sure course context exists
-        get_context_instance(CONTEXT_COURSE, $newid);
-
-        // Site created, add blocks for it
-        $page = page_create_object(PAGE_COURSE_VIEW, $newid);
-        blocks_repopulate_page($page); // Return value not checked because you can always edit later
-
-        $cat = new object();
-        $cat->name = get_string('miscellaneous');
-        $cat->depth = 1;
-        if (!$catid = insert_record('course_categories', $cat)) {
-            error("Serious Error! Could not set up a default course category!");
-        }
-        // make sure category context exists
-        get_context_instance(CONTEXT_COURSECAT, $catid);
-        mark_context_dirty('/'.SYSCONTEXTID);
-
-        redirect('index.php');
+        redirect("site.php");
     }
 
-    // initialise default blocks on admin and site page if needed
-    if (empty($CFG->adminblocks_initialised)) {
-        require_once("$CFG->dirroot/$CFG->admin/pagelib.php");
-        require_once($CFG->libdir.'/blocklib.php');
-        page_map_class(PAGE_ADMIN, 'page_admin');
-        $page = page_create_object(PAGE_ADMIN, 0); // there must be some id number
-        blocks_repopulate_page($page);
-
-        //add admin_tree block to site if not already present
-        if ($admintree = get_record('block', 'name', 'admin_tree')) {
-            $page = page_create_object(PAGE_COURSE_VIEW, SITEID);
-            $pageblocks=blocks_get_by_page($page);
-            blocks_execute_action($page, $pageblocks, 'add', (int)$admintree->id, false, false);
-            if ($admintreeinstance = get_record('block_instance', 'pagetype', $page->type, 'pageid', SITEID, 'blockid', $admintree->id)) {
-                $pageblocks=blocks_get_by_page($page); // Needs to be re-got, since has just changed
-                blocks_execute_action($page, $pageblocks, 'moveleft', $admintreeinstance, false, false);
-            }
-        }
-
-        set_config('adminblocks_initialised', 1);
+/// Define the unique site ID code if it isn't already
+    if (empty($CFG->siteidentifier)) {    // Unique site identification code
+        set_config('siteidentifier', random_string(32));
     }
 
-/// Define the unique site ID code if it isn't already set. This getter does that as a side-effect.
-    get_site_identifier();
-
 /// Check if the guest user exists.  If not, create one.
     if (! record_exists("user", "username", "guest")) {
-        if (! $guest = create_guest_record()) {
+        $guest->auth        = "manual";
+        $guest->username    = "guest";
+        $guest->password    = md5("guest");
+        $guest->firstname   = addslashes(get_string("guestuser"));
+        $guest->lastname    = " ";
+        $guest->email       = "root@localhost";
+        $guest->description = addslashes(get_string("guestuserinfo"));
+        $guest->confirmed   = 1;
+        $guest->lang        = $CFG->lang;
+        $guest->timemodified= time();
+
+        if (! $guest->id = insert_record("user", $guest)) {
             notify("Could not create guest user record !!!");
         }
     }
 
-
 /// Set up the admin user
-    if (empty($CFG->rolesactive)) {
-        build_context_path(); // just in case - should not be needed
-        create_admin_user();
+    if (! record_exists("user_admins")) {   // No admin user yet
+        redirect("user.php");
     }
 
-/// Check for valid admin user - no guest autologin
-    require_login(0, false);
+/// Check for valid admin user
+    require_login();
 
-    $context = get_context_instance(CONTEXT_SYSTEM);
-
-    require_capability('moodle/site:config', $context);
-
-/// check that site is properly customized
-    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');
+    if (!isadmin()) {
+        error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
     }
 
 /// Check if we are returning from moodle.org registration and if so, we mark that fact to remove reminders
@@ -594,101 +298,185 @@
         }
     }
 
-/// setup critical warnings before printing admin tree block
-    $insecuredataroot         = is_dataroot_insecure(true);
-    $register_globals_enabled = ini_get_bool('register_globals'); 
+/// At this point everything is set up and the user is an admin, so print menu
 
-    $SESSION->admin_critical_warning = ($register_globals_enabled || $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');
-    admin_externalpage_print_header();
+    $stradministration = get_string("administration");
+    print_header("$site->shortname: $stradministration","$site->fullname", "$stradministration");
+    print_simple_box_start('center', '100%', '', 20);
+    print_heading($stradministration);
 
 /// Deprecated database! Warning!!
     if (!empty($CFG->migrated_to_new_db)) {
-        print_box(print_string('dbmigrationdeprecateddb', 'admin'), 'generalbox adminwarning');
+        print_simple_box_start('center','60%');
+        print_string('dbmigrationdeprecateddb','admin');
+        print_simple_box_end();
     }
 
-/// Check for any special upgrades that might need to be run
-    if (!empty($CFG->upgrade)) {
-        print_box(get_string("upgrade$CFG->upgrade", "admin", "$CFG->wwwroot/$CFG->admin/upgrade$CFG->upgrade.php"));
+    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", '60%');
+        print_spacer(10,10);
     }
 
-    if ($register_globals_enabled) {
-        print_box(get_string('globalswarning', 'admin'), 'generalbox adminerror');
+    if (ini_get_bool('register_globals') && !ini_get_bool('magic_quotes_gpc')) {
+        print_simple_box(get_string('globalsquoteswarning', 'admin'), 'center', '60%');
     }
 
-    if ($insecuredataroot == INSECURE_DATAROOT_WARNING) {
-        print_box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot), 'generalbox adminwarning');
-    } else if ($insecuredataroot == INSECURE_DATAROOT_ERROR) {
-        print_box(get_string('datarootsecurityerror', 'admin', $CFG->dataroot), 'generalbox adminerror');
-        
-    }
-
-    if (defined('WARN_DISPLAY_ERRORS_ENABLED')) {
-        print_box(get_string('displayerrorswarning', 'admin'), 'generalbox adminwarning');
-    }
-
-    if (substr($CFG->wwwroot, -1) == '/') {
-        print_box(get_string('cfgwwwrootslashwarning', 'admin'), 'generalbox adminwarning');
-    }
-    if (strpos($ME, $CFG->httpswwwroot.'/') === false) {
-        print_box(get_string('cfgwwwrootwarning', 'admin'), 'generalbox adminwarning');
-    }
 
 /// If no recently cron run
     $lastcron = get_field_sql('SELECT max(lastcron) FROM ' . $CFG->prefix . 'modules');
     if (time() - $lastcron > 3600 * 24) {
         $strinstallation = get_string('installation', 'install');
         $helpbutton = helpbutton('install', $strinstallation, 'moodle', true, false, '', true);
-        print_box(get_string('cronwarning', 'admin')."&nbsp;".$helpbutton, 'generalbox adminwarning');
-    }
-
-/// Print multilang upgrade notice if needed
-    if (empty($CFG->filter_multilang_converted)) {
-        print_box(get_string('multilangupgradenotice', 'admin'), 'generalbox adminwarning');
+        print_simple_box(get_string('cronwarning', 'admin')."&nbsp;".$helpbutton, 'center', '60%');
     }
 
 /// Alert if we are currently in maintenance mode
     if (file_exists($CFG->dataroot.'/1/maintenance.html')) {
-        print_box(get_string('sitemaintenancewarning', 'admin'), 'generalbox adminwarning');
+        print_simple_box(get_string('sitemaintenancewarning', 'admin') , 'center', '60%');
+    }
+
+/// Alert if we are currently in maintenance mode
+    if (empty($CFG->unicodedb)) {
+        print_simple_box(get_string('unicodeupgradenotice', 'admin') , 'center', '60%');
+    }
+
+/// Print slightly annoying registration button every six months   ;-)
+/// You can set the "registered" variable to something far in the future 
+/// if you really want to prevent this.   eg  9999999999
+    if (!isset($CFG->registered) || $CFG->registered < (time() - 3600*24*30*6)) {
+        $options = array();
+        $options['sesskey'] = $USER->sesskey;
+        print_simple_box_start('center','60%');
+        echo '<div align="center">';
+        print_string('pleaseregister', 'admin');
+        print_single_button('register.php', $options, get_string('registration'));
+        echo '</div>';
+        print_simple_box_end();
+    }
+
+    $table->tablealign = "center";
+    $table->align = array ("right", "left");
+    $table->wrap = array ("nowrap", "nowrap");
+    $table->cellpadding = 5;
+    $table->cellspacing = 0;
+    $table->width = '40%';
+
+    $configdata  = '<div class="adminlink"><a href="config.php">'.get_string('configvariables', 'admin').
+                   '</a> - <span class="explanation">'.get_string('adminhelpconfigvariables').'</span></div>';
+    $configdata .= '<div class="adminlink"><a href="site.php">'.get_string('sitesettings').
+                   '</a> - <span class="explanation">'.get_string('adminhelpsitesettings').'</span></div>';
+    $configdata .= '<div class="adminlink"><a href="../theme/index.php">'.get_string('themes').
+                   '</a> - <span class="explanation">'.get_string('adminhelpthemes').'</span></div>';
+    $configdata .= '<div class="adminlink"><a href="lang.php">'.get_string('language').
+                   '</a> - <span class="explanation">'.get_string('adminhelplanguage').'</span></div>';
+    $configdata .= '<div class="adminlink"><a href="modules.php">'.get_string('managemodules').
+                   '</a> - <span class="explanation">'.get_string('adminhelpmanagemodules').'</span></div>';
+    $configdata .= '<div class="adminlink"><a href="blocks.php">'.get_string('manageblocks').
+                   '</a> - <span class="explanation">'.get_string('adminhelpmanageblocks').'</span></div>';
+    $configdata .= '<div class="adminlink"><a href="filters.php">'.get_string('managefilters').
+                   '</a> - <span class="explanation">'.get_string('adminhelpmanagefilters').'</span></div>';
+    if (!isset($CFG->disablescheduledbackups)) {
+        $configdata .= '<div class="adminlink"><a href="backup.php">'.get_string('backup').
+                       '</a> - <span class="explanation">'.get_string('adminhelpbackup').'</span></div>';
+    }
+    $configdata .= '<div class="adminlink"><a href="editor.php">'.get_string('editorsettings').
+                   '</a> - <span class="explanation">'.get_string('adminhelpeditorsettings').'</span></div>';
+    $configdata .= '<div class="adminlink"><a href="calendar.php">'.get_string('calendarsettings', 'admin').
+                   '</a> - <span class="explanation">'.get_string('helpcalendarsettings', 'admin').'</span></div>';
+    $configdata .= '<div class="adminlink"><a href="maintenance.php">'.get_string('sitemaintenancemode', 'admin').
+                   '</a> - <span class="explanation">'.get_string('helpsitemaintenance', 'admin').'</span></div>';
+
+    $table->data[] = array('<strong><a href="configure.php">'.get_string('configuration').'</a></strong>', $configdata);
+
+
+    $userdata =  '<div class="adminlink"><a href="auth.php?sesskey='.$USER->sesskey.'">'.get_string("authentication").
+                 '</a> - <span class="explanation">'.get_string('adminhelpauthentication').'</span></div>';
+    $userdata .= '<div class="adminlink"><a href="user.php">'.get_string('edituser').
+                 '</a> - <span class="explanation">'.get_string('adminhelpedituser').'</span></div>';
+    $userdata .= '<div class="adminlink"><a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/user.php?newuser=true&amp;sesskey='.$USER->sesskey.'">'.
+                 get_string('addnewuser').'</a> - <span class="explanation">'.get_string('adminhelpaddnewuser').'</span></div>';
+    $userdata .= '<div class="adminlink"><a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/uploaduser.php?sesskey='.$USER->sesskey.'">'.
+                 get_string('uploadusers').'</a> - <span class="explanation">'.get_string('adminhelpuploadusers').'</span></div>';
+
+    $userdata .= '<hr /><div class="adminlink"><a href="enrol.php?sesskey='.$USER->sesskey.'">'.get_string('enrolmentplugins').
+                 '</a> - <span class="explanation">'.get_string('adminhelpenrolments').'</span></div>';
+    $userdata .= '<div class="adminlink"><a href="../course/index.php?edit=off&amp;sesskey='.$USER->sesskey.'">'.
+                 get_string('assignstudents').'</a> - <span class="explanation">'.get_string('adminhelpassignstudents').'</span></div>';
+
+    $userdata .= '<div class="adminlink"><a href="../course/index.php?edit=on&amp;sesskey='.$USER->sesskey.'">'.
+                 get_string('assignteachers').'</a> - <span class="explanation">'.get_string('adminhelpassignteachers').
+                 ' <img src="../pix/t/user.gif" height="11" width="11" alt="" /></span></div>';
+    $userdata .= '<div class="adminlink"><a href="creators.php?sesskey='.$USER->sesskey.'">'.get_string('assigncreators').
+                 '</a> - <span class="explanation">'.get_string('adminhelpassigncreators').'</span></div>';
+    $userdata .= '<div class="adminlink"><a href="admin.php?sesskey='.$USER->sesskey.'">'.get_string('assignadmins').
+                 '</a> - <span class="explanation">'.get_string('adminhelpassignadmins').'</span></div>';
+
+    $table->data[] = array('<strong><a href="users.php">'.get_string('users').'</a></strong>', $userdata);
+
+    $table->data[] = array('<strong><a href="../course/index.php?edit=on&amp;sesskey='.$USER->sesskey.'">'.get_string('courses').'</a></strong>',
+                           '<div class="explanation">'.get_string('adminhelpcourses').'</div>');
+    $table->data[] = array('<strong><a href="../files/index.php?id='.$site->id.'">'.get_string('sitefiles').'</a></strong>',
+                           '<div class="explanation">'.get_string('adminhelpsitefiles').'</div>');
+    $table->data[] = array('<strong><a href="stickyblocks.php">'.get_string('stickyblocks','admin').'</a></strong>',
+                           '<div class="explanation">'.get_string('adminhelpstickyblocks').'</div>');
+    $table->data[] = array('<strong><a href="report.php">'.get_string('reports').'</a></strong>', 
+                           '<div class="explanation">'.get_string('adminhelpreports').'</div>');
+    $table->data[] = array('<strong><a href="environment.php">'.get_string('environment','admin').'</a></strong>',
+                           '<div class="explanation">'.get_string('adminhelpenvironment').'</div>');
+
+/// Optional stuff
+    if (file_exists("$CFG->dirroot/$CFG->admin/$CFG->dbtype")) {
+        $table->data[] = array("<strong><a href=\"$CFG->dbtype/frame.php\">".get_string('managedatabase').'</a></strong>',
+                               '<div class="explanation">'.get_string('adminhelpmanagedatabase').'</div>');
+    }
+
+/// Hooks for Matt Oquists contrib code for repositories and portfolio.  
+/// The eventual official versions may not look like this
+    if (isset($CFG->portfolio) && file_exists("$CFG->dirroot/$CFG->portfolio")) {
+                $table->data[] = array("<strong><a href=\"../portfolio/\">".get_string('portfolio','portfolio').'</a></
+trong>',
+                            '<div class="explanation">'.get_string('adminhelpportfolio','portfolio').'</div>');
+    }
+
+    if (isset($CFG->repo) && file_exists("$CFG->dirroot/$CFG->repo")) {
+            $table->data[] = array("<strong><a href=\"../repository/?repoid=1&action=list\">".get_string('repository','
+epository').'</a></strong>',
+                            '<div class="explanation">'.get_string('adminhelprepository','repository').'</div>');
     }
 
 
-/// Print slightly annoying registration button
+
+    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="http://docs.moodle.org/en/Release">'.$CFG->release.'</a> ('.$CFG->version.')<br />'.
+                     'Copyright &copy; 1999 onwards, Martin Dougiamas<br />'.
+                     '<a href="http://docs.moodle.org/en/License">GNU Public License</a>';
+    echo '<p class="copyright">'.$copyrighttext.'</p>';
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+    echo '<div align="center">';
     $options = array();
     $options['sesskey'] = $USER->sesskey;
-    print_box_start('generalbox adminwarning');
-    if(!isset($CFG->registered)) {
-       print_string('pleaseregister', 'admin');
-    }
-    else { /* if (isset($CFG->registered) && $CFG->registered < (time() - 3600*24*30*6)) { */
-       print_string('pleaserefreshregistration', 'admin', userdate($CFG->registered));
-    }
     print_single_button('register.php', $options, get_string('registration'));
-    print_box_end();
+    echo '</div>';
 
 
-    //////////////////////////////////////////////////////////////////////////////////////////////////
-    ////  IT IS ILLEGAL AND A VIOLATION OF THE GPL TO HIDE, REMOVE OR MODIFY THIS COPYRIGHT NOTICE ///
-    $copyrighttext = '<a href="http://moodle.org/">Moodle</a> '.
-                     '<a href="http://docs.moodle.org/en/Release" title="'.$CFG->version.'">'.$CFG->release.'</a><br />'.
-                     'Copyright &copy; 1999 onwards, Martin Dougiamas<br />'.
-                     'and <a href="http://docs.moodle.org/en/Credits">many other contributors</a>.<br />'.
-                     '<a href="http://docs.moodle.org/en/License">GNU Public License</a>';
-    print_box($copyrighttext, 'copyright');
-    //////////////////////////////////////////////////////////////////////////////////////////////////
+    print_simple_box_end();
 
-    admin_externalpage_print_footer();
+    
+    if (optional_param('dbmigrate')) {               // ??? Is this actually used?
+        print_simple_box_start('center','60%');
+        require_once($CFG->dirroot.'/admin/utfdbmigrate.php');
+        db_migrate2utf8();
+        print_simple_box_end();
+    }
+
+
+    print_footer($site);
 
 ?>

admin/innodb.php

@@ -1,43 +1,32 @@
 <?php
 
    require_once('../config.php');
-   require_once($CFG->libdir.'/adminlib.php');
-
-   admin_externalpage_setup('toinodb');
 
    $confirm = optional_param('confirm', 0, PARAM_BOOL);
 
    require_login();
 
-   require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
-
-   admin_externalpage_print_header();
-   print_heading('Convert all MySQL tables from MYISAM to InnoDB');
-
-   if ($CFG->dbfamily != 'mysql') {
-        notice('This function is for MySQL databases only!', 'index.php');
+   if (!isadmin()) {
+       error('Admin only');
    }
 
-   if (data_submitted() and $confirm and confirm_sesskey()) {
+   print_header("Convert all tables from MYISAM to InnoDB", "Convert all tables from MYISAM to InnoDB", 
+                "Convert all tables from MYISAM to InnoDB");
 
-       notify('Please be patient and wait for this to complete...', 'notifysuccess');
+
+   if ($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; ");
            }
-           $db->debug = false;
        }
-       notify('... done.', 'notifysuccess');
-       print_continue('index.php');
-       admin_externalpage_print_footer();
-
    } else {
-       $optionsyes = array('confirm'=>'1', 'sesskey'=>sesskey());
-       notice_yesno('Are you sure you want convert all your tables to the InnoDB format?',
-                    'innodb.php', 'index.php', $optionsyes, NULL, 'post', 'get');
-       admin_externalpage_print_footer();
+       notice_yesno("Are you sure you want convert all your tables to the InnoDB format?", 
+                    "innodb.php?confirm=1&sesskey=".sesskey(), "index.php");
    }
 
 ?>

admin/langdoc.php

@@ -1,17 +1,15 @@
 <?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
- */
+This script enables Moodle translators to edit /docs and /help language
+files directly via WWW interface.
+
+Author:     mudrd8mz@uxit.pedf.cuni.cz (http://moodle.cz)
+Based on:   lang.php in 1.4.3+ release
+Thanks:     Jaime Villate for important bug fixing, koen roggemans for his job and all moodlers
+            for intensive testing of this my first contribution
+*/
     require_once('../config.php');
-    require_once($CFG->libdir.'/adminlib.php');
-    admin_externalpage_setup('langedit');
 
     //
     // Some local configuration
@@ -26,15 +24,28 @@
 
     $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');
 
-    admin_externalpage_print_header();
-
-    notify('NOTICE: This interface is obsolete now and will be removed. You should use 
-        improved <a href="lang.php?mode=helpfiles">lang.php</a> interface.');
+    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->dataroot/lang/$currentlang";
@@ -112,7 +123,7 @@
             for ($a=0; $a < count($pathparts)-1 ; $a++) {
                 $checkpath .= "/".$pathparts[$a];
                 if(!file_exists($checkpath)){
-                     if(!mkdir($checkpath, $CFG->directorypermissions)){
+                     if(!mkdir($checkpath)){
                          echo ("Cannot create directory: $checkpath");
                      }    
                 }    
@@ -160,10 +171,7 @@ $langdir/$currentfile")."</font></p>";
         echo htmlspecialchars(file_get_contents("$enlangdir/$currentfile"));
         echo "</textarea>\n";
         //link_to_popup_window("/lang/en_utf8/$currentfile", "popup", get_string("preview"));
-        $preview_url = langdoc_preview_url($currentfile);
-        if ($preview_url) {
-            link_to_popup_window($preview_url.'&amp;forcelang=en_utf8', 'popup', get_string('preview'));
-        }
+        link_to_popup_window(help_preview_url($currentfile).'&amp;forcelang=en_utf8', 'popup', get_string('preview'));
         echo "</td>\n";
         if ($fileeditorinline == 1) {
             echo "</tr>\n<tr valign=\"center\">\n";
@@ -171,32 +179,30 @@ $langdir/$currentfile")."</font></p>";
         echo "<td align=\"center\">\n";
 
         if ($editable) {
-            echo "<form id=\"$currentfile\" action=\"langdoc.php\" method=\"post\">";
+            echo "<form name=\"$currentfile\" action=\"langdoc.php\" method=\"post\">";
             echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
             echo '<input type="hidden" name="currentfile" value="'.$currentfile.'" />';
-
-            echo "<textarea rows=\"$fileeditorrows\" cols=\"$fileeditorcols\" name=\"filedata\">\n";
-            if (file_exists("$langdir/$currentfile")) {
-                echo htmlspecialchars(file_get_contents("$langdir/$currentfile"));
-            } else {
-                echo ($filetemplate);
-            }
-            echo "</textarea>\n";
-            $preview_url = langdoc_preview_url($currentfile);
-            if ($preview_url) {
-                link_to_popup_window($preview_url, 'popup', get_string('preview'));
-            }
-            echo '<div class="mdl-align"><input type="submit" value="'.get_string('savechanges').': lang/'.$currentlang.'/'.$currentfile.'" /></div>';
-            echo '</form>';
         }
 
+        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(help_preview_url($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);
     }
 
-    admin_externalpage_print_footer();
+    print_footer();
 
 //////////////////////////////////////////////////////////////////////
 
@@ -234,26 +240,18 @@ function langdoc_save_file($path, $file, $content) {
     return true;
 }
 
-/**
- * Return a preview URL for the file, if available.
- *
- * Documentation will be moved into moodle.org wiki and current version 1.6 does not
- * seem to be able to display local documentation. Thus, return empty URL for doc files.
- * See lib/moodlelib.php document_file() - it still relies on old pre-UTF8 lang/ location.
- */
-function langdoc_preview_url($currentfile) {
+
+function help_preview_url($currentfile) {
     if (substr($currentfile, 0, 5) == 'help/') {
         $currentfile = substr($currentfile, 5);
-        $currentpathexp = explode('/', $currentfile);
-        if (count($currentpathexp) > 1) {
-            $url = '/help.php?module='.implode('/',array_slice($currentpathexp,0,count($currentpathexp)-1)).'&amp;file='.end($currentpathexp); 
-        } else {
-            $url = '/help.php?module=moodle&amp;file='.$currentfile;
-        }
+    }
+    $currentpathexp = explode('/', $currentfile);
+    if (count($currentpathexp) > 1) {
+        $url = '/help.php?module='.$currentpathexp[0].'&amp;file='.$currentpathexp[1];
     } else {
-        $url = '';
+        $url = '/help.php?module=moodle&amp;file='.$currentfile;
     }
     return $url;
 }
 
-?>
+?>

admin/langimport.php

@@ -5,106 +5,108 @@
 ///This helps to avoid confusion.
 
     require_once('../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)) {
-        admin_externalpage_print_header();
-        print_box(get_string('langimportdisabled', 'admin'));
-        print_footer();
-        die;
-    }
 
     $mode          = optional_param('mode', 0, PARAM_INT);     //phase
-    $pack          = optional_param('pack', array(), PARAM_FILE);   //pack to install
+    $pack          = optional_param('pack', '', PARAM_FILE);   //pack to install
     $displaylang   = $pack;
     $uninstalllang = optional_param('uninstalllang', '', PARAM_FILE);
     $confirm       = optional_param('confirm', 0, PARAM_BOOL);
     $sitelang      = optional_param('sitelangconfig', '', PARAM_FILE);
 
     define('INSTALLATION_OF_SELECTED_LANG', 2);
+    define('CHANGE_SITE_LANG', 3);
     define('DELETION_OF_SELECTED_LANG', 4);
     define('UPDATE_ALL_LANG', 5);
 
-    $strlang         = get_string('langimport','admin');
-    $strlanguage     = get_string('language');
-    $strthislanguage = get_string('thislanguage');
-    $title           = $strlang;
+    require_login();
 
-    //reset and diagnose lang cache permissions
-    @unlink($CFG->dataroot.'/cache/languages');
-    if (file_exists($CFG->dataroot.'/cache/languages')) {
-        error('Language cache can not be deleted, please fix permissions in dataroot/cache/languages!');
+    if (!isadmin()) {
+        error('You must be an admin');
     }
-    get_list_of_languages(true); //refresh lang cache
-
-    $notice_ok     = array();
-    $notice_error = array();
+    
+    if (!$site = get_site()) {
+        error("Site not defined!");
+    }
+    
+    $strlang = get_string('langimport','admin');
+    
+    $stradministration = get_string("administration");
+    $strconfiguration = get_string("configuration");
+    $strlanguage = get_string("language");
+    $strthislanguage = get_string("thislanguage");
+    $title = $strlang;
+    
+    print_header("$site->shortname: $title", "$site->fullname",
+                 "<a href=\"index.php\">$stradministration</a> -> ".
+                 "<a href=\"configure.php\">$strconfiguration</a> -> ".
+                 "<a href=\"lang.php\">$strlanguage</a> -> $strlang",
+                 '', '', true, '');
+    
+    print_heading('');
 
     switch ($mode){
-
+    
         case INSTALLATION_OF_SELECTED_LANG:    ///installation of selected language pack
+        
+            if (confirm_sesskey()) {
+                @mkdir ($CFG->dataroot.'/temp/');    //make it in case it's a fresh install, it might not be there
+                @mkdir ($CFG->dataroot.'/lang/');
+                
+                require_once($CFG->libdir.'/componentlib.class.php');
+                if ($cd = new component_installer('http://download.moodle.org', 'lang16',
+                                                    $pack.'.zip', 'languages.md5', 'lang')) {
+                    $status = $cd->install(); //returns ERROR | UPTODATE | INSTALLED
+                    switch ($status) {
 
-            if (confirm_sesskey() and !empty($pack)) {
-                set_time_limit(0);
-                @mkdir ($CFG->dataroot.'/temp/', $CFG->directorypermissions);    //make it in case it's a fresh install, it might not be there
-                @mkdir ($CFG->dataroot.'/lang/', $CFG->directorypermissions);
+                        case ERROR:
+                            if ($cd->get_error() == 'remotedownloadnotallowed') {
+                                $a = new stdClass();
+                                $a->url = 'http://download.moodle.org/lang16/'.$pack.'zip';
+                                $a->dest= $CFG->dataroot.'/lang';
+                                error(get_string($cd->get_error(), 'error', $a));
+                            } else {
+                                error(get_string($cd->get_error(), 'error'));
+                            }
+                        break;
 
-                if (is_array($pack)) {
-                    $packs = $pack;
-                } else {
-                    $packs = array($pack);
-                }
+                        case INSTALLED:
+                            @unlink($CFG->dataroot.'/cache/languages');
+                            redirect('langimport.php', get_string('langpackupdated','admin',$pack));
+                        break;
 
-                foreach ($packs as $pack) {
-                    if ($cd = new component_installer('http://download.moodle.org', 'lang16',
-                                                        $pack.'.zip', 'languages.md5', 'lang')) {
-                        $status = $cd->install(); //returns COMPONENT_(ERROR | UPTODATE | INSTALLED)
-                        switch ($status) {
+                        case UPTODATE:
+                        break;
 
-                            case COMPONENT_ERROR:
-                                if ($cd->get_error() == 'remotedownloaderror') {
-                                    $a = new object();
-                                    $a->url = 'http://download.moodle.org/lang16/'.$pack.'.zip';
-                                    $a->dest= $CFG->dataroot.'/lang';
-                                    print_error($cd->get_error(), 'error', 'langimport.php', $a);
-                                } else {
-                                    print_error($cd->get_error(), 'error', 'langimport.php');
-                                }
-                            break;
-
-                            case COMPONENT_INSTALLED:
-                                $notice_ok[] = get_string('langpackinstalled','admin',$pack);
-                            break;
-
-                            case COMPONENT_UPTODATE:
-                            break;
-
-                        }
-                    } else {
-                        notify('Had an unspecified error with the component installer, sorry.');
                     }
+                } else {
+                    notify('Had an unspecified error with the component installer, sorry.');
                 }
             }
         break;
 
+        case CHANGE_SITE_LANG:    //change site language
+
+            if (confirm_sesskey()) {
+                $langconfig = get_record('config','name','lang');
+                $langconfig->value = $sitelang;
+                if (!empty($sitelang) && update_record('config',$langconfig)){
+                    redirect('langimport.php', get_string('sitelangchanged','admin'));
+                } else {
+                    error('Could not update the default site language!');
+                }
+            }
+
+        break;
         case DELETION_OF_SELECTED_LANG:    //delete a directory(ies) containing a lang pack completely
 
-            if ($uninstalllang == 'en_utf8') {
-                $notice_error[] = 'en_utf8 can not be uninstalled!';
-
-            } else if (!$confirm && confirm_sesskey()) {
-                admin_externalpage_print_header();
-                notice_yesno(get_string('uninstallconfirm', 'admin', $uninstalllang),
-                             'langimport.php?mode='.DELETION_OF_SELECTED_LANG.'&amp;uninstalllang='.$uninstalllang.'&amp;confirm=1&amp;sesskey='.sesskey(),
+            if (!$confirm && confirm_sesskey()) {
+                notice_yesno(get_string('uninstallconfirm', 'admin', $uninstalllang), 
+                             'langimport.php?mode=4&amp;uninstalllang='.$uninstalllang.'&amp;confirm=1&amp;sesskey='.sesskey(),
                              'langimport.php');
-                print_footer();
-                die;
-
             } else if (confirm_sesskey()) {
+                if ($uninstalllang == 'en_utf8') {
+                    error ('en_utf8 can not be uninstalled!');
+                }
                 $dest1 = $CFG->dataroot.'/lang/'.$uninstalllang;
                 $dest2 = $CFG->dirroot.'/lang/'.$uninstalllang;
                 $rm1 = false;
@@ -115,30 +117,31 @@
                 if (file_exists($dest2)){
                     $rm2 = remove_dir($dest2);
                 }
-                get_list_of_languages(true); //refresh lang cache
                 //delete the direcotries
                 if ($rm1 or $rm2) {
-                    $notice_ok[] = get_string('langpackremoved','admin');
+                    redirect('langimport.php', 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';
+                    error('An error has occurred, language pack is not completely uninstalled, please check file permissions');
                 }
             }
+            @unlink($CFG->dataroot.'/cache/languages');
         break;
-
+        
         case UPDATE_ALL_LANG:    //1 click update for all updatable language packs
-            set_time_limit(0);
 
             //0th pull a list from download.moodle.org,
             //key = langname, value = md5
+            $source = 'http://download.moodle.org/lang16/languages.md5';
             $md5array = array();
             $updated = 0;    //any packs updated?
-            $alllangs = array_keys(get_list_of_languages(false, true)); //get all available langs
+            unset($CFG->langlist);   // ignore admin's langlist
+            $alllangs = array_keys(get_list_of_languages());
             $lang16 = array();   //all the Moodle 1.6 unicode lang packs (updated and not updated)
             $packs = array();    //all the packs that needs updating
 
 
-            if (!$availablelangs = get_remote_list_of_languages()) {
-                print_error('cannotdownloadlanguageupdatelist');
+            if (!$availablelangs = proxy_url($source)) {
+                error ('can not read from course');
             }
 
             //and build an associative array
@@ -146,12 +149,8 @@
                 $md5array[$alang[0]] = $alang[1];
             }
 
-            //filtering out non-16 and unofficial packs
+            //filtering out non-16 packs
             foreach ($alllangs 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;
 
@@ -167,13 +166,12 @@
                 }
             }
 
-            @mkdir ($CFG->dataroot.'/temp/', $CFG->directorypermissions);
-            @mkdir ($CFG->dataroot.'/lang/', $CFG->directorypermissions);
+            @mkdir ($CFG->dataroot.'/temp/');
+            @mkdir ($CFG->dataroot.'/lang/');
             foreach ($packs as $pack){    //for each of the remaining in the list, we
                 if ($pack == 'en_utf8') {    // no update for en_utf8
                     continue;
                 }
-
                 //1. delete old director(ies)
 
                 $dest1 = $CFG->dataroot.'/lang/'.$pack;
@@ -181,40 +179,38 @@
                 $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.';
-                        continue;
-                    }
+                    $rm1 = remove_dir($dest1);
                 }
                 if (file_exists($dest2)) {
-                    if (!remove_dir($dest2)) {
-                        $notice_error[] = 'Could not delete old directory '.$dest2.', update of '.$pack.' failed, please check permissions.';
-                        continue;
-                    }
+                    $rm2 = remove_dir($dest2);
+                }
+                if (!($rm1 || $rm2)) {
+                    error ('could not delete old directory, update failed');
                 }
 
                 //2. copy & unzip into new
 
+                require_once($CFG->libdir.'/componentlib.class.php');
                 if ($cd = new component_installer('http://download.moodle.org', 'lang16',
                                        $pack.'.zip', 'languages.md5', 'lang')) {
-                $status = $cd->install(); //returns COMPONENT_(ERROR | UPTODATE | INSTALLED)
+                $status = $cd->install(); //returns ERROR | UPTODATE | INSTALLED
                 switch ($status) {
 
-                    case COMPONENT_ERROR:
-                        if ($cd->get_error() == 'remotedownloaderror') {
+                    case ERROR:
+                        if ($cd->get_error() == 'remotedownloadnotallowed') {
                             $a = new stdClass();
-                            $a->url = 'http://download.moodle.org/lang16/'.$pack.'.zip';
+                            $a->url = 'http://download.moodle.org/lang16/'.$pack.'zip';
                             $a->dest= $CFG->dataroot.'/lang';
-                            print_error($cd->get_error(), 'error', "", $a); // not probable
+                            error(get_string($cd->get_error(), 'error', $a));
                         } else {
-                            print_error($cd->get_error(), 'error'); // not probable
+                            error(get_string($cd->get_error(), 'error'));
                         }
                     break;
-                    case COMPONENT_UPTODATE:
+                    case UPTODATE:
                         //Print error string or whatever you want to do
                     break;
-                    case COMPONENT_INSTALLED:
-                        $notice_ok[] = get_string('langpackupdated', 'admin', $pack);
+                    case INSTALLED:
+                        notify(get_string('langpackupdated','admin',$pack), 'notifysuccess');
                         $updated = true;
                         //Print/do whatever you want
                     break;
@@ -226,187 +222,158 @@
             }
 
             if ($updated) {
-                $notice_ok[] = get_string('langupdatecomplete','admin');
+                notice(get_string('langupdatecomplete','admin'), 'langimport.php');
             } else {
-                $notice_ok[] = get_string('nolangupdateneeded','admin');
+                notice(get_string('nolangupdateneeded','admin'), 'langimport.php');
             }
 
         break;
+        
+        default:    //display choice mode
+
+            $source = 'http://download.moodle.org/lang16/languages.md5';
+            $remote = 0;    //flag for reading from remote or local
+
+            if ($availablelangs = proxy_url($source)) {
+                $remote = 1;
+            } else {
+                $availablelangs = get_local_list_of_languages();
+            }
+/*
+            if ($fp = fopen($source, 'r')){    /// attempt to get the list from Moodle.org.
+                while(!feof ($fp)) {
+                    $availablelangs[] = split(',', fgets($fp,1024));
+                }
+                $remote = 1;    //can read from download.moodle.org
+            } else {    /// fopen failed, we find local copy of list.
+                $availablelangs = get_local_list_of_languages();
+            }
+*/
+            if (!$remote) {
+                print_simple_box_start('center','60%');
+                echo '<div align="center">';
+                print_string('remotelangnotavailable','admin',$CFG->dataroot.'/lang/');
+                echo '</div>';
+                print_simple_box_end();
+            }
+            
+            print_simple_box_start('center','60%');
+            echo '<table width="100%"><tr><td align="center">';
+            echo get_string('installedlangs','admin');
+            echo '</td><td align="center">';
+            echo get_string('availablelangs','admin');
+            echo '</td></tr>';
+            echo '<tr><td align="center" valign="top">';
+            echo '<form name="uninstallform" action="langimport.php?mode=4" method="POST">';
+            echo '<input name="sesskey" type="hidden" value="'.sesskey().'" />';
+            unset($CFG->langlist);   // ignore admin's langlist
+            $installedlangs = get_list_of_languages();
+
+            /// display installed langs here
+
+            echo '<select name="uninstalllang" size="15">';
+            foreach ($installedlangs as $clang =>$ilang){
+                echo '<option value="'.$clang.'">'.$ilang.'</option>';
+            }
+            echo '</select>';
+            echo '<br /><input type="submit" value="'.get_string('uninstall','admin').'" />';
+            echo '</form>';
+            echo '<form name="updateform" action="langimport.php?mode=5" method="POST">';
+            echo '<br /><input type="submit" value="'.get_string('updatelangs','admin').'" />';
+            echo '</form>';
+            echo '<p />';
+            
+            /// Display option to change site language
+            
+            print_string('changesitelang','admin');
+            $sitelanguage = get_record('config','name','lang');
+            echo '<form name="changelangform" action="langimport.php?mode=3" method="POST">';
+            echo '<select name="sitelangconfig">';
+            
+            foreach ($installedlangs as $clang =>$ilang) {
+                if ($clang == $sitelanguage->value){
+                    echo '<option value="'.$clang.'" selected="selected">'.$ilang.'</option>';
+                } else {
+                    echo '<option value="'.$clang.'">'.$ilang.'</option>';
+                }
+            }
+            echo '</select>';
+            echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
+            echo '<input type="submit" value="'.get_string('change','admin').'" />';
+            echo '</form>';
+
+            /// display to be installed langs here
+
+            echo '</td><td align="center" valign="top">';
+            echo '<table><tr><td valign="top" align="center">';    //availabe langs table
+            $empty = 1;    //something to pring
+
+            /// if this language pack is not already installed, then we allow installation
+
+            echo '<form name="installform" method="POST" action="langimport.php?mode=2">';
+            echo '<input name="sesskey" type="hidden" value="'.sesskey().'" />';
+            if ($remote) {
+                echo '<select name="pack" size="15">';
+            }
+
+            foreach ($availablelangs as $alang) {
+                if (trim($alang[0]) != "en_utf8") {
+                    if ($remote){
+                        if (substr($alang[0], -5) == '_utf8') {   //Remove the _utf8 suffix from the lang to show
+                            $shortlang = substr($alang[0], 0, -5);
+                        } else {
+                            $shortlang = $alang[0];
+                        }
+                        if (!is_installed_lang($alang[0], $alang[1])){    //if not already installed
+                            echo '<option value="'.$alang[0].'">'.$alang[2].' ('.$shortlang.')</option>';
+                        }
+                    } else {    //print list in local format, and instruction to install
+                        echo '<tr><td>'.$alang[2].'</td><td><a href="http://download.moodle.org/lang16/'.$alang[0].'.zip">'.get_string('download','admin').'</a>';
+                    }
+                    $empty = 0;
+                }
+            }
+            if ($remote) {
+                echo '</select>';
+                echo '<br/ ><input type="submit" value="<-- '.get_string('install','admin').'">';
+            }
+            echo '</form>';
+
+            if ($empty) {
+                echo '<tr><td align="center">';
+                print_string('nolanguagetodownload','admin');
+                echo '</td></tr>';
+            }
+
+            echo '</td><tr></table>';    //close available langs table
+            echo '<form>';
+            echo '</td></tr></table>';
+            print_simple_box_end();
+
+        break;
+
     }    //close of main switch
 
-
-    admin_externalpage_print_header();
-
-    $installedlangs = get_list_of_languages(true, true);
-
-    $missingparents = array();
-    $oldlang = isset($SESSION->lang) ? $SESSION->lang : null; // override current lang
-
-    foreach($installedlangs as $l=>$unused) {
-        $SESSION->lang = $l;
-        $parent = get_string('parentlanguage');
-        if ($parent == 'en_utf8') {
-            continue;
-        }
-        if (strpos($parent, '[[') !== false) {
-            continue; // no parent
-        }
-        if (!isset($installedlangs[$parent])) {
-            $missingparents[$l] = $parent;
-        }
-    }
-    if (isset($oldlang)) {
-        $SESSION->lang = $oldlang;
-    } else {
-        unset($SESSION->lang);
-    }
-
-    if ($availablelangs = get_remote_list_of_languages()) {
-        $remote = 1;
-    } else {
-        $remote = 0;    //flag for reading from remote or local
-        $availablelangs = get_local_list_of_languages();
-    }
-
-    if (!$remote) {
-        print_box_start();
-        print_string('remotelangnotavailable', 'admin', $CFG->dataroot.'/lang/');
-        print_box_end();
-    }
-
-    if ($notice_ok) {
-        $info = implode('<br />', $notice_ok);
-        notify($info, 'notifysuccess');
-    }
-
-    if ($notice_error) {
-        $info = implode('<br />', $notice_error);
-        notify($info, 'notifyproblem');
-    }
-
-    if ($missingparents) {
-        foreach ($missingparents as $l=>$parent) {
-            $a = new object();
-            $a->lang   = $installedlangs[$l];
-            $a->parent = $parent;
-            foreach ($availablelangs as $alang) {
-                if ($alang[0] == $parent) {
-                    if (substr($alang[0], -5) == '_utf8') {   //Remove the _utf8 suffix from the lang to show
-                        $shortlang = substr($alang[0], 0, -5);
-                    } else {
-                        $shortlang = $alang[0];
-                    }
-                    $a->parent = $alang[2].' ('.$shortlang.')';
-                }
-            }
-            $info = get_string('missinglangparent', 'admin', $a);
-            notify($info, 'notifyproblem');
-        }
-    }
-
-    print_box_start();
-    echo '<table summary="">';
-    echo '<tr><td align="center" valign="top">';
-    echo '<form id="uninstallform" action="langimport.php?mode='.DELETION_OF_SELECTED_LANG.'" method="post">';
-    echo '<fieldset class="invisiblefieldset">';
-    echo '<input name="sesskey" type="hidden" value="'.sesskey().'" />';
-
-    /// display installed langs here
-
-    echo '<label for="uninstalllang">'.get_string('installedlangs','admin')."</label><br />\n";
-    echo '<select name="uninstalllang" id="uninstalllang" size="15">';
-    foreach ($installedlangs as $clang =>$ilang){
-        echo '<option value="'.$clang.'">'.$ilang.'</option>';
-    }
-    echo '</select>';
-    echo '<br /><input type="submit" value="'.get_string('uninstall','admin').'" />';
-    echo '</fieldset>';
-    echo '</form>';
-
-    if ($remote) {
-        echo '<form id="updateform" action="langimport.php?mode='.UPDATE_ALL_LANG.'" method="post">';
-        echo '<div>';
-        echo '<br /><input type="submit" value="'.get_string('updatelangs','admin').'" />';
-        echo '</div>';
-        echo '</form>';
-    }
-
-    /// Display option to change site language
-
-    /// display to be installed langs here
-
-    echo '</td><td align="center" valign="top">';
-    //availabe langs table
-    $empty = 1;    //something to pring
-
-    /// if this language pack is not already installed, then we allow installation
-
-    echo '<form id="installform" method="post" action="langimport.php?mode='.INSTALLATION_OF_SELECTED_LANG.'">';
-    echo '<fieldset class="invisiblefieldset">';
-    echo '<input name="sesskey" type="hidden" value="'.sesskey().'" />';
-    echo '<label for="pack">'.get_string('availablelangs','admin')."</label><br />\n";
-    if ($remote) {
-        echo '<select name="pack[]" id="pack" size="15" multiple="multiple">';
-    }
-
-    foreach ($availablelangs as $alang) {
-        if ($alang[0] == '') {
-            continue;
-        }
-        if (trim($alang[0]) != "en_utf8") {
-            if ($remote) {
-                if (substr($alang[0], -5) == '_utf8') {   //Remove the _utf8 suffix from the lang to show
-                    $shortlang = substr($alang[0], 0, -5);
-                } else {
-                    $shortlang = $alang[0];
-                }
-                if (!is_installed_lang($alang[0], $alang[1])){    //if not already installed
-                    echo '<option value="'.$alang[0].'">'.$alang[2].' ('.$shortlang.')</option>';
-                }
-            } else {    //print list in local format, and instruction to install
-                echo '<tr><td>'.$alang[2].'</td><td><a href="http://download.moodle.org/lang16/'.$alang[0].'.zip">'.get_string('download','admin').'</a></td></tr>';
-            }
-            $empty = 0;
-        }
-    }
-    if ($remote) {
-        echo '</select>';
-        echo '<br /><input type="submit" value="'.$THEME->larrow.' '.get_string('install','admin').'" />';
-    }
-    echo '</fieldset>';
-    echo '</form>';
-
-    if ($empty) {
-        echo '<br />';
-        print_string('nolanguagetodownload','admin');
-    }
-
-    //close available langs table
-    echo '</td></tr></table>';
-    print_box_end();
-
-    admin_externalpage_print_footer();
-
-    /**
-     * Returns a list of available language packs from a
+    print_footer();
+    
+    /* returns a list of available language packs from a
      * local copy shipped with standard moodle distro
-     * this is for site that can't download components.
+     * this is for site that can't perform fopen
      * @return array
      */
     function get_local_list_of_languages() {
         global $CFG;
-        $source = $CFG->dirroot.'/lib/languages.md5';
+        $source = $CFG->wwwroot.'/lib/languages.md5';
         $availablelangs = array();
-        if ($fp = fopen($source, 'r')) {
+        if ($fp = fopen($source, 'r')){
             while(!feof ($fp)) {
                 $availablelangs[] = split(',', fgets($fp,1024));
             }
         }
         return $availablelangs;
     }
-
-    /**
-     * checks the md5 of the zip file, grabbed from download.moodle.org,
+    
+    /* 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
@@ -420,27 +387,38 @@
         }
         return false;
     }
+    
+    //returns an array of languages, or false if can not read from source
+    //uses a socket if proxy is set as a config variable
+    function proxy_url($url) {
+        global $CFG;
 
-    /**
-     * Returns the latest list of available language packs from
-     * moodle.org
-     * @return array or false if can not download
-     */
-    function get_remote_list_of_languages() {
-        $source = 'http://download.moodle.org/lang16/languages.md5';
-        $availablelangs = array();
+        if ($CFG->proxyhost && $CFG->proxyport) {
 
-        if ($content = download_file_content($source)) {
-            $alllines = split("\n", $content);
-            foreach($alllines as $line) {
-                if (!empty($line)){
-                    $availablelangs[] = split(',', $line);
-                }
+            $proxy_fp = fsockopen($CFG->proxyhost, $CFG->proxyport);
+            if (!$proxy_fp) {
+                return false;    //failed
             }
-            return $availablelangs;
+            fputs($proxy_fp, "GET $url HTTP/1.0\r\nHost: $CFG->proxyhost\r\n\r\n");
+            $i = 0;
+                while(!feof($proxy_fp)) {
+                $string = fgets($proxy_fp, 1024);
+                if ($i > 11) {    //12 lines of info skipped
+                    $availablelangs[] = split(',', $string);
+                }
+                $i++;
+            }
+            fclose($proxy_fp);
 
-        } else {
-            return false;
+        } else {    //proxy not in use
+            if ($fp = fopen($url, 'r')){    /// attempt to get the list from Moodle.org.
+                while(!feof ($fp)) {
+                    $availablelangs[] = split(',', fgets($fp,1024));
+                }
+            } else {    /// fopen failed, return false.
+                return false;
+            }
         }
+        return $availablelangs;
     }
 ?>

admin/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_somethting() 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

@@ -2,11 +2,14 @@
       // Enables/disables maintenance mode
 
     require('../config.php');
-    require_once($CFG->libdir.'/adminlib.php');
 
     $action = optional_param('action', '', PARAM_ALPHA);
 
-    admin_externalpage_setup('maintenancemode');
+    require_login();
+
+    if (!isadmin()) {
+        error('You need to be admin to use this page');
+    }
 
     //Check folder exists
     if (! make_upload_directory(SITEID)) {   // Site folder
@@ -19,60 +22,57 @@
         if (confirm_sesskey()) {
             if ($form->action == "disable") {
                 unlink($filename);
-                redirect('maintenance.php', get_string('sitemaintenanceoff','admin'));
+                redirect('index.php', get_string('sitemaintenanceoff','admin'));
             } else {
                 $file = fopen($filename, 'w');
                 fwrite($file, stripslashes($form->text));
                 fclose($file);
-                redirect('maintenance.php', get_string('sitemaintenanceon', 'admin'));
+                redirect('index.php', get_string('sitemaintenanceon', 'admin'));
             }
         }
     }
 
 /// Print the header stuff
 
-    admin_externalpage_print_header();
+    $strmaintenance = get_string('sitemaintenancemode', 'admin');
+    $stradmin = get_string('administration');
+    $strconfiguration = get_string('configuration');
 
-    print_heading(get_string('sitemaintenancemode', 'admin'));
+    print_header("$SITE->shortname: $strmaintenance", $SITE->fullname,
+                  "<a href=\"index.php\">$stradmin</a> -> ".
+                  "<a href=\"configure.php\">$strconfiguration</a> -> $strmaintenance");
 
-    print_box_start();
+    print_heading($strmaintenance);
 
 /// Print the appropriate form
 
     if (file_exists($filename)) {   // We are in maintenance mode
-        echo '<div class="buttons">';
-        echo '<p>'.get_string('sitemaintenanceon', 'admin').'</p>';
+        echo '<center>';
         echo '<form action="maintenance.php" method="post">';
-        echo '<div>';
-        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 '</div>';
+        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 '</div>';
+        echo '</center>';
     } else {                        // We are not in maintenance mode
         $usehtmleditor = can_use_html_editor();
 
-        echo '<div class="buttons">';
+        echo '<center>';
         echo '<form action="maintenance.php" method="post">';
-        echo '<div>';
-        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 '<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 '<div class="editor" style="width:600px;">';  // contains the editor
+        echo '<table><tr><td>';
         print_textarea($usehtmleditor, 20, 50, 600, 400, "text");
-        echo '</div>';
-        echo '</div>';
+        echo '</td></tr></table>';
         echo '</form>';
-        echo '</div>';
+        echo '</center>';
 
         if ($usehtmleditor) { 
             use_html_editor();
         }
     }
 
-    print_box_end();
-
-    admin_externalpage_print_footer();
+    print_footer();
 ?>

admin/mnet/MethodTable.php

@@ -1,583 +0,0 @@
-<?php
-/**
- * Adapted for Moodle from the AMFPHP Project at http://www.amfphp.org/
- * Creates the methodTable for a service class.
- *
- * @usage $this->methodTable = MethodTable::create($this);
- * @author Christophe Herreman
- * @since 05/01/2005
- * @version $id$
- * 
- * Special contributions by Allessandro Crugnola and Ted Milker
- */
-
-if (!defined('T_ML_COMMENT')) {
-   define('T_ML_COMMENT', T_COMMENT);
-} else {
-   define('T_DOC_COMMENT', T_ML_COMMENT);
-}
-
-/**
- * Return string from start of haystack to first occurance of needle, or whole 
- * haystack, if needle does not occur
- *
- * @access public
- * @param $haystack(String) Haystack to search in
- * @param $needle(String) Needle to look for
- */
-function strrstr($haystack, $needle)
-{
-    return substr($haystack, 0, strpos($haystack.$needle,$needle));
-}
-
-/**
- * Return substring of haystack from end of needle onwards, or FALSE
- *
- * @access public
- * @param $haystack(String) Haystack to search in
- * @param $needle(String) Needle to look for
- */
-function strstrafter($haystack, $needle)
-{
-    return substr(strstr($haystack, $needle), strlen($needle));
-}
-
-class MethodTable
-{
-    /**
-     * Constructor.
-     *
-     * Since this class should only be accessed through the static create() method
-     * this constructor should be made private. Unfortunately, this is not possible
-     * in PHP4.
-     *
-     * @access private
-     */
-    function MethodTable(){
-    }
-
-
-    /**
-     * Creates the methodTable for a passed class.
-     *
-     * @static
-     * @access public
-     * @param $sourcePath(String) The path to the file you want to parse
-     * @param $containsClass(Bool) True if the file is a class definition (optional)
-     */
-    function create($sourcePath, $containsClass = false){
-
-        $methodTable = array();
-        if(!file_exists($sourcePath))
-        {
-            return false;
-        }
-        
-        $source = file_get_contents($sourcePath);
-        $tokens = (array)token_get_all($source);
-        
-        $waitingForOpenParenthesis = false;
-        $waitingForFunction = false;
-        $waitingForClassName = false;
-        $bufferingArgs = false;
-        $argBuffer = "";
-        $lastFunction = "";
-        $lastFunctionComment = "";
-        $lastComment = "";
-        $classMethods = array();
-        $realClassName = "";
-
-        if($containsClass) {
-            $openBraces = -10000;
-        }
-        else
-        {
-            $openBraces = 1;
-        }
-
-        $waitingForEndEncapsedString = false;
-        foreach($tokens as $token)
-        {
-           if (is_string($token)) {
-                if($token == '{')
-                {
-                    $openBraces++;
-                }
-                if($token == '}')
-                {
-                    if($waitingForEndEncapsedString)
-                    {
-                        $waitingForEndEncapsedString = false;
-                    }
-                    else
-                    {
-                        $lastComment = '';
-                        $openBraces--;
-                        
-                        if($openBraces == 0)
-                        {
-                            break;
-                        }
-                    }
-                }
-                elseif($waitingForOpenParenthesis && $token == '(')
-                {
-                    $bufferingArgs = true;
-                    $argBuffer = "";
-                    $waitingForOpenParenthesis = false;
-                }
-                elseif($bufferingArgs)
-                {
-                    if($token != ')')
-                    {
-                        $argBuffer .= $token;
-                    }
-                    else
-                    {
-                        if($lastFunction != $realClassName)
-                        {
-                            $classMethods[] = array("name" => $lastFunction,
-                                               "comment" => $lastFunctionComment,
-                                               "args" => $argBuffer);
-                            
-                            $bufferingArgs = false;
-                            $argBuffer = "";
-                            $lastFunction = "";
-                            $lastFunctionComment = "";
-                        }
-                    }
-                    
-                }
-           } else {
-               // token array
-               list($id, $text) = $token;
-                
-                if($bufferingArgs)
-                {
-                    $argBuffer .= $text;                    
-                }
-               switch ($id) 
-               {
-                    
-                   case T_COMMENT:
-                   case T_ML_COMMENT: // we've defined this
-                   case T_DOC_COMMENT: // and this
-                   // no action on comments
-                        $lastComment = $text;
-                        break;
-                   case T_FUNCTION:
-                        if($openBraces >= 1)
-                        {
-                            $waitingForFunction = true;
-                        }
-                        break;
-                    case T_STRING:
-                        if($waitingForFunction)
-                        {
-                            $waitingForFunction = false;
-                            $waitingForOpenParenthesis = true;
-                            $lastFunction = $text;
-                            $lastFunctionComment = $lastComment;
-                            $lastComment = "";              
-                        }
-                        if($waitingForClassName)
-                        {
-                            $waitingForClassName = false;
-                            $realClassName = $text;
-                        }
-                        break;
-                    case T_CLASS:
-                        $openBraces = 0;
-                        $waitingForClassName = true;
-                        break;
-                    case T_CURLY_OPEN:
-                    case T_DOLLAR_OPEN_CURLY_BRACES:
-                        $waitingForEndEncapsedString = true;
-                        break;
-                }
-            }
-        }
-        
-        foreach ($classMethods as $key => $value) {
-            $methodSignature = $value['args'];
-            $methodName = $value['name'];
-            $methodComment = $value['comment'];
-            
-            $description = MethodTable::getMethodDescription($methodComment) . " " . MethodTable::getMethodCommentAttribute($methodComment, "desc");
-            $description = trim($description);
-            $access = MethodTable::getMethodCommentAttributeFirstWord($methodComment, "access");
-            $roles = MethodTable::getMethodCommentAttributeFirstWord($methodComment, "roles");
-            $instance = MethodTable::getMethodCommentAttributeFirstWord($methodComment, "instance");
-            $returns = MethodTable::getMethodReturnValue($methodComment);
-            $pagesize = MethodTable::getMethodCommentAttributeFirstWord($methodComment, "pagesize");
-            $params = MethodTable::getMethodCommentArguments($methodComment);
-
-                        
-            //description, arguments, access, [roles, [instance, [returns, [pagesize]]]]
-            $methodTable[$methodName] = array();
-            //$methodTable[$methodName]["signature"] = $methodSignature; //debug purposes
-            $methodTable[$methodName]["description"] = ($description == "") ? "No description given." : $description;
-            $methodTable[$methodName]["arguments"] = MethodTable::getMethodArguments($methodSignature, $params);
-            $methodTable[$methodName]["access"] = ($access == "") ? "private" : $access;
-
-            if($roles != "") $methodTable[$methodName]["roles"] = $roles;
-            if($instance != "") $methodTable[$methodName]["instance"] = $instance;
-            if($returns != "") $methodTable[$methodName]["returns"] = $returns;
-            if($pagesize != "") $methodTable[$methodName]["pagesize"] = $pagesize;
-        }
-        
-        return $methodTable;
-        
-    }
-    
-    /**
-     * 
-     */   
-    function getMethodCommentServices($comment)
-    {
-        $pieces = explode('@service', $comment);
-        $args = array();
-        if(is_array($pieces) && count($pieces) > 1)
-        {
-            for($i = 0; $i < count($pieces) - 1; $i++)
-            {
-                $ps = strrstr($pieces[$i + 1], '@');
-                $ps = strrstr($ps, '*/');
-                $args[] = MethodTable::cleanComment($ps);
-            }
-        }
-        return $args;
-    }
-    
-    
-    /**
-     * 
-     */
-    function getMethodCommentArguments($comment)
-    {
-        $pieces = explode('@param', $comment);
-        $args = array();
-        if(is_array($pieces) && count($pieces) > 1)
-        {
-            for($i = 0; $i < count($pieces) - 1; $i++)
-            {
-                $ps = strrstr($pieces[$i + 1], '@');
-                $ps = strrstr($ps, '*/');
-                $args[] = MethodTable::cleanComment($ps);
-            }
-        }
-        return $args;
-    }
-
-    
-    /**
-     * Returns the description from the comment.
-     * The description is(are) the first line(s) in the comment.
-     *
-     * @static
-     * @private
-     * @param $comment(String) The method's comment.
-     */
-    function getMethodDescription($comment){
-        $comment = MethodTable::cleanComment(strrstr($comment, "@"));
-        return trim($comment);
-    }
-    
-    
-    /**
-     * Returns the value of a comment attribute.
-     *
-     * @static
-     * @private
-     * @param $comment(String) The method's comment.
-     * @param $attribute(String) The name of the attribute to get its value from.
-     */
-    function getMethodCommentAttribute($comment, $attribute){
-        $pieces = strstrafter($comment, '@' . $attribute);
-        if($pieces !== FALSE)
-        {
-            $pieces = strrstr($pieces, '@');
-            $pieces = strrstr($pieces, '*/');
-            return MethodTable::cleanComment($pieces);
-        }
-        return "";
-    }
-    
-    /**
-     * Returns the value of a comment attribute.
-     *
-     * @static
-     * @private
-     * @param $comment(String) The method's comment.
-     * @param $attribute(String) The name of the attribute to get its value from.
-     */
-    function getMethodCommentAttributeFirstLine($comment, $attribute){
-        $pieces = strstrafter($comment, '@' . $attribute);
-        if($pieces !== FALSE)
-        {
-            $pieces = strrstr($pieces, '@');
-            $pieces = strrstr($pieces, "*");
-            $pieces = strrstr($pieces, "/");
-            $pieces = strrstr($pieces, "-");
-            $pieces = strrstr($pieces, "\n");
-            $pieces = strrstr($pieces, "\r");
-            $pieces = strrstr($pieces, '*/');
-            return MethodTable::cleanComment($pieces);
-        }
-        return "";
-    }
-    
-    /**
-     * Returns the value of a comment attribute.
-     *
-     * @static
-     * @private
-     * @param $comment(String) The method's comment.
-     * @param $attribute(String) The name of the attribute to get its value from.
-     */
-    function getMethodReturnValue($comment){
-        $result = array('type' => 'void', 'description' => '');
-        $pieces = strstrafter($comment, '@returns');
-        if(FALSE == $pieces) $pieces = strstrafter($comment, '@return');
-        if($pieces !== FALSE)
-        {
-            $pieces = strrstr($pieces, '@');
-            $pieces = strrstr($pieces, "*");
-            $pieces = strrstr($pieces, "/");
-            $pieces = strrstr($pieces, "-");
-            $pieces = strrstr($pieces, "\n");
-            $pieces = strrstr($pieces, "\r");
-            $pieces = strrstr($pieces, '*/');
-            $pieces = trim(MethodTable::cleanComment($pieces));
-            @list($result['type'], $result['description']) = explode(' ', $pieces, 2);
-            $result['type'] = MethodTable::standardizeType($result['type']);
-        }
-        return $result;
-    }
-    
-    function getMethodCommentAttributeFirstWord($comment, $attribute){
-        $pieces = strstrafter($comment, '@' . $attribute);
-        if($pieces !== FALSE)
-        {
-            $val = MethodTable::cleanComment($pieces);
-            return trim(strrstr($val, ' '));
-        }
-        return "";
-    }
-    
-    /**
-     * Returns an array with the arguments of a method.
-     *
-     * @static
-     * @access private
-     * @param $methodSignature(String) The method's signature;
-     */
-    function getMethodArguments($methodSignature, $commentParams){
-        if(strlen($methodSignature) == 0){
-            //no arguments, return an empty array
-            $result = array();
-        }else{
-            //clean the arguments before returning them
-            $result = MethodTable::cleanArguments(explode(",", $methodSignature), $commentParams);
-        }
-        
-        return $result;
-    }
-    
-    /**
-     * Cleans the function or method's return value.
-     *
-     * @static
-     * @access private
-     * @param $value(String) The "dirty" value.
-     */
-    function cleanReturnValue($value){
-        $result = array();
-        $value  = trim($value);
-        
-        list($result['type'], $result['description']) = explode(' ', $value, 2);
-
-        $result['type'] = MethodTable::standardizeType($result['type']);
-
-        return $result;
-    }
-
-
-    /**
-     * Takes a string and returns the XMLRPC type that most closely matches it.
-     *
-     * @static
-     * @access private
-     * @param $type(String) The given type string.
-     */
-    function standardizeType($type) {
-        $type = strtolower($type);
-        if('str'  == $type || 'string'  == $type) return 'string';
-        if('int'  == $type || 'integer' == $type) return 'int';
-        if('bool' == $type || 'boolean' == $type) return 'boolean';
-        
-        // Note that object is not a valid XMLRPC type
-        if('object' == $type || 'class' == $type) return 'object';
-        if('float'  == $type || 'dbl'   == $type || 'double' == $type || 'flt' == $type) return 'double';
-
-        // Note that null is not a valid XMLRPC type. The null type can have 
-        // only one value - null.
-        if('null'   == $type) return 'null';
-
-        // Note that mixed is not a valid XMLRPC type
-        if('mixed'  == $type) return 'mixed';
-        if('array'  == $type || 'arr'    == $type) return 'array';
-        if('assoc'  == $type || 'struct' == $type) return 'struct';
-
-        // Note that this is not a valid XMLRPC type. As references cannot be 
-        // serialized or exported, there is no way this could be XML-RPCed.
-        if('reference' == $type || 'ref' == $type) return 'reference';
-        return 'string';
-    }
-    
-    /**
-     * Cleans the arguments array.
-     * This method removes all whitespaces and the leading "$" sign from each argument
-     * in the array.
-     *
-     * @static
-     * @access private
-     * @param $args(Array) The "dirty" array with arguments.
-     */
-    function cleanArguments($args, $commentParams){
-        $result = array();
-
-        if(!is_array($args)) return array();
- 
-        foreach($args as $index => $arg){
-            $arg = strrstr(str_replace(array('$','&$'), array('','&'), $arg), '=');
-            if(!isset($commentParams[$index]))
-            {
-                $result[] = trim($arg);
-            }
-            else
-            {
-                $start = trim($arg);
-                $end = trim(str_replace('$', '', $commentParams[$index]));
-                
-                // Suppress Notice of 'Undefined offset' with @ 
-                @list($word0, $word1, $tail) = preg_split("/[\s]+/", $end, 3);
-                $word0 = strtolower($word0);
-                $word1 = strtolower($word1);
-                
-                $wordBase0 = ereg_replace('^[&$]+','',$word0);
-                $wordBase1 = ereg_replace('^[&$]+','',$word1);
-                $startBase = strtolower(ereg_replace('^[&$]+','',$start));
-
-                if ($wordBase0 == $startBase) {
-                    $type = str_replace(array('(',')'),'', $word1);
-                } elseif($wordBase1 == $startBase) {
-                    $type = str_replace(array('(',')'),'', $word0);
-                } elseif( ereg('(^[&$]+)|(\()([a-z0-9]+)(\)$)', $word0, $regs) ) {
-                    $tail = str_ireplace($word0, '', $end);
-                    $type = $regs[3];
-                } else {
-                    // default to string
-                    $type = 'string';
-                }
-
-                $type = MethodTable::standardizeType($type);
-/*
-                if($type == 'str') {
-                    $type = 'string';
-                } elseif($type == 'int' || $type == 'integer') {
-                    $type = 'int';
-                } elseif($type == 'bool' || $type == 'boolean') {
-                    $type = 'boolean';
-                } elseif($type == 'object' || $type == 'class') {
-                    // Note that this is not a valid XMLRPC type
-                    $type = 'object';
-                } elseif($type == 'float' || $type == 'dbl' || $type == 'double' || $type == 'flt') {
-                    $type = 'double';
-                } elseif($type == 'null') {
-                    // Note that this is not a valid XMLRPC type
-                    // The null type can have only one value - null. Why would 
-                    // that be an argument to a function? Just in case:
-                    $type = 'null';
-                } elseif($type == 'mixed') {
-                    // Note that this is not a valid XMLRPC type
-                    $type = 'mixed';
-                } elseif($type == 'array' || $type == 'arr') {
-                    $type = 'array';
-                } elseif($type == 'assoc') {
-                    $type = 'struct';
-                } elseif($type == 'reference' || $type == 'ref') {
-                    // Note that this is not a valid XMLRPC type
-                    // As references cannot be serialized or exported, there is
-                    // no way this could be XML-RPCed.
-                    $type = 'reference';
-                } else {
-                    $type = 'string';
-                }
-*/
-                $result[] = array('type' => $type, 'description' => $start . ' - ' . $tail);
-            }
-        }
-
-        return $result;
-    }
-    
-    
-    /**
-     * Cleans the comment string by removing all comment start and end characters.
-     *
-     * @static
-     * @private
-     * @param $comment(String) The method's comment.
-     */
-    function cleanComment($comment){
-        $comment = str_replace("/**", "", $comment);
-        $comment = str_replace("*/", "", $comment);
-        $comment = str_replace("*", "", $comment);
-        $comment = str_replace("\n", "\\n", trim($comment));
-        $comment = eregi_replace("[\r\t\n ]+", " ", trim($comment));
-        $comment = str_replace("\"", "\\\"", $comment);
-        return $comment;
-    }
-
-    /**
-     *
-     */
-    function showCode($methodTable){
-
-        if(!is_array($methodTable)) $methodTable = array();
-
-        foreach($methodTable as $methodName=>$methodProps){
-            $result .= "\n\t\"" . $methodName . "\" => array(";
-            
-            foreach($methodProps as $key=>$value){
-                $result .= "\n\t\t\"" . $key . "\" => ";
-
-                if($key=="arguments"){
-                    $result .= "array(";
-                    for($i=0; $i<count($value); $i++){
-                        $result .= "\"" . addslashes($value[$i]) . "\"";
-                        if($i<count($value)-1){
-                            $result .= ", ";
-                        }
-                    }
-                    $result .= ")";
-                }else{
-                    $result .= "\"" . $value . "\"";
-                }
-
-                $result .= ",";
-            }
-            
-            $result = substr($result, 0, -1);
-            $result .= "\n\t),";
-        }
-        
-        $result = substr($result, 0, -1);
-        $result = "\$this->methodTable = array(" . $result;
-        $result .= "\n);";
-            
-        return $result;
-    }
-}
-?>

admin/mnet/access_control.php

@@ -1,237 +0,0 @@
-<?php // $Id$
-
-// 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');
-
-admin_externalpage_print_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 = get_records_menu('mnet_host', '', '', '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 = get_record('mnet_sso_access_control', 'id', $id)) {
-        print_error('recordnoexists','mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
-    }
-
-    switch ($action) {
-
-        case "delete":
-            delete_records('mnet_sso_access_control', 'id', $id);
-            redirect('access_control.php', get_string('deleteuserrecord', 'mnet', array($idrec->username, $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($idrec->username, $mnethosts[$idrec->mnet_host_id])));
-                } elseif ($accessctrl == 'deny') {
-                    redirect('access_control.php', get_string('ssl_acl_deny','mnet', array($idrec->username, $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($username, $mnethosts[$form->mnet_host_id])));
-                    } elseif ($form->accessctrl == 'deny') {
-                        redirect('access_control.php', get_string('ssl_acl_deny','mnet', array($username, $mnethosts[$form->mnet_host_id])));
-                    }
-                }
-            }
-        }
-    }
-    exit;
-}
-
-// Explain
-print_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 (get_config('auth/mnet', 'auto_add_remote_users') != true) {
-    $warn .= '<p>' .  get_string('authmnetautoadddisabled','mnet').'</p>';
-}
-if (!empty($warn)) {
-    $warn = '<p>' .  get_string('ssoaclneeds','mnet').'</p>' . $warn;
-    print_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=\"$CFG->pixpath/t/$columnicon.gif\" alt=\"\" />";
-    }
-    $headings[$column] = "<a href=\"?sort=$column&amp;dir=$columndir&amp;\">".$string[$column]."</a>$columnicon";
-}
-$headings['delete'] = '';
-$acl = get_records('mnet_sso_access_control', '', '', "$sort $dir", '*'); //, $page * $perpage, $perpage);
-$aclcount = count_records('mnet_sso_access_control');
-
-if (!$acl) {
-    print_heading(get_string('noaclentries','mnet'));
-    $table = NULL;
-} else {
-    $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={$USER->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={$USER->sesskey}\">"
-                . get_string('allow', 'mnet') . "</a>)";
-        }
-        $deletecolumn = "<a href=\"?id={$aclrecord->id}&amp;action=delete&amp;sesskey={$USER->sesskey}\">"
-                . get_string('delete') . "</a>";
-        $table->data[] = array ($aclrecord->username, $aclrecord->mnet_host_id, $accesscolumn, $deletecolumn);
-    }
-}
-
-if (!empty($table)) {
-    print_table($table);
-    echo '<p>&nbsp;</p>';
-    print_paging_bar($aclcount, $page, $perpage, "?sort=$sort&amp;dir=$dir&amp;perpage=$perpage&amp;");
-}
-
-
-
-// output the add form
-print_simple_box_start('center','90%','','20');
-
-?>
- <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>';
-}
-choose_from_menu($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');
-choose_from_menu($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>";
-}
-
-print_simple_box_end();
-admin_externalpage_print_footer();
-
-?>

admin/mnet/adminlib.php

@@ -1,182 +0,0 @@
-<?php
-/**
- * Library functions for 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
- */
-
-/**
- * Parse a file to find out what functions/methods exist in it, and add entries
- * for the remote-call-enabled functions to the database.
- *
- * The path to a file, e.g. auth/mnet/auth.php can be thought of as
- * type/parentname/docname
- *
- * @param  string   $type           mod, auth or enrol
- * @param  string   $parentname     Implementation of type, e.g. 'mnet' in the
- *                                  case of auth/mnet/auth.php
- * @return bool                     True on success, else false
- */
-function mnet_get_functions($type, $parentname) {
-    global $CFG;
-    $dataobject = new stdClass();
-    $docname = $type.'.php';
-    $publishes = array();
-    if ('mod' == $type) {
-        $docname = 'rpclib.php';
-        $relname  = '/mod/'.$parentname.'/'.$docname;
-        $filename = $CFG->dirroot.$relname;
-        if (file_exists($filename)) include_once $filename;
-        $mnet_publishes = $parentname.'_mnet_publishes';
-        if (function_exists($mnet_publishes)) {
-            (array)$publishes = $mnet_publishes();
-        }
-    } else {
-        // auth or enrol
-        $relname  = '/'.$type.'/'.$parentname.'/'.$docname;
-        $filename = $CFG->dirroot.$relname;
-        if (file_exists($filename)) include_once $filename;
-        $class = $type.($type=='enrol'? 'ment':'').'_plugin_'.$parentname;
-        if (class_exists($class)) {
-            $object = new $class();
-            if (method_exists($object, 'mnet_publishes')) {
-                (array)$publishes = $object->mnet_publishes();
-            }
-        }
-    }
-
-    $methodServiceArray = array();
-    foreach($publishes as $service) {
-        if (is_array($service['methods'])) {
-            foreach($service['methods'] as $methodname) {
-                $methodServiceArray[$methodname][] = $service;
-            }
-        }
-    }
-
-    // Disable functions that don't exist (any more) in the source
-    // Should these be deleted? What about their permissions records?
-    $rpcrecords = get_records_select('mnet_rpc', ' parent=\''.$parentname.'\' AND parent_type=\''.$type.'\' ', 'function_name ASC ');
-    if (!empty($rpcrecords)) {
-        foreach($rpcrecords as $rpc) {
-            if (!array_key_exists($rpc->function_name, $methodServiceArray)) {
-                $rpc->enabled = 0;
-                update_record('mnet_rpc', $rpc);
-            }
-        }
-    }
-
-    if (!file_exists($filename)) return false;
-
-    if (extension_loaded('tokenizer')) {
-        include_once "$CFG->dirroot/$CFG->admin/mnet/MethodTable.php";
-        $functions = (array)MethodTable::create($filename,false);
-    }
-
-    foreach($methodServiceArray as $method => $servicearray) {
-        if (!empty($functions[$method])) {
-            $details = $functions[$method];
-            $profile = $details['arguments'];
-            if (!isset($details['returns'])) {
-                array_unshift($profile, array('type' => 'void', 'description' => 'No return value'));
-            } else {
-                array_unshift($profile, $details['returns']);
-            }
-            $dataobject->profile       = serialize($profile);
-            $dataobject->help          = addslashes($details['description']);
-        } else {
-            $dataobject->profile       = serialize(array(array('type' => 'void', 'description' => 'No return value')));
-            $dataobject->help          = '';
-        }
-
-        $dataobject->function_name = $method;
-        $dataobject->xmlrpc_path   = $type.'/'.$parentname.'/'.$docname.'/'.$method;
-        $dataobject->parent_type   = $type;
-        $dataobject->parent        = $parentname;
-        $dataobject->enabled       = '0';
-
-        if ($record_exists = get_record('mnet_rpc', 'xmlrpc_path', $dataobject->xmlrpc_path)) {
-            $dataobject->id      = $record_exists->id;
-            $dataobject->enabled = $record_exists->enabled;
-            update_record('mnet_rpc', $dataobject);
-        } else {
-            $dataobject->id = insert_record('mnet_rpc', $dataobject, true);
-        }
-
-        foreach($servicearray as $service) {
-            $serviceobj = get_record('mnet_service', 'name', $service['name']);
-            if (false == $serviceobj) {
-                $serviceobj = new stdClass();
-                $serviceobj->name        = $service['name'];
-                $serviceobj->apiversion  = $service['apiversion'];
-                $serviceobj->offer       = 1;
-                $serviceobj->id          = insert_record('mnet_service', $serviceobj, true);
-            }
-
-            if (false == get_record('mnet_service2rpc', 'rpcid', $dataobject->id, 'serviceid', $serviceobj->id)) {
-                $obj = new stdClass();
-                $obj->rpcid = $dataobject->id;
-                $obj->serviceid = $serviceobj->id;
-                insert_record('mnet_service2rpc', $obj, true);
-            }
-        }
-    }
-    return true;
-}
-
-function upgrade_RPC_functions($returnurl) {
-    global $CFG;
-
-    $basedir = $CFG->dirroot.'/mod';
-    if (file_exists($basedir) && filetype($basedir) == 'dir') {
-        $dirhandle = opendir($basedir);
-        while (false !== ($dir = readdir($dirhandle))) {
-            $firstchar = substr($dir, 0, 1);
-            if ($firstchar == '.' or $dir == 'CVS' or $dir == '_vti_cnf') {
-                continue;
-            }
-            if (filetype($basedir .'/'. $dir) != 'dir') {
-                continue;
-            }
-
-            mnet_get_functions('mod', $dir);
-
-        }
-    }
-
-    $basedir = $CFG->dirroot.'/auth';
-    if (file_exists($basedir) && filetype($basedir) == 'dir') {
-        $dirhandle = opendir($basedir);
-        while (false !== ($dir = readdir($dirhandle))) {
-            $firstchar = substr($dir, 0, 1);
-            if ($firstchar == '.' or $dir == 'CVS' or $dir == '_vti_cnf') {
-                continue;
-            }
-            if (filetype($basedir .'/'. $dir) != 'dir') {
-                continue;
-            }
-
-            mnet_get_functions('auth', $dir);
-        }
-    }
-
-    $basedir = $CFG->dirroot.'/enrol';
-    if (file_exists($basedir) && filetype($basedir) == 'dir') {
-        $dirhandle = opendir($basedir);
-        while (false !== ($dir = readdir($dirhandle))) {
-            $firstchar = substr($dir, 0, 1);
-            if ($firstchar == '.' or $dir == 'CVS' or $dir == '_vti_cnf') {
-                continue;
-            }
-            if (filetype($basedir .'/'. $dir) != 'dir') {
-                continue;
-            }
-
-            mnet_get_functions('enrol', $dir);
-        }
-    }
-}
-?>

admin/mnet/delete.html

@@ -1,55 +0,0 @@
-<?php
-$navlinks = array();
-$navlinks[] = array('name' => $stradministration, 'link' => "$CFG->wwwroot/$CFG->admin/index.php", 'type' => 'misc');
-$navlinks[] = array('name' => get_string('mnetsettings', 'mnet'), 'link' => "$CFG->wwwroot/$CFG->admin/mnet/index.php", 'type' => 'misc');
-$navlinks[] = array('name' => get_string('deletehost', 'mnet'), 'link' => null, 'type' => 'misc');
-$navigation = build_navigation($navlinks);
-print_header("$site->shortname: $strmnetsettings", "$site->fullname", $navigation);
-
-print_heading(get_string('mnetsettings', 'mnet'));
-?>
-<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->
-    <table class="generalbox standard" border="0" cellpadding="5" cellspacing="0">
-        <tr>
-            <td  class="generalboxcontent">
-            <table cellpadding="9" cellspacing="0" >
-                <tr valign="top">
-                    <td colspan="2" class="header" cellpadding="0"><span><?php print_string('deleteaserver', 'mnet'); ?>Deleting a Server</span></td>
-                </tr>
-                <?php
-                if (count($warn) > 0){
-                ?>
-                <tr valign="top">
-                    <td align="right" colspan="2"><?php print_string('receivedwarnings','mnet'); ?>:<br />
-                    <?php foreach($warn as $warning) echo $warning .'<br />'; ?>
-                    </td>
-                </tr>
-                <?php
-                }
-                ?>
-                <tr valign="top">
-                    <td colspan="2"><?php print_string('reallydeleteserver','mnet'); ?>: "<?php echo $mnet_peer->name; ?>"?</td>
-                </tr>
-                <tr valign="top">
-                    <td width="80">
-                        <form method="post" action="delete.php">
-                            <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
-                            <input type="hidden" name="hostid" value="<?php echo $mnet_peer->id; ?>" />
-                            <input type="hidden" name="step" value="delete" />
-                            <input type="submit" name="submit" value="<?php print_string('delete'); ?>"/>
-                        </form>
-                    </td>
-                    <td>
-                        <form method="get" action="index.php">
-                            <input type="submit" name="ignore" value="<?php print_string('cancel'); ?>"/>
-                        </form>
-                    </td>
-                </tr>
-            </table>
-            </td>
-        </tr>
-    </table>
-</div>
-<?php
-print_footer();
-?>

admin/mnet/delete.php

@@ -1,48 +0,0 @@
-<?PHP // $Id$
-
-    require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
-    include_once($CFG->dirroot.'/mnet/lib.php');
-    $stradministration = get_string('administration');
-    $strconfiguration  = get_string('configuration');
-    $strmnetsettings   = get_string('mnetsettings', 'mnet');
-    $strmnetservices   = get_string('mnetservices', 'mnet');
-    $strmnetlog        = get_string('mnetlog', 'mnet');
-    $strmnetedithost   = get_string('reviewhostdetails', 'mnet');
-    require_login();
-
-    $context = get_context_instance(CONTEXT_SYSTEM);
-    
-    require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
-
-    if (!$site = get_site()) {
-        print_error('nosite', '', '', NULL, true);
-    }
-
-/// Initialize variables.
-
-    // Step must be one of:
-    // input   Parse the details of a new host and fetch its public key
-    // commit  Save our changes (to a new OR existing host)
-    $step   = optional_param('step', 'verify', PARAM_ALPHA);
-    $hostid = required_param('hostid', PARAM_INT);
-    $warn = array();
-
-    if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-        redirect('index.php', get_string('postrequired','mnet') ,7);
-    }
-
-    if ('verify' == $step) {
-        $mnet_peer = new mnet_peer();
-        $mnet_peer->set_id($hostid);
-        $live_users = $mnet_peer->count_live_sessions();
-        if ($live_users > 0) {
-            $warn[] = get_string('usersareonline', 'mnet', $live_users);
-        }
-        include('delete.html');
-    } elseif ('delete' == $step) {
-        $mnet_peer = new mnet_peer();
-        $mnet_peer->set_id($hostid);
-        $mnet_peer->delete();
-        redirect('peers.php', get_string('hostdeleted', 'mnet'), 5);
-    }
-?>

admin/mnet/enr_course_enrol.html

@@ -1,104 +0,0 @@
-
-<form id="assignform" method="post" action="">
-<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->
-<input type="hidden" name="previoussearch" value="<?php p($previoussearch) ?>" />
-<input type="hidden" name="courseid" value="<?php p($courseid) ?>" />
-<input type="hidden" name="host" value="<?php p($mnet_peer->id) ?>" />
-<input type="hidden" name="sesskey" value="<?php p(sesskey()) ?>" />
-  <table class="generaltable" border="0" cellpadding="5" cellspacing="0">
-    <tr>
-      <td valign="top">
-          <?php print_string('existingusers', 'role', count($mnetenrolledusers)); ?>
-      </td>
-      <td></td>
-      <td valign="top">
-          <?php print_string('potentialusers', 'role', $availableusers->_numOfRows); ?>
-      </td>
-    </tr>
-    <tr>
-      <td valign="top">
-          <select name="removeselect[]" size="20" id="removeselect" multiple="multiple"
-                  onfocus="getElementById('assignform').add.disabled=true;
-                           getElementById('assignform').remove.disabled=false;
-                           getElementById('assignform').addselect.selectedIndex=-1;">
-          <?php
-            foreach ($mnetenrolledusers as $enrolleduser) {
-                $fullname = fullname($enrolleduser, true);
-                echo "<option value=\"$enrolleduser->id\">".s($fullname)." (".s($enrolleduser->rolename).")</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="multiple"
-                  onfocus="getElementById('assignform').add.disabled=false;
-                           getElementById('assignform').remove.disabled=true;
-                           getElementById('assignform').removeselect.selectedIndex=-1;">
-          <?php
-
-              if (!empty($searchtext)) {
-                  echo "<optgroup label=\"$strsearchresults (" . $availableusers->_numOfRows . ")\">\n";
-                  while ($user = rs_fetch_next_record($availableusers)) {
-                      if (!isset($enrolledusers[$user->id])) {
-                          $fullname = fullname($user, true);
-                          echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
-                      }
-                  }
-                  echo "</optgroup>\n";
-
-              } else {
-                  if ($availableusers->_numOfRows > MAX_USERS_PER_PAGE) {
-                      echo '<optgroup label="'.get_string('toomanytoshow').'"><option></option></optgroup>'."\n"
-                          .'<optgroup label="'.get_string('trysearching').'"><option></option></optgroup>'."\n";
-                  } else {
-                      while ($user = rs_fetch_next_record($availableusers)) {
-                          $fullname = fullname($user, true);
-                          echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
-                      }
-                  }
-              }
-          ?>
-         </select>
-         <br />
-         <input type="text" name="searchtext" size="30" value="<?php p($searchtext, true) ?>"
-                  onfocus ="getElementById('assignform').add.disabled=true;
-                            getElementById('assignform').remove.disabled=true;
-                            getElementById('assignform').removeselect.selectedIndex=-1;
-                            getElementById('assignform').addselect.selectedIndex=-1;"
-                  onkeydown = "var keyCode = event.which ? event.which : event.keyCode;
-                               if (keyCode == 13) {
-                                    getElementById('assignform').previoussearch.value=1;
-                                    getElementById('assignform').submit();
-                               } " />
-         <input name="search" id="search" type="submit" value="<?php p($strsearch) ?>" />
-         <?php
-              if (!empty($searchusers)) {
-                  echo '<input name="showall" id="showall" type="submit" value="'.$strshowall.'" />'."\n";
-              }
-         ?>
-       </td>
-    </tr>
-    <tr>
-      <td valign="top"><?php print_string('otherenrolledusers', 'mnet'); ?>:<br />
-          <ul>
-          <?php
-            foreach ($remtenrolledusers as $enrolleduser) {
-                $fullname = fullname($enrolleduser, true);
-                print '<li>'
-                    . s($fullname) . ' (' . s($enrolleduser->rolename) . ') '
-                    . s($enrolleduser->enroltype)."</li>\n";
-            }
-          ?></ul></td>
-      <td valign="top"></td>
-      <td valign="top"></td>
-    </tr>
-  </table>
-  </div>
-</form>

admin/mnet/enr_course_enrol.php

@@ -1,291 +0,0 @@
-<?PHP  // $Id$
-       // enrol_config.php - allows admin to edit all enrollment variables
-       //                    Yes, enrol is correct English spelling.
-
-    require_once(dirname(__FILE__) . "/../../config.php");
-    require_once($CFG->libdir.'/adminlib.php');
-    include_once($CFG->dirroot.'/mnet/xmlrpc/client.php');
-
-    if (!confirm_sesskey()) {
-        print_error('confirmsesskeybad', 'error');
-    }
-
-    admin_externalpage_setup('mnetenrol');
-    $CFG->pagepath = 'admin/mnet';
-
-    require_once("$CFG->dirroot/enrol/enrol.class.php");   /// Open the factory class
-    $enrolment = enrolment_factory::factory('mnet');
-
-    $mnethostid = required_param('host', PARAM_INT);
-    $courseid = required_param('courseid', PARAM_INT);
-
-    $mnet_peer = new mnet_peer();
-    if (!$mnet_peer->set_id($mnethostid)) {
-        print_error('hostcoursenotfound','mnet');
-    }
-
-    $course = get_record('mnet_enrol_course', 'id', $courseid, 'hostid', $mnet_peer->id);
-
-    if (empty($course)) {
-        print_error('hostcoursenotfound','mnet');
-    }
-
-    define("MAX_USERS_PER_PAGE", 5000);
-
-    $add            = optional_param('add', 0, PARAM_BOOL);
-    $remove         = optional_param('remove', 0, PARAM_BOOL);
-    $showall        = optional_param('showall', 0, PARAM_BOOL);
-    $searchtext     = optional_param('searchtext', '', PARAM_RAW); // search string
-    $previoussearch = optional_param('previoussearch', 0, PARAM_BOOL);
-    $userid         = optional_param('userid', 0, PARAM_INT); // needed for user tabs
-
-    $errors = array();
-
-    $previoussearch = ($searchtext != '') or ($previoussearch) ? 1:0;
-
-    $baseurl = "remote_enrolment.php?courseid={$course->id}&amp;host={$mnet_peer->id}";
-    if (!empty($userid)) {
-        $baseurl .= '&amp;userid='.$userid;
-    }
-
-/// Process incoming role assignment
-
-    if ($frm = data_submitted()) {
-        if ($add and !empty($frm->addselect) and confirm_sesskey()) {
-            $timemodified = time();
-
-            foreach ($frm->addselect as $adduser) {
-                if (!$adduser = clean_param($adduser, PARAM_INT)) {
-                    continue;
-                }
-                if (! $enrolment->req_enrol_user($adduser, $course->id)) {
-                    $errors[] = "Could not add user with id $adduser to course {$course->id}!";
-                }
-            }
-        } else if ($remove and !empty($frm->removeselect) and confirm_sesskey()) {
-            foreach ($frm->removeselect as $removeuser) {
-                $removeuser = clean_param($removeuser, PARAM_INT);
-                if (! $enrolment->req_unenrol_user($removeuser, $course->id)) {
-                    $errors[] = "Could not remove user with id $removeuser from course {$course->id}!";
-                }
-            }
-        } else if ($showall) {
-            $searchtext = '';
-            $previoussearch = 0;
-        }
-    }
-
-/// Prepare data for users / enrolled users panes
-
-
-/// Create a new request object
-    $mnet_request = new mnet_xmlrpc_client();
-
-/// Pass it the path to the method that we want to execute
-    $mnet_request->set_method('enrol/mnet/enrol.php/course_enrolments');
-    $mnet_request->add_param($course->remoteid, 'int');
-    $mnet_request->send($mnet_peer);
-    $raw_all_enrolled_users = $mnet_request->response;
-    unset($mnet_request);
-
-    $all_enrolled_users = array();
-    if (!empty($raw_all_enrolled_users)) {
-        // Try to repair keying of remote users array, numeric usernames get lost in the fracas
-        foreach ($raw_all_enrolled_users as $username => $userdetails) {
-            if (empty($userdetails['username']) || !is_numeric($username)) {
-                //Not able to repair, or no need to repair
-                $all_enrolled_users[$username] = $userdetails;
-            } else {
-                $all_enrolled_users[$userdetails['username']] = $userdetails;
-            }
-        }
-    }
-    
-    $select = '';
-    $all_enrolled_usernames = '';
-    $timemodified = array();
-/// List all the users (homed on this server) who are enrolled on the course
-/// This will include mnet-enrolled users, and those who have enrolled 
-/// themselves, etc.
-    if (is_array($all_enrolled_users) && count($all_enrolled_users)) {
-        foreach($all_enrolled_users as $username => $data) {
-            $all_enrolled_usernames .= "'$username', ";
-        }
-        $select = ' u.username IN (' .substr($all_enrolled_usernames, 0, -2) .') AND ';
-    } else {
-        $all_enrolled_users = array();
-    }
-
-/// Synch our mnet_enrol_assignments with remote server
-    $sql = "
-            SELECT
-                u.id,
-                u.firstname,
-                u.lastname,
-                u.username,
-                u.email,
-                a.enroltype,
-                a.id as enrolid,
-                COALESCE(a.hostid, 0) as wehaverecord,
-                a.courseid
-            FROM
-                {$CFG->prefix}user u
-            LEFT JOIN
-                {$CFG->prefix}mnet_enrol_assignments a
-            ON
-                a.userid = u.id AND a.courseid={$courseid}
-            WHERE
-                $select 
-                u.deleted = 0 AND
-                u.confirmed = 1 AND
-                u.mnethostid = {$CFG->mnet_localhost_id}
-            ORDER BY
-                u.firstname ASC,
-                u.lastname ASC";
-
-    if (!$enrolledusers = get_records_sql($sql)) {
-        $enrolledusers = array();
-    }
-
-    foreach($enrolledusers as $user) {
-
-        $dataobj = new stdClass();
-        $dataobj->userid    = $user->id;
-        $dataobj->hostid    = $mnet_peer->id;
-        $dataobj->courseid  = $courseid;
-        $dataobj->rolename  = $all_enrolled_users[$user->username]['name'];
-        $dataobj->enroltype = $all_enrolled_users[$user->username]['enrol'];
-
-        if ($user->wehaverecord == 0) {
-            $dataobj->enroltime = $all_enrolled_users[$user->username]['timemodified'];
-            $dataobj->id = insert_record('mnet_enrol_assignments', $dataobj);
-        } elseif (array_key_exists($user->username, $all_enrolled_users)) {
-            $dataobj->id    = $user->enrolid;
-            update_record('mnet_enrol_assignments', $dataobj);
-        } elseif (is_array($all_enrolled_users) && count($all_enrolled_users)) {
-            delete_record('mnet_enrol_assignments', 'id', $user->enrolid);
-        }
-    }
-    unset($enrolledusers);
-
-    // Read about our remote enrolments in 2 sets
-    // first, get the remote enrolments done via enrol/mnet      $mnetenrolledusers
-    // second, get the remote enrolments done with other plugins $remtenrolledusers
-    // NOTE: both arrays are keyed on the userid! 
-    $sql = "
-            SELECT
-                u.id,
-                u.firstname,
-                u.lastname,
-                a.rolename,
-                a.enroltype,
-                a.courseid
-            FROM
-                {$CFG->prefix}user u,
-                {$CFG->prefix}mnet_enrol_assignments a
-            WHERE
-                a.userid = u.id AND 
-                a.courseid={$courseid} AND
-                a.enroltype = 'mnet'   AND
-                u.deleted = 0 AND
-                u.confirmed = 1 AND
-                u.mnethostid = {$CFG->mnet_localhost_id}
-            ORDER BY
-                u.firstname ASC,
-                u.lastname ASC";
-
-    if (!$mnetenrolledusers = get_records_sql($sql)) {
-        $mnetenrolledusers = array();
-    }
-    $sql = "
-            SELECT
-                u.id,
-                u.firstname,
-                u.lastname,
-                a.rolename,
-                a.enroltype,
-                a.courseid
-            FROM
-                {$CFG->prefix}user u,
-                {$CFG->prefix}mnet_enrol_assignments a
-            WHERE
-                a.userid = u.id AND 
-                a.courseid={$courseid} AND
-                a.enroltype != 'mnet'  AND
-                u.deleted = 0 AND
-                u.confirmed = 1 AND
-                u.mnethostid = {$CFG->mnet_localhost_id}
-            ORDER BY
-                u.firstname ASC,
-                u.lastname ASC";
-
-    if (!$remtenrolledusers = get_records_sql($sql)) {
-        $remtenrolledusers = array();
-    }
-
-    $select = '';
-    $exclude = array_merge(array_keys($mnetenrolledusers), array_keys($remtenrolledusers));
-    $exclude[] = 0;
-    $select = 'AND u.username!=\'guest\' AND u.id NOT IN ('. join(',',$exclude) .') ';
-    unset($exclude);
-
-    $searchtext = trim($searchtext);
-
-    if ($searchtext !== '') {   // Search for a subset of remaining users
-        $LIKE      = sql_ilike();
-        $FULLNAME  = sql_fullname();
-
-        $select  .= " AND ($FULLNAME $LIKE '%$searchtext%' OR email $LIKE '%$searchtext%') ";
-    }
-
-    $sql = ('SELECT id, firstname, lastname, email 
-            FROM '.$CFG->prefix.'user u
-            WHERE deleted = 0 AND confirmed = 1 
-                  AND mnethostid = '.$CFG->mnet_localhost_id.' '
-            .$select
-            .'ORDER BY lastname ASC, firstname ASC');
-
-    $availableusers = get_recordset_sql($sql, 0, MAX_USERS_PER_PAGE);
-
-
-
-/// Print the page
-
-/// get language strings
-$str = get_strings(array('enrolmentplugins', 'configuration', 'users', 'administration'));
-/// Get some language strings
-
-$strpotentialusers = get_string('potentialusers', 'role');
-$strexistingusers = get_string('existingusers', 'role');
-$straction = get_string('assignroles', 'role');
-$strroletoassign = get_string('roletoassign', 'role');
-$strcurrentcontext = get_string('currentcontext', 'role');
-$strsearch = get_string('search');
-$strshowall = get_string('showall');
-$strparticipants = get_string('participants');
-$strsearchresults = get_string('searchresults');
-
-admin_externalpage_print_header();
-
-print_box('<strong>' . s($mnet_peer->name) . ' : ' 
-          . format_string($course->shortname) .' '. format_string($course->fullname) 
-          . '</strong><br />'
-          . get_string("enrolcourseenrol_desc", "mnet"));
-
-echo "<hr />";
-
-include(dirname(__FILE__).'/enr_course_enrol.html');
-
-if (!empty($errors)) {
-    $msg = '<p>';
-    foreach ($errors as $e) {
-        $msg .= $e.'<br />';
-    }
-    $msg .= '</p>';
-    notify($msg);
-}
-
-
-admin_externalpage_print_footer();
-
-?>

admin/mnet/enr_courses.php

@@ -1,57 +0,0 @@
-<?PHP  // $Id$
-       // enrol_config.php - allows admin to edit all enrollment variables
-       //                    Yes, enrol is correct English spelling.
-
-    require_once(dirname(__FILE__) . "/../../config.php");
-    require_once($CFG->libdir.'/adminlib.php');
-
-    if (!confirm_sesskey()) {
-        print_error('confirmsesskeybad', 'error');
-    }
-
-
-    admin_externalpage_setup('mnetenrol');
-    $CFG->pagepath = 'admin/mnet';
-
-    require_once("$CFG->dirroot/enrol/enrol.class.php");   /// Open the factory class
-    $enrolment = enrolment_factory::factory('mnet');
-
-    $mnethost = required_param('host', PARAM_INT);
-    $host = get_record('mnet_host', 'id', $mnethost);
-
-    $courses = $enrolment->fetch_remote_courses($mnethost);
-
-    /// Print the page
-
-    admin_externalpage_print_header();
-
-    print_box('<strong>' . s($host->name) . ' </strong><br />'
-              . get_string("enrolcourses_desc", "mnet"));
-
-    echo '<hr />';
-
-    echo '<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->'
-           . '<table class="generaltable">';
-
-    $icon  = "<img src=\"$CFG->pixpath/i/course.gif\"".
-    " class=\"icon\" alt=\"".get_string("course")."\" />";
-
-    foreach ($courses as $course) {
-        $link = "$CFG->wwwroot/$CFG->admin/mnet/enr_course_enrol.php?"
-            . "host={$mnethost}&amp;courseid={$course->id}&amp;sesskey={$USER->sesskey}";
-        echo '<tr>'
-               . "<td>$icon</td>"
-               . "<td><a href=\"$link\">".format_string($course->fullname). "</a></td>"
-               . '</tr><tr>'
-               . '<td></td>'
-               . '<td>'.format_string($course->shortname). ' - ' .format_string($course->cat_name).'</td>'
-               . '</tr><tr>'
-               . '<td></td>'
-               . "<td align=\"left\" >{$course->summary}</td>"
-               . '</tr>';
-    }
-    echo '</table></div>';
-
-    admin_externalpage_print_footer();
-
-?>

admin/mnet/enr_hosts.php

@@ -1,61 +0,0 @@
-<?PHP  // $Id$
-       // enrol_config.php - allows admin to edit all enrollment variables
-       //                    Yes, enrol is correct English spelling.
-
-    require_once(dirname(__FILE__) . "/../../config.php");
-    require_once($CFG->libdir.'/adminlib.php');
-
-    admin_externalpage_setup('mnetenrol');
-    $CFG->pagepath = 'admin/mnet';
-
-
-    require_once("$CFG->dirroot/enrol/enrol.class.php");   /// Open the factory class
-
-    $enrolment = enrolment_factory::factory('mnet');
-
-/// Otherwise fill and print the form.
-
-    /// get language strings
-
-    admin_externalpage_print_header();
-
-    print_box(get_string("remoteenrolhosts_desc", "mnet"));
-
-    echo '<hr />';
-
-    if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict') {
-        print_box(get_string('mnetdisabled','mnet'));
-    }
-
-    echo '<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->'
-           . '<table cellspacing="0" cellpadding="5" id="hosts" class="generaltable generalbox" >'
-           . '<tr>'
-           . '<th class="header c0"> '.get_string('host', 'mnet').' </th>'
-           . '<th class="header c1"> '.get_string('enrolments', 'mnet').' </th>'
-           . '<th class="header c2"> '.get_string('courses', 'mnet').' </th>'
-           // . '<th class="header c3"> &nbsp; </th>'
-           . '</tr>';
-    $hosts = $enrolment->list_remote_servers();
-    foreach ($hosts as $host) {
-        $coursesurl = "$CFG->wwwroot/$CFG->admin/mnet/enr_courses.php?host={$host->id}&amp;sesskey={$USER->sesskey}";
-        $coursecount = get_field_sql("SELECT count(id) FROM {$CFG->prefix}mnet_enrol_course WHERE hostid={$host->id}");
-        if (empty($coursecount)) {
-            $coursecount = '?';
-        }
-        $enrolcount = get_field_sql("SELECT count(id) FROM {$CFG->prefix}mnet_enrol_assignments WHERE hostid={$host->id}");
-
-        echo '<tr>'
-               . "<td><a href=\"{$coursesurl}\">{$host->name}</a></td>"
-               . "<td align=\"center\" >$enrolcount</td>"
-               . "<td align=\"center\" >$coursecount - <a href=\"{$coursesurl}\">".get_string('editenrolments', 'mnet')."</a></td>"
-               // TODO: teach report/log/index.php to show per-host-logs
-               // . '<td align="center" ><a href="$CFG->wwwroot/$CFG->admin/report/log/index.php?course_host={$host->id}">'
-               // . get_string('logs', 'mnet').'</a> </td>'
-               . '</tr>';
-    }
-    echo '</table>'
-       . '</div>';
-
-    admin_externalpage_print_footer();
-
-?>

admin/mnet/index.php

@@ -1,151 +0,0 @@
-<?PHP // $Id$
-
-    // 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");
-
-
-    if (!extension_loaded('openssl')) {
-        admin_externalpage_print_header();
-        set_config('mnet_dispatcher_mode', 'off');
-        print_error('requiresopenssl', 'mnet', '', NULL, true);
-    }
-
-    if (!$site = get_site()) {
-        admin_externalpage_print_header();
-        set_config('mnet_dispatcher_mode', 'off');
-        print_error('nosite', '', '', NULL, true);
-    }
-
-    if (!function_exists('curl_init') ) {
-        admin_externalpage_print_header();
-        set_config('mnet_dispatcher_mode', 'off');
-        print_error('nocurl', 'mnet', '', NULL, true);
-    }
-
-    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 {
-                    error('Invalid action parameter.', '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();
-            notice_yesno(get_string("deletekeycheck", "mnet"),
-                                    "index.php?sesskey=$USER->sesskey&amp;confirm=".md5($MNET->public_key),
-                                    "index.php",
-                                     array('sesskey' => $USER->sesskey),
-                                     NULL,
-                                    'post',
-                                    'get');
-            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 = get_records_select('mnet_host', " id != '{$CFG->mnet_localhost_id}' AND deleted = '0' ",'wwwroot ASC' );
-
-    admin_externalpage_print_header();
-?>
-<center>
-<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" cellpadding="0"><?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>
-                <tr valign="top">
-                    <td align="right"><?php print_string('net', 'mnet'); ?>:</td>
-                    <td><input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
-                        <input type="radio" name="mode" value="off" <?php echo ("off" == $CFG->mnet_dispatcher_mode)? 'checked="checked"' : '' ?> /> <?php print_string('off', 'mnet'); ?> <br />
-                        <input type="radio" name="mode" value="strict" <?php echo ("strict" == $CFG->mnet_dispatcher_mode)? 'checked="checked"' : '' ?> /> <?php print_string('on', 'mnet'); ?><br />
-                        <input type="submit" name="submit" value="<?php print_string('savechanges'); ?>" />
-                    </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" cellpadding="0"><?php print_string('expireyourkey', 'mnet'); ?></td>
-                </tr>
-                <tr valign="top">
-                    <td colspan="2" cellpadding="0"><?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 $USER->sesskey ?>" />
-                        <input type="hidden" name="deleteKey" value="" />
-                        <input type="submit" name="submit" value="<?php print_string('delete'); ?>" />
-                    </td>
-                </tr>
-            </table>
-            </td>
-        </tr>
-    </table>
-</form>
-</center>
-
-<?php
-admin_externalpage_print_footer();
-?>

admin/mnet/mnet_review.html

@@ -1,140 +0,0 @@
-<?php
-$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';
-
-admin_externalpage_print_header();
-
-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', 'mnet_services.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetservices, $strmnetservices, false);
-    $tabs[] = new tabobject('mnetthemes', 'mnet_themes.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetthemes, $strmnetthemes, false);
-    if ($mnet_peer->application->name == 'moodle') {
-        $tabs[] = new tabobject('mnetlog', $logurl, $strmnetlog, $strmnetlog, false);
-    }
-} else {
-    $tabs[] = new tabobject('mnetdetails', '#', $strmnetedithost, $strmnetedithost, false);
-}
-print_tabs(array($tabs), 'mnetdetails');
-
-print_simple_box_start("center", "");
-?>
-<form method="post" action="peers.php">
-<div>
-<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
-<input type="hidden" name="step" value="commit" />
-<input type="hidden" name="last_connect_time" value="<?php echo $mnet_peer->last_connect_time; ?>" />
-<input type="hidden" name="id" value="<?php echo isset($mnet_peer->id)?  $mnet_peer->id : '0' ; ?>" />
-<input type="hidden" name="applicationid" value="<?php echo isset($mnet_peer->applicationid)?  $mnet_peer->applicationid : '0' ; ?>" />
-<input type="hidden" name="applicationname" value="<?php echo isset($mnet_peer->application->name)?  $mnet_peer->application->name : '' ; ?>" />
-<table cellpadding="9" cellspacing="0" width="635">
-
-<tr>
-    <td align="right" valign="top"><?php print_string('site'); ?>:</td>
-    <td valign="top"><input type="text" name="name" size="30" value="<?php echo $mnet_peer->name; ?>" /></td>
-</tr>
-<tr>
-    <td align="right" valign="top"><?php print_string('hostname', 'mnet'); ?>:</td>
-    <td valign="top"><input type="text" name="wwwroot" size="30" value="<?php echo $mnet_peer->wwwroot; ?>" /></td>
-</tr>
-<?php
-if (empty($mnet_peer->public_key)) $mnet_peer->public_key = '';
-?>
-<tr>
-    <td align="right" valign="top"><?php
-        print_string('publickey', 'mnet');
-        echo ': <br />';
-        helpbutton("publickey", get_string('publickey', 'mnet'), "mnet", true, true);
-    ?></td>
-<?php
-
-
-
-if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0) {
-    $key = mnet_get_public_key($mnet_peer->wwwroot, $mnet_peer->application->xmlrpc_server_url);
-    $mnet_peer->public_key = clean_param($key, PARAM_PEM);
-}
-?>
-    <td valign="top">
-        <?php 
-        if (empty($mnet_peer->public_key)) {
-            print_string('nopubkey', 'mnet');
-        }
-        ?><br />
-        <textarea rows="17" cols="65" name="public_key" style="font-size: 8px;"><?php echo $mnet_peer->public_key; ?></textarea>
-    </td>
-</tr>
-<tr>
-    <td align="right" valign="top"><?php print_string('expires', 'mnet'); ?>:</td>
-    <td valign="top">
-<?php
-    if($mnet_peer->public_key_expires < time()) {
-        print_string('expired', 'mnet');
-        echo ' ';
-    }
-    echo userdate($mnet_peer->public_key_expires);
-?>
-    </td>
-</tr>
-<?php
-
-if(!empty($currentkey)) {
-?>
-    <tr>
-        <td align="right" valign="top"></td>
-        <td valign="top"><?php print_string('keymismatch', 'mnet'); ?></td>
-    </tr>
-    <tr>
-        <td align="right" valign="top"><?php print_string('currentkey', 'mnet'); ?>:</td>
-        <td valign="top"><pre style="font-size: 8px;"><?php echo $currentkey;?></pre></td>
-    </tr>
-<?php
-}
-
-if (isset($mnet_peer->id) && $mnet_peer->id > 0) {
-?>
-    <tr>
-        <td align="right" valign="top"><?php print_string('last_connect_time', 'mnet'); ?>:</td>
-        <td valign="top"><?php echo ($mnet_peer->last_connect_time == 0)? get_string('never','mnet') : date('H:i:s d/m/Y',$mnet_peer->last_connect_time);?></td>
-    </tr>
-<?php
-}
-
-if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0){
-?>
-    <tr>
-        <td align="right" valign="top"><?php print_string('deleted'); ?>:</td>
-        <td valign="top">
-            <input type="radio" name="deleted" value="0" checked="checked" /> <?php print_string('reenableserver','mnet'); ?><br />
-            <input type="radio" name="deleted" value="1"  /> <?php print_string('yes'); ?><br />
-        </td>
-    </tr>
-<?php
-}
-
-if (isset($mnet_peer->ip_address) && '' != $mnet_peer->ip_address){
-?>
-    <tr>
-        <td align="right" valign="top"><?php print_string('ipaddress', 'mnet');
-        echo ': <br />';
-        helpbutton("ipaddress", get_string('ipaddress', 'mnet'), "mnet", true, true);
-        ?>:</td>
-        <td valign="top"><?php echo $mnet_peer->ip_address; ?></td>
-    </tr>
-
-<?php
-}
-?>
-<tr>
-    <td></td>
-    <td><input type="submit" value="<?php print_string("savechanges"); ?>" /></td>
-</tr>
-</table>
-</div>
-</form>
-<?php
-print_simple_box_end();
-admin_externalpage_print_footer();
-?>

admin/mnet/mnet_review_allhosts.html

@@ -1,23 +0,0 @@
-<?php
-admin_externalpage_print_header();
-
-$tabs[] = new tabobject('mnetdetails', 'peers.php?step=update&amp;hostid='.$mnet_peer->id, $strmnetedithost, $strmnetedithost, false);
-$tabs[] = new tabobject('mnetservices', 'mnet_services.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetservices, $strmnetservices, false);
-$tabs[] = new tabobject('mnetthemes', 'mnet_themes.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetthemes, $strmnetthemes, false);
-print_tabs(array($tabs), 'mnetdetails');
-
-print_simple_box_start("center", "");
-?>
-<table cellpadding="9" cellspacing="0" >
-<tr>
-    <td align="right" valign="top"><?php print_string('site'); ?>:</td>
-    <td valign="top"><?php echo $mnet_peer->name; ?></td>
-</tr>
-<tr>
-    <td align="right" valign="top" colspan="2"><?php print_string('allhosts_no_options'); ?>:</td>
-</tr>
-</table>
-<?php
-print_simple_box_end();
-admin_externalpage_print_footer();
-?>

admin/mnet/mnet_services.html

@@ -1,103 +0,0 @@
-<?php
-admin_externalpage_print_header();
-
-$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[] = new tabobject('mnetdetails', 'peers.php?step=update&amp;hostid='.$mnet_peer->id, $strmnetedithost, $strmnetedithost, false);
-$tabs[] = new tabobject('mnetservices', 'mnet_services.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetservices, $strmnetservices, false);
-$tabs[] = new tabobject('mnetthemes', 'mnet_themes.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetthemes, $strmnetthemes, false);
-if ($mnet_peer->id != $CFG->mnet_all_hosts_id && $mnet_peer->application->name == 'moodle') {
-    $tabs[] = new tabobject('mnetlog', $logurl, $strmnetlog, $strmnetlog, false);
-}
-print_tabs(array($tabs), 'mnetservices');
-print_simple_box_start("center", "");
-
-?>
-
-<form method="post" action="mnet_services.php">
-<div>
-<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
-<input type="hidden" name="step" value="<?php echo $mnet_peer->nextstep; ?>" />
-<input type="hidden" name="hostid" value="<?php echo ($mnet_peer->id)?  $mnet_peer->id : '0' ; ?>" />
-<table cellpadding="9" cellspacing="0" >
-<?php 
-    foreach($myservices as $name => $versions) {
-    $version = current($versions);
-?>
-<tr>
-    <td align="left" valign="top" colspan="2">
-    <h3><?php echo get_string($name.'_name', $version['parent_type'].'_'.$version['parent'] , $mnet_peer->name); ?></h3>
-    <?php echo get_string($name.'_description', $version['parent_type'].'_'.$version['parent'], $mnet_peer->name); ?>
-<?php
-        $breakstring = '';
-        foreach($versions as $version){
-            if (count($versions) > 1) {
-                $versionstring = '('.get_string('version','mnet') .' '.$version['apiversion'].')';
-            } else {
-                $versionstring = '';
-            }
-    
-            echo $breakstring;
-?>
-    <input type="hidden" name="exists[<?php echo  $version['serviceid']; ?>]" value="1" />
-    <input type="checkbox" name="publish[<?php echo $version['serviceid']; ?>]" <?php echo (!empty($version['I_publish']))? 'checked="checked" ': '' ; ?>/>
-<?php 
-            print_string('publish','mnet');
-            echo $versionstring; 
-            if (!empty($version['hostsubscribes'])) { 
-                echo '<a href="#" title="'.get_string('issubscribed','mnet', $mnet_peer->name).'">&radic;</a> '; 
-            }
-            if (!empty($version['allhosts_publish'])) { 
-                print_string("enabled_for_all",'mnet',!empty($version['I_publish']));
-            } 
-            echo '<br />';
-?>
-    <input type="checkbox" name="subscribe[<?php echo $version['serviceid']; ?>]" <?php echo (!empty($version['I_subscribe']))? 'checked="checked" ': '' ; ?>/>
-<?php 
-            print_string('subscribe','mnet');
-            echo $versionstring; 
-            if (!empty($version['hostpublishes'])) { 
-                echo '<a href="#" title="'.get_string('ispublished','mnet', $mnet_peer->name).'">&radic;</a> ';
-            } 
-            if (!empty($version['allhosts_subscribe'])) {
-                print_string("enabled_for_all",'mnet',!empty($version['I_subscribe']));
-            }
-            
-            echo '<br />';  
-            $breakstring = '. . . . . . . . . . . . . . . . . . . . . . . . <br>';
-        } // end foreach
-?>
-    </td>
-</tr>
-<?php
-    } // end foreach
-?>
-<tr>
-    <td align="left" valign="top" colspan="2">
-    <div id="pubTreeLoc"></div>
-    </td>
-</tr>
-<tr>
-    <td align="left" valign="top" colspan="2">
-    <div id="subTreeLoc"></div>
-    </td>
-</tr>
-<tr>
-    <td colspan="2"><input type="submit" value="<?php print_string("savechanges") ?>" /></td>
-</tr>
-<tr>
-    <td align="left" valign="top" colspan="2">
-    <div id="formElements"><input type="hidden" name="outer" value="4" /></div>
-    </td>
-</tr>
-</table>
-</div>
-</form>
-<?php
-print_simple_box_end();
-admin_externalpage_print_footer();
-?>

admin/mnet/mnet_services.php

@@ -1,183 +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('mnetpeers');
-
-    $context = get_context_instance(CONTEXT_SYSTEM);
-
-    require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
-
-    if (!$site = get_site()) {
-        print_error('nosite', '', '', NULL, true);
-    }
-
-/// Initialize variables.
-
-    // Step must be one of:
-    // input   Parse the details of a new host and fetch its public key
-    // commit  Save our changes (to a new OR existing host)
-    // force   Go ahead with something we've been warned is strange
-    $step   = optional_param('step', NULL, PARAM_ALPHA);
-    $hostid = optional_param('hostid', NULL, PARAM_INT);
-    $nocertstring = '';
-    $nocertmatch  = '';
-    $badcert = '';
-    $certerror = '';
-    $noipmatch = '';
-    $stradministration   = get_string('administration');
-    $strconfiguration    = get_string('configuration');
-    $strmnetsettings     = get_string('mnetsettings', 'mnet');
-    $strmnetservices     = get_string('mnetservices', 'mnet');
-    $strmnetthemes       = get_string('mnetthemes', 'mnet');
-    $strmnetlog          = get_string('mnetlog', 'mnet');
-    $strmnetedithost     = get_string('reviewhostdetails', 'mnet');
-    $strmneteditservices = get_string('reviewhostservices', 'mnet');
-
-    $mnet_peer = new mnet_peer();
-
-    if (($form = data_submitted()) && confirm_sesskey()) {
-        $mnet_peer->set_id($hostid);
-        $treevals = array();
-        foreach($_POST['exists'] as $key => $value) {
-            $host2service   = get_record('mnet_host2service', 'hostid', $_POST['hostid'], 'serviceid', $key);
-            $publish        = (isset($_POST['publish'][$key]) && $_POST['publish'][$key] == 'on')? 1 : 0;
-            $subscribe      = (isset($_POST['subscribe'][$key]) && $_POST['subscribe'][$key] == 'on')? 1 : 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
-                    delete_records('mnet_host2service', 'hostid', $_POST['hostid'], 'serviceid', $key);
-                }
-            } elseif (false == $host2service && ($publish == 1 || $subscribe == 1)) {
-                $host2service = new stdClass();
-                $host2service->hostid = $_POST['hostid'];
-                $host2service->serviceid = $key;
-                
-                $host2service->publish = $publish;
-                $host2service->subscribe = $subscribe;
-
-                $host2service->id = insert_record('mnet_host2service', $host2service);
-            } elseif ($host2service->publish != $publish || $host2service->subscribe != $subscribe) {
-                $host2service->publish   = $publish;
-                $host2service->subscribe = $subscribe;
-                $tf = update_record('mnet_host2service', $host2service);
-            }
-        }
-    }
-
-    if (is_int($hostid)) {
-        if (0 == $mnet_peer->id) $mnet_peer->set_id($hostid);
-        $mnet_peer->nextstep = 'verify';
-
-        $id_list = $mnet_peer->id;
-        if (!empty($CFG->mnet_all_hosts_id)) {
-            $id_list .= ', '.$CFG->mnet_all_hosts_id;
-        }
-
-        $concat = sql_concat('COALESCE(h2s.id,0) ', ' \'-\' ', ' svc.id');
-
-        $query = "
-            SELECT DISTINCT
-                $concat as id,
-                svc.id as serviceid,
-                svc.name,
-                svc.offer,
-                svc.apiversion,
-                r.parent_type,
-                r.parent,
-                h2s.hostid,
-                h2s.publish,
-                h2s.subscribe
-            FROM
-                {$CFG->prefix}mnet_service2rpc s2r,
-                {$CFG->prefix}mnet_rpc r,
-                {$CFG->prefix}mnet_service svc
-            LEFT JOIN
-                {$CFG->prefix}mnet_host2service h2s
-            ON
-                h2s.hostid in ($id_list) AND
-                h2s.serviceid = svc.id
-            WHERE
-                svc.offer = '1' AND
-                s2r.serviceid = svc.id AND
-                s2r.rpcid = r.id
-            ORDER BY
-                svc.name ASC";
-
-        $resultset = get_records_sql($query);
-
-        if (is_array($resultset)) {
-            $resultset = array_values($resultset);
-        } else {
-            $resultset = array();
-        }
-
-        require_once $CFG->dirroot.'/mnet/xmlrpc/client.php';
-
-        $remoteservices = array();
-        if ($hostid != $CFG->mnet_all_hosts_id) {
-            // Create a new request object
-            $mnet_request = new mnet_xmlrpc_client();
-
-            // Tell it the path to the method that we want to execute
-            $mnet_request->set_method('system/listServices');
-            $mnet_request->send($mnet_peer);
-            if (is_array($mnet_request->response)) {
-                foreach($mnet_request->response as $service) {
-                    $remoteservices[$service['name']][$service['apiversion']] = $service;
-                }
-            }
-        }
-
-        $myservices = array();
-        foreach($resultset as $result) {
-            $result->hostpublishes  = false;
-            $result->hostsubscribes = false;
-            if (isset($remoteservices[$result->name][$result->apiversion])) {
-                if ($remoteservices[$result->name][$result->apiversion]['publish'] == 1) {
-                    $result->hostpublishes  = true;
-                }
-                if ($remoteservices[$result->name][$result->apiversion]['subscribe'] == 1) {
-                    $result->hostsubscribes  = true;
-                }
-            }
-
-            if (empty($myservices[$result->name][$result->apiversion])) {
-                $myservices[$result->name][$result->apiversion] = array('serviceid' => $result->serviceid,
-                                                                        'name' => $result->name,
-                                                                        'offer' => $result->offer,
-                                                                        'apiversion' => $result->apiversion,
-                                                                        'parent_type' => $result->parent_type,
-                                                                        'parent' => $result->parent,
-                                                                        'hostsubscribes' => $result->hostsubscribes,
-                                                                        'hostpublishes' => $result->hostpublishes
-                                                                        );
-            }
-
-            // allhosts_publish allows us to tell the admin that even though he
-            // is disabling a service, it's still available to the host because
-            // he's also publishing it to 'all hosts'
-            if ($result->hostid == $CFG->mnet_all_hosts_id && $CFG->mnet_all_hosts_id != $mnet_peer->id) {
-                $myservices[$result->name][$result->apiversion]['allhosts_publish'] = $result->publish;
-                $myservices[$result->name][$result->apiversion]['allhosts_subscribe'] = $result->subscribe;
-            } elseif (!empty($result->hostid)) {
-                $myservices[$result->name][$result->apiversion]['I_publish'] = $result->publish;
-                $myservices[$result->name][$result->apiversion]['I_subscribe'] = $result->subscribe;
-            }
-
-        }
-
-    } else {
-        redirect('peers.php', get_string('nohostid','mnet'), '5');
-        exit;
-    }
-
-    include('./mnet_services.html');
-?>

admin/mnet/mnet_themes.html

@@ -1,127 +0,0 @@
-<?php
-admin_externalpage_print_header();
-print_heading(get_string('themes'));
-$original_theme = fullclone($THEME);
-
-$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[] = new tabobject('mnetdetails', 'peers.php?step=update&amp;hostid='.$mnet_peer->id, $strmnetedithost, $strmnetedithost, false);
-$tabs[] = new tabobject('mnetservices', 'mnet_services.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetservices, $strmnetservices, false);
-$tabs[] = new tabobject('mnetthemes', 'mnet_themes.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetthemes, $strmnetthemes, false);
-if ($mnet_peer->id != $CFG->mnet_all_hosts_id) {
-    $tabs[] = new tabobject('mnetlog', $logurl, $strmnetlog, $strmnetlog, false);
-}
-    print_tabs(array($tabs), 'mnetthemes');
-
-    $themes = get_list_of_plugins("theme");
-    $sesskey = !empty($USER->id) ? $USER->sesskey : '';
-
-    echo "<table style=\"margin-left:auto;margin-right:auto;\" cellpadding=\"7\" cellspacing=\"5\">";
-
-    if (count($report)) {
-        echo '<tr>';
-        echo '<td align="center" colspan="2">';
-        echo '<span class="'.$report[1].'">'.$report[0].'</span>';
-        echo '</td>';
-        echo '</tr>';
-    }
-
-    if (!$USER->screenreader) {
-        echo "<tr class=\"generaltableheader\"><th scope=\"col\">$strtheme</th>";
-        echo "<th scope=\"col\">$strinfo</th></tr>";
-    }
-
-    echo "<tr>";
-    echo '<td align="center"><span class="informationbox">Choose this option to use your site\'s default theme: <strong>'.$CFG->theme.'</strong>.</span></td>';
-    if ($mnet_peer->theme == '') {
-        echo '<td valign="top" style="border-style:solid; border-width:1px; border-color=#555555">';
-    } else {
-        echo '<td valign="top">';
-    }
-    echo '<p style="font-size:1.5em;font-style:bold;">Site Theme</p>';
-    $options = null;
-    $options['choose'] = $unlikely_name;// Something unlikely to ever be a theme name... initially $unlikely_name = 'ZoqZoqZ';
-    $options['sesskey'] = $sesskey;
-    $options['hostid'] = $mnet_peer->id;
-    print_single_button('mnet_themes.php', $options, $strchoose);
-    echo '</td>';
-    echo "</tr>";
-
-    foreach ($themes as $theme) {
-
-        unset($THEME);
-
-        if (!file_exists($CFG->themedir.'/'.$theme.'/config.php')) {   // bad folder
-            continue;
-        }
-
-        include($CFG->themedir.'/'.$theme.'/config.php');
-
-        $readme = '';
-        $screenshot = '';
-        $screenshotpath = '';
-
-        if (file_exists($CFG->themedir.'/'.$theme.'/README.html')) {
-            $readme =  '<li>'.
-            link_to_popup_window($CFG->themewww .'/'. $theme .'/README.html', $theme, $strinfo, 400, 500, '', 'none', true).'</li>';
-        } else if (file_exists($CFG->themedir.'/'.$theme.'/README.txt')) {
-            $readme =  '<li>'.
-            link_to_popup_window($CFG->themewww .'/'. $theme .'/README.txt', $theme, $strinfo, 400, 500, '', 'none', true).'</li>';
-        }
-        if (file_exists("$theme/screenshot.png")) {
-            $screenshotpath = "$theme/screenshot.png";
-        } else if (file_exists("$theme/screenshot.jpg")) {
-            $screenshotpath = "$theme/screenshot.jpg";
-        }
-
-        echo "<tr>";
-             
-        // no point showing this if user is using screen reader
-        if (!$USER->screenreader) {
-            echo "<td align=\"center\">";
-            if ($screenshotpath) {
-                $screenshot = '<li><a href='.$CFG->wwwroot .'/theme/'. $theme.'/screenshot.jpg">'.$strscreenshot.'</a></li>';
-                echo "<object type=\"text/html\" data=\"$screenshotpath\" height=\"200\" width=\"400\">$theme</object></td>";
-            } else {
-                echo '<object type="text/html" data="'.$CFG->wwwroot.'/theme/preview.php?preview='.$theme.'" height="200" width="400">'.$theme.'</object></td>';
-            }
-        }
-
-        if ($mnet_peer->theme == $theme) {
-            echo '<td valign="top" style="border-style:solid; border-width:1px; border-color=#555555">';
-        } else {
-            echo '<td valign="top">';
-        }
-
-        if (isset($THEME->sheets)) {
-            echo '<p style="font-size:1.5em;font-style:bold;">'.$theme.'</p>';
-        } else {
-            echo '<p style="font-size:1.5em;font-style:bold;color:red;">'.$theme.' (Moodle 1.4)</p>';
-        }
-          
-        if ($screenshot or $readme) {
-            echo '<ul>';      
-            if (!$USER->screenreader) {
-                echo '<li><a href="'.$CFG->wwwroot.'/theme/preview.php?preview='.$theme.'">'.$strpreview.'</a></li>';
-            }
-            echo $screenshot.$readme;
-            echo '</ul>';
-        }
-
-        $options = null;
-        $options['choose'] = $theme;
-        $options['sesskey'] = $sesskey;
-        $options['hostid'] = $mnet_peer->id;
-        print_single_button('mnet_themes.php', $options, $strchoose);
-        echo '</td>';
-        echo "</tr>";
-    }
-    echo "</table>";
-
-$THEME = $original_theme;
-admin_externalpage_print_footer();
-?>

admin/mnet/mnet_themes.php

@@ -1,81 +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('mnetpeers');
-
-    $context = get_context_instance(CONTEXT_SYSTEM);
-
-    require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
-
-    if (!$site = get_site()) {
-        print_error('nosite', '', '', NULL, true);
-    }
-
-/// Initialize variables.
-
-    $hostid = required_param('hostid', PARAM_INT);
-
-    $stradministration   = get_string('administration');
-    $strconfiguration    = get_string('configuration');
-
-    $strmnetedithost   = get_string('reviewhostdetails', 'mnet');
-    $strmnetsettings     = get_string('mnetsettings', 'mnet');
-    $strmnetservices     = get_string('mnetservices', 'mnet');
-    $strmnetthemes       = get_string('mnetthemes', 'mnet');
-    $strmnetlog          = get_string('mnetlog', 'mnet');
-
-
-    $mnet_peer = new mnet_peer();
-    if (is_int($hostid)) {
-        $mnet_peer->set_id($hostid);
-    }
-
-    $choose = optional_param("choose",'',PARAM_FILE);   // set this theme as default
-    $stradministration = get_string("administration");
-    $strconfiguration = get_string("configuration");
-    $strthemes = get_string("themes");
-    $strpreview = get_string("preview");
-    $strchoose = get_string("choose");
-    $strinfo = get_string("info");
-    $strtheme = get_string("theme");
-    $strthemesaved = get_string("themesaved");
-    $strscreenshot = get_string("screenshot");
-    $stroldtheme = get_string("oldtheme");
-    $report = array();
-    $unlikely_name = 'ZoqZoqZ'; // Something unlikely to ever be a theme name
-
-    if ($choose) {
-        if (confirm_sesskey()) {
-            if ($choose == $unlikely_name) {
-                $mnet_peer->force_theme = 1;
-                $mnet_peer->updateparams->force_theme = 1;
-                $mnet_peer->theme = '';
-                $mnet_peer->updateparams->theme = '';
-                if ($mnet_peer->commit()) {
-                    $report = array(get_string('themesaved'), 'informationbox');
-                } else {
-                    $report = array(get_string('themesavederror', 'mnet'), 'errorbox');
-                }
-            } elseif (!is_dir($CFG->themedir .'/'. $choose) || !file_exists($CFG->themedir .'/'. $choose .'/config.php')) {
-                        echo 'CHOOSE -'.$choose.' '. $CFG->themedir .'/'. $choose .'/config.php' ;
-                $report = array('This theme is not installed!'.'3', 'errorbox');
-            } else {
-                $mnet_peer->force_theme = 1;
-                $mnet_peer->theme = $choose;
-                $mnet_peer->updateparams->theme = addslashes($choose);
-                if ($mnet_peer->commit()) {
-                    $report = array(get_string('themesaved').'1', 'informationbox');
-                } else {
-                    $report = array(get_string('themesavederror', 'mnet').'2', 'errorbox');
-                }
-            }
-        }
-    }
-
-    $adminroot = admin_get_root();
-    require('./mnet_themes.html');
-?>

admin/mnet/peers.html

@@ -1,101 +0,0 @@
-<?php
-admin_externalpage_print_header();
-
-if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict') {
-    print_box(get_string('mnetdisabled','mnet'));
-}
-?>
-<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->
-    <form  method="post" action="peers.php">
-        <div>
-            <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
-            <input type="hidden" name="updateregisterall" value="1" />
-            <table cellspacing="0" cellpadding="5" class="generaltable generalbox" >
-                <tr>
-                    <th class="header c0" colspan="2"><?php print_string('registerallhosts', 'mnet'); ?></th>
-                </tr>
-                <tr>
-                    <td class="cell c1" colspan="2"><?php print_string('registerallhostsexplain', 'mnet'); ?></td>
-                </tr>
-                <tr>
-                    <td class="cell c1"><input type="checkbox" name="registerallhosts" <?php if (!empty($CFG->mnet_register_allhosts)) echo 'checked="checked" '; ?>/></td>
-                    <td class="cell c1"> <?php print_string('registerallhosts', 'mnet'); ?> </td>
-                </tr>
-                <tr>
-                    <td align="right" colspan="2"><input type="submit" name="submit" value="<?php print_string('savechanges'); ?>" /></td>
-                </tr>
-            </table>
-        </div>
-    </form>
-    <table cellspacing="0" cellpadding="5" class="generaltable generalbox standard" >
-        <tr>
-            <th class="header c0"><?php print_string('site'); ?></th>
-            <th class="header c1"><?php print_string('system','mnet'); ?></th>
-            <th class="header c2"><?php print_string('last_connect_time', 'mnet'); ?></th>
-            <th class="header c3"></th>
-        </tr>
-<?php
-
-    foreach($hosts as $host) {
-
-        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);
-        }
-
-?>
-    <tr>
-        <td class="cell c0"><a href="peers.php?step=update&amp;hostid=<?php echo $host->id; ?>"><?php echo $host->name; ?></a></td>
-        <td class="cell c1"><a href="peers.php?step=update&amp;hostid=<?php echo $host->id; ?>"><?php echo $host->wwwroot; ?></a></td>
-        <td class="cell c2"><?php if ($host->id != $CFG->mnet_all_hosts_id) echo $last_connect; ?></td>
-        <td class="cell c3">
-<?php   if ($host->id != $CFG->mnet_all_hosts_id){ ?>
-            <form method="post" action="delete.php">
-                <div>
-                <input type="hidden" name="hostid" value="<?php echo $host->id; ?>" />
-                <input type="hidden" name="step" value="verify" />
-                <input type="submit" name="submit" value="<?php print_string('delete'); ?>"/>
-                </div>
-            </form>
-<?php   } ?>
-        </td>
-    </tr>
-<?php
-    }
-?>
-    </table>
-    <form method="post" action="peers.php">
-        <table cellspacing="0" cellpadding="5" class="generaltable generalbox standard" >
-            
-            <tr>
-                <th class="header c4" colspan="4">
-                    <?php print_string('addnewhost', 'mnet'); ?>
-                    <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
-                    <input type="hidden" name="step" value="input" />
-                </th>
-            </tr>
-            <tr>
-                <td class="cell c0">wwwroot:</td>
-                <td class="cell c1"><input type="text" name="wwwroot" value="" /></td>
-                <td class="cell c2">
-                    <select name="applicationid">
-<?php
-                foreach($applications as $application) {
-                    echo '                <option value="'.$application->id.'">'.$application->display_name."</option>\n";
-                }
-?>
-                    </select>
-                </td>
-                <td class="cell c3"></td>
-            </tr>
-            <tr>
-                <td class="cell c4" align="right" colspan="4"><input type="submit" value="<?php print_string('addhost','mnet'); ?>" /></td>
-            </tr>
-        
-        </table>
-    </form>
-</div>
-<?php
-admin_externalpage_print_footer();
-?>

admin/mnet/peers.php

@@ -1,184 +0,0 @@
-<?PHP // $Id$
-
-// Allows the admin to configure other Moodle hosts info
-
-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('mnetpeers');
-
-$context = get_context_instance(CONTEXT_SYSTEM);
-
-require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
-
-if (!extension_loaded('openssl')) {
-    admin_externalpage_print_header();
-    print_error('requiresopenssl', 'mnet');
-}
-
-if (!$site = get_site()) {
-    admin_externalpage_print_header();
-    print_error('nosite', '');
-}
-
-if (!function_exists('curl_init') ) {
-    admin_externalpage_print_header();
-    print_error('nocurl', 'mnet');
-}
-
-/// Initialize variables.
-
-// Step must be one of:
-// input   Parse the details of a new host and fetch its public key
-// commit  Save our changes (to a new OR existing host)
-$step   = optional_param('step', NULL, PARAM_ALPHA);
-$hostid = optional_param('hostid', NULL, PARAM_INT);
-
-// Fetch some strings for the HTML templates
-$strmnetservices   = get_string('mnetservices', 'mnet');
-$strmnetlog        = get_string('mnetlog', 'mnet');
-$strmnetedithost   = get_string('reviewhostdetails', 'mnet');
-$strmnetthemes     = get_string('mnetthemes', '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->wwwroot)) {
-        // ensure we remove trailing slashes
-        $form->wwwroot = preg_replace(':/$:', '', $form->wwwroot);
-
-        // ensure the wwwroot starts with a http or https prefix
-        if (strtolower(substr($form->wwwroot, 0, 4)) != 'http') {
-            $form->wwwroot = 'http://'.$form->wwwroot;
-        }
-    }
-
-    if(!function_exists('xmlrpc_encode_request')) {
-        trigger_error("You must have xml-rpc enabled in your PHP build to use this feature.");
-        print_error('xmlrpc-missing', 'mnet','peers.php');
-        exit;
-    }
-
-    if (!empty($form->updateregisterall)) {
-        if (!empty($form->registerallhosts)) {
-            set_config('mnet_register_allhosts',1);
-        } else {
-            set_config('mnet_register_allhosts',0);
-        }
-        redirect('peers.php', get_string('changessaved'));
-    } else {
-
-        $mnet_peer = new mnet_peer();
-    
-        if (!empty($form->id)) {
-            $form->id = clean_param($form->id, PARAM_INT);
-            $mnet_peer->set_id($form->id);
-        } else {
-            // PARAM_URL requires a genuine TLD (I think) This breaks my testing
-            $temp_wwwroot = clean_param($form->wwwroot, PARAM_URL);
-            if ($temp_wwwroot !== $form->wwwroot) {
-                trigger_error("We now parse the wwwroot with PARAM_URL. Your URL will need to have a valid TLD, etc.");
-                print_error("invalidurl", 'mnet','peers.php');
-                exit;
-            }
-            unset($temp_wwwroot);
-            $mnet_peer->set_applicationid($form->applicationid);
-            $application = get_field('mnet_application', 'name', 'id', $form->applicationid);
-            $mnet_peer->bootstrap($form->wwwroot, null, $application);
-        }
-
-        if (isset($form->name) && $form->name != $mnet_peer->name) {
-            $form->name = clean_param($form->name, PARAM_NOTAGS);
-            $mnet_peer->set_name($form->name);
-        }
-    
-        if (isset($form->deleted) && ($form->deleted == '0' || $form->deleted == '1')) {
-            $mnet_peer->updateparams->deleted = $form->deleted;
-            $mnet_peer->deleted = $form->deleted;
-        }
-    
-        if (isset($form->public_key)) {
-            $form->public_key = clean_param($form->public_key, PARAM_PEM);
-            if (empty($form->public_key)) {
-                print_error("invalidpubkey", 'mnet', 'peers.php?step=update&amp;hostid='.$mnet_peer->id);
-                exit;
-            } else {
-                $oldkey = $mnet_peer->public_key;
-                $mnet_peer->public_key = $form->public_key;
-                $mnet_peer->updateparams->public_key = addslashes($form->public_key);
-                $mnet_peer->public_key_expires = $mnet_peer->check_common_name($form->public_key);
-                $mnet_peer->updateparams->public_key_expires = $mnet_peer->check_common_name($form->public_key);
-                if ($mnet_peer->public_key_expires == false) {
-                    $errmsg = '<br />';
-                    foreach ($mnet_peer->error as $err) {
-                        $errmsg .= $err['code'] . ': ' . $err['text'].'<br />';
-                    }
-                    error(get_string("invalidpubkey", 'mnet') . $errmsg ,'peers.php?step=update&amp;hostid='.$mnet_peer->id);
-                    //print_error("invalidpubkey", 'mnet', 'peers.php?step=update&amp;hostid='.$mnet_peer->id, $errmsg);
-                    exit;
-                }
-            }
-        }
-
-        // PREVENT DUPLICATE RECORDS ///////////////////////////////////////////
-        if ('input' == $form->step) {
-            if ( isset($mnet_peer->id) && $mnet_peer->id > 0 ) {
-                print_error("hostexists", 'mnet', 'peers.php?step=update&amp;hostid='.$mnet_peer->id, $mnet_peer->id);
-            }
-        }
-
-        if ('input' == $form->step) {
-            include('./mnet_review.html');
-        } elseif ('commit' == $form->step) {
-            $bool = $mnet_peer->commit();
-            if ($bool) {
-                redirect('peers.php?step=update&amp;hostid='.$mnet_peer->id, get_string('changessaved'));
-            } else {
-                error('Invalid action parameter.', 'index.php');
-            }
-        }
-    }
-} elseif (is_int($hostid)) {
-    $mnet_peer = new mnet_peer();
-    $mnet_peer->set_id($hostid);
-    $currentkey = mnet_get_public_key($mnet_peer->wwwroot, $mnet_peer->application);
-    if($currentkey == $mnet_peer->public_key) unset($currentkey);
-    $form = new stdClass();
-    if ($hostid != $CFG->mnet_all_hosts_id) {
-        include('./mnet_review.html');
-    } else {
-        include('./mnet_review_allhosts.html');
-    }
-} else {
-    $hosts = get_records_sql('  SELECT 
-                                    h.id, 
-                                    h.wwwroot, 
-                                    h.ip_address, 
-                                    h.name, 
-                                    h.public_key, 
-                                    h.public_key_expires, 
-                                    h.transport, 
-                                    h.portno, 
-                                    h.last_connect_time, 
-                                    h.last_log_id, 
-                                    h.applicationid, 
-                                    a.name as app_name, 
-                                    a.display_name as app_display_name, 
-                                    a.xmlrpc_server_url
-                                FROM  
-                                    '.$CFG->prefix.'mnet_host h,  
-                                    '.$CFG->prefix.'mnet_application a  
-                                WHERE 
-                                    h.id != \''.$CFG->mnet_localhost_id.'\' AND  
-                                    h.deleted = \'0\' AND  
-                                    h.applicationid=a.id');
-
-    if (empty($hosts)) $hosts = array();
-    $applications = get_records('mnet_application');
-    include('./peers.html');
-}
-?>

admin/mnet/trustedhosts.html

@@ -1,68 +0,0 @@
-<?php
-admin_externalpage_print_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 $USER->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 $USER->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
-admin_externalpage_print_footer();
-?>

admin/mnet/trustedhosts.php

@@ -1,71 +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')) {
-        admin_externalpage_print_header();
-        print_error('requiresopenssl', 'mnet', '', NULL, true);
-    }
-    
-    if (!$site = get_site()) {
-        admin_externalpage_print_header();
-        print_error('nosite', '', '', NULL, true);
-    }
-
-    $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) {
-            list($network, $mask) = explode('/', $host.'/');
-            if (empty($network)) continue;
-            if (strlen($mask) == 0) $mask = 32;
-            
-            if (ip_in_range($test_ip_address, $network, $mask)) {
-                $in_range = true;
-                $validated_by = $network.'/'.$mask;
-                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

@@ -2,7 +2,16 @@
        // module.php - allows admin to edit all local configuration variables for a module
 
     require_once('../config.php');
-    require_once($CFG->libdir.'/adminlib.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.
 
@@ -10,12 +19,11 @@
         $module = optional_param('module', '', PARAM_SAFEDIR);
 
         if (!confirm_sesskey()) {
-            print_error('confirmsesskeybad', 'error');
+            error(get_string('confirmsesskeybad', 'error'));
         }
 
         if ($module != '') {
-            include_once("$CFG->dirroot/mod/$module/lib.php");
-            admin_externalpage_setup('modsetting'.$module);
+            require_once("$CFG->dirroot/mod/$module/lib.php");
             // if the config.html contains a hidden form field giving
             // the module name then the form does not have to prefix all
             // its variable names, we will do it here.
@@ -27,8 +35,6 @@
                 $moduleconfig($config);
             }
         } else {
-            admin_externalpage_setup('managemodules');
-
             $moduleprefix = '';
         }
 
@@ -44,26 +50,31 @@
 
 /// Otherwise print the form.
     $module = required_param('module', PARAM_SAFEDIR);
-    include_once("$CFG->dirroot/mod/$module/lib.php");
-    admin_externalpage_setup('modsetting'.$module);
+    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);
-
+    
     // $CFG->pagepath is used to generate the body and id attributes for the body tag
     // of the page. It is also used to generate the link to the Moodle Docs for this view.
     $CFG->pagepath = 'mod/' . $module . '/config';
-
-    admin_externalpage_print_header();
+    
+    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(get_string("configwarning", 'admin'), "center", "60%");
+    print_simple_box("<center>".get_string("configwarning", 'admin')."</center>", "center", "60%");
     echo "<br />";
 
     print_simple_box_start("center", "");
     include("$CFG->dirroot/mod/$module/config.html");
     print_simple_box_end();
 
-    admin_externalpage_print_footer();
+    print_footer();
 
 ?>

admin/modules.php

@@ -3,24 +3,28 @@
 
     require_once('../config.php');
     require_once('../course/lib.php');
-    require_once($CFG->libdir.'/adminlib.php');
-    require_once($CFG->libdir.'/tablelib.php');
-    require_once($CFG->libdir.'/ddllib.php');
-
-    // defines
-    define('MODULE_TABLE','module_administration_table');
-
-    admin_externalpage_setup('managemodules');
 
     $show    = optional_param('show', '', PARAM_SAFEDIR);
     $hide    = optional_param('hide', '', PARAM_SAFEDIR);
     $delete  = optional_param('delete', '', PARAM_SAFEDIR);
     $confirm = optional_param('confirm', '', PARAM_BOOL);
 
+    require_login();
+
+    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");
@@ -28,7 +32,15 @@
     $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);
+   
+    $coursesaffected = false;
+    
 
 /// If data submitted, then process and store.
 
@@ -36,54 +48,31 @@
         if (!$module = get_record("modules", "name", $hide)) {
             error("Module doesn't exist!");
         }
-        set_field("modules", "visible", "0", "id", $module->id); // Hide main module
-        // Remember the visibility status in visibleold
-        // and hide...
-        $sql = "UPDATE {$CFG->prefix}course_modules
-                SET visibleold=visible,
-                    visible=0
-                WHERE  module={$module->id}";
-        execute_sql($sql, false);
-        // clear the course modinfo cache for courses
-        // where we just deleted something
-        $sql = "UPDATE {$CFG->prefix}course
-                SET modinfo=''
-                WHERE id IN (SELECT DISTINCT course
-                             FROM {$CFG->prefix}course_modules
-                             WHERE visibleold=1 AND module={$module->id})";
-        execute_sql($sql, false);
-        admin_get_root(true, false);  // settings not required - only pages
+        set_field("modules", "visible", "0", "id", $module->id);                               // Hide main module
+        set_field('course_modules', 'visibleold', '1', 'visible' ,'1', 'module', $module->id); // Remember the previous visible state so we can toggle this back if the module is unhidden.
+        set_field('course_modules', 'visibleold', '0', 'visible' ,'0', 'module', $module->id);
+        set_field("course_modules", "visible", "0", "module", $module->id);                    // Hide all related activity modules
+        $coursesaffected = true;
     }
 
     if (!empty($show) and confirm_sesskey()) {
         if (!$module = get_record("modules", "name", $show)) {
             error("Module doesn't exist!");
         }
-        set_field("modules", "visible", "1", "id", $module->id); // Show main module
-        set_field('course_modules', 'visible', '1', 'visibleold',
-                  '1', 'module', $module->id); // Get the previous saved visible state for the course module.
-        // clear the course modinfo cache for courses
-        // where we just made something visible
-        $sql = "UPDATE {$CFG->prefix}course
-                SET modinfo=''
-                WHERE id IN (SELECT DISTINCT course
-                             FROM {$CFG->prefix}course_modules
-                             WHERE visible=1 AND module={$module->id})";
-        execute_sql($sql, false);
-        admin_get_root(true, false);  // settings not required - only pages
+        set_field("modules", "visible", "1", "id", $module->id);                               // Show main module
+        set_field('course_modules', 'visible', '1', 'visibleold', '1', 'module', $module->id); // Get the previous saved visible state for the course module.
+        $coursesaffected = true;
     }
 
     if (!empty($delete) and confirm_sesskey()) {
-        admin_externalpage_print_header();
-        print_heading($stractivities);
-
+      
         $strmodulename = get_string("modulename", "$delete");
 
         if (!$confirm) {
-            notice_yesno(get_string("moduledeleteconfirm", "", $strmodulename),
-                         "modules.php?delete=$delete&amp;confirm=1&amp;sesskey=$USER->sesskey",
+            notice_yesno(get_string("moduledeleteconfirm", "", $strmodulename), 
+                         "modules.php?delete=$delete&amp;confirm=1&amp;sesskey=$USER->sesskey", 
                          "modules.php");
-            admin_externalpage_print_footer();
+            print_footer();
             exit;
 
         } else {  // Delete everything!!
@@ -105,33 +94,12 @@
                 }
             }
 
-            // delete calendar events
-            if (!delete_records("event", "modulename", $delete)) {
-                notify("Error occurred while deleting all $strmodulename records in calendar event table");
-            }
-
-            // clear course.modinfo for courses
-            // that used this module...
-            $sql = "UPDATE {$CFG->prefix}course
-                    SET modinfo=''
-                    WHERE id IN (SELECT DISTINCT course
-                                 FROM {$CFG->prefix}course_modules
-                                 WHERE module={$module->id})";
-            execute_sql($sql, false);
-
             // 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");
             }
-            if ($coursemods) {
-                foreach ($coursemods as $coursemod) {
-                    if (!delete_context(CONTEXT_MODULE, $coursemod->id)) {
-                        notify("Could not delete the context for $strmodulename with id = $coursemod->id");
-                    }
-                }
-            }
 
-            // Then delete all the logs
+            // Then delete all the logs 
             if (!delete_records("log", "module", $module->name)) {
                 notify("Error occurred while deleting all $strmodulename records in log table");
             }
@@ -146,43 +114,32 @@
                 notify("Error occurred while deleting the $strmodulename record from modules table");
             }
 
-            // And the module configuration records
-            if (!execute_sql("DELETE FROM {$CFG->prefix}config WHERE name LIKE '{$module->name}_%'")) {
-                notify("Error occurred while deleting the $strmodulename records from the config table");
-            }
-
-            // cleanup the gradebook
-            require_once($CFG->libdir.'/gradelib.php');
-            grade_uninstalled_module($module->name);
-
             // Then the tables themselves
-            drop_plugin_tables($module->name, "$CFG->dirroot/mod/$module->name/db/install.xml", false);
 
-            // Delete the capabilities that were defined by this module
-            capabilities_cleanup('mod/'.$module->name);
-
-            // remove entent handlers and dequeue pending events
-            events_uninstall('mod/'.$module->name);
-
-            // Perform any custom uninstall tasks
-            if (file_exists($CFG->dirroot . '/mod/' . $module->name . '/lib.php')) {
-                require_once($CFG->dirroot . '/mod/' . $module->name . '/lib.php');
-                $uninstallfunction = $module->name . '_uninstall';
-                if (function_exists($uninstallfunction)) {
-                    if (! $uninstallfunction() ) {
-                        notify('Encountered a problem running uninstall function for '. $module->name.'!');
+            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
+            $coursesaffected = true;
 
             $a->module = $strmodulename;
             $a->directory = "$CFG->dirroot/mod/$delete";
             notice(get_string("moduledeletefiles", "", $a), "modules.php");
         }
     }
-
-    admin_externalpage_print_header();
-    print_heading($stractivities);
+    
+    if ($coursesaffected) {
+        rebuild_course_cache();  // Because things have changed
+    }
+    
 
 /// Get and sort the existing modules
 
@@ -198,74 +155,50 @@
         }
         $modulebyname[$strmodulename] = $module;
     }
-    ksort($modulebyname, SORT_LOCALE_STRING);
+    ksort($modulebyname);
 
 /// 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 generalbox boxaligncenter boxwidthwide');
-    $table->setup();
+
+    $table->head  = array ($stractivitymodule, $stractivities, $strversion, "$strhide/$strshow", $strdelete, $strsettings);
+    $table->align = array ("left", "right", "left", "center", "center", "center");
+    $table->wrap  = array ("nowrap", "", "", "", "","");
+    $table->size  = array ("100%", "10", "10", "10", "10","12");
+    $table->width = "100";
 
     foreach ($modulebyname as $modulename => $module) {
 
-        // took out hspace="\10\", because it does not validate. don't know what to replace with.
-        $icon = "<img src=\"$CFG->modpixpath/$module->name/icon.gif\" class=\"icon\" alt=\"\" />";
+        $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/settings.php")) {
-            $settings = "<a href=\"settings.php?section=modsetting$module->name\">$strsettings</a>";
-        } else if (file_exists("$CFG->dirroot/mod/$module->name/config.html")) {
+        if (file_exists("$CFG->dirroot/mod/$module->name/config.html")) {
             $settings = "<a href=\"module.php?module=$module->name\">$strsettings</a>";
         } else {
             $settings = "";
         }
 
-        $count = count_records_select("$module->name",'course<>0');
-        if ($count>0) {
-            $countlink = "<a href=\"{$CFG->wwwroot}/course/search.php?modulelist=$module->name" .
-                "&amp;sesskey={$USER->sesskey}\" title=\"$strshowmodulecourse\">$count</a>";
-        }
-        else {
-            $countlink = "$count";
-        }
+        $count = count_records("$module->name");
 
         if ($module->visible) {
             $visible = "<a href=\"modules.php?hide=$module->name&amp;sesskey=$USER->sesskey\" title=\"$strhide\">".
-                       "<img src=\"$CFG->pixpath/i/hide.gif\" class=\"icon\" alt=\"$strhide\" /></a>";
+                       "<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=$USER->sesskey\" title=\"$strshow\">".
-                       "<img src=\"$CFG->pixpath/i/show.gif\" class=\"icon\" alt=\"$strshow\" /></a>";
-            $class = " class=\"dimmed_text\"";
+                       "<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 = "";
         }
-
-        $extra = '';
-        if (!file_exists("$CFG->dirroot/mod/$module->name/lib.php")) {
-            $extra = ' <span class="notifyproblem">('.get_string('missingfromdisk').')</span>';
-        }
-
-        $table->add_data(array(
-            '<span'.$class.'>'.$icon.' '.$modulename.$extra.'</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 "<br /><br />";
 
-    admin_externalpage_print_footer();
+    print_footer();
 
 ?>

admin/multilangupgrade.php

@@ -1,121 +0,0 @@
-<?php /// $Id$
-      /// Search and replace strings throughout all texts in the whole database
-
-require_once('../config.php');
-require_once($CFG->dirroot.'/course/lib.php');
-require_once($CFG->libdir.'/adminlib.php');
-
-admin_externalpage_setup('multilangupgrade');
-
-$go = optional_param('go', 0, PARAM_BOOL);
-
-###################################################################
-admin_externalpage_print_header();
-
-print_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());
-    notice_yesno($strmultilangupgrade, 'multilangupgrade.php', 'index.php', $optionsyes, null, 'post', 'get');
-    admin_externalpage_print_footer();
-    die;
-}
-
-
-if (!$tables = $db->Metatables() ) {    // No tables yet at all.
-    error("no tables");
-}
-
-print_simple_box_start('center');
-
-/// Turn off time limits, sometimes upgrades can be slow.
-
-@set_time_limit(0);
-@ob_implicit_flush(true);
-while(@ob_end_flush());
-
-echo '<strong>Progress:</strong>';
-$i = 0;
-$skiptables = array($CFG->prefix.'config', $CFG->prefix.'user_students', $CFG->prefix.'user_teachers');//, $CFG->prefix.'sessions2');
-
-foreach ($tables as $table) {
-    if (($CFG->prefix && strpos($table, $CFG->prefix) !== 0)
-      or strpos($table, $CFG->prefix.'pma') === 0) { // Not our tables
-        continue;
-    }
-    if (in_array($table, $skiptables)) { // Don't process these
-        continue;
-    }
-    if ($columns = $db->MetaColumns($table, false)) {
-        if (!array_key_exists('id', $columns) and !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
-                $rs = get_recordset_sql("SELECT id, $column FROM $table WHERE $column LIKE '%</lang>%' OR $column LIKE '%<span lang=%'");
-                if ($rs) {
-                    while (!$rs->EOF) {
-                        $text = $rs->fields[$column];
-                        $id   = $rs->fields['id'];
-
-                        if ($i % 600 == 0) {
-                            echo '<br />';
-                        }
-                        if ($i % 10 == 0) {
-                            echo '.';
-                        }
-                        $i++;
-                        $rs->MoveNext();
-
-                        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) {
-                            $newtext = addslashes($newtext);
-                            execute_sql("UPDATE $table SET $column='$newtext' WHERE id=$id", false);
-                        }
-                    }
-                    rs_close($rs);
-                }
-            }
-        }
-    }
-}
-
-// set conversion flag - switches to new plugin automatically
-set_config('filter_multilang_converted', 1);
-
-print_simple_box_end();
-
-/// Rebuild course cache which might be incorrect now
-notify('Rebuilding course cache...', 'notifysuccess');
-rebuild_course_cache();
-notify('...finished', 'notifysuccess');
-
-print_continue('index.php');
-
-admin_externalpage_print_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,13 +3,19 @@
 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');
 
-    admin_externalpage_print_header();
     online_assignment_cleanup(true);
-    admin_externalpage_print_footer();
+
+    print_footer();
 
 }
 
@@ -42,7 +48,7 @@ function online_assignment_cleanup($output=false) {
 
 
     /// get a list of all courses on this site
-    $courses = get_records('course');
+    $courses = get_courses();
 
     /// cycle through each course
     foreach ($courses as $course) {
@@ -69,7 +75,7 @@ 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
+                    $sql = "SELECT a.id 
                         FROM  {$CFG->prefix}course_modules cm,
                     {$CFG->prefix}assignment a
                     WHERE cm.id = '$instance' AND
@@ -95,7 +101,7 @@ function online_assignment_cleanup($output=false) {
 
                         /// grab the section record
                         if (!($section = get_record('course_sections', 'id', $newsection))) {
-                            if ($output) echo 'Serious error: Cannot retrieve section: '.$newsection.' for course: '. format_string($course->fullname) .'<br />';
+                            if ($output) echo 'Serious error: Cannot retrieve section: '.$newsection.' for course: '.$course->fullname.'<br />';
                             continue;
                         }
 
@@ -134,7 +140,7 @@ function online_assignment_cleanup($output=false) {
 
                         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 />';
 
                     }

admin/pagelib.php

@@ -1,165 +0,0 @@
-<?php // $Id$
-
-require_once($CFG->libdir.'/pagelib.php');
-
-define('PAGE_ADMIN', 'admin');
-
-// Bounds for block widths
-// more flexible for theme designers taken from theme config.php
-$lmin = (empty($THEME->block_l_min_width)) ? 0 :   $THEME->block_l_min_width;
-$lmax = (empty($THEME->block_l_max_width)) ? 210 : $THEME->block_l_max_width;
-$rmin = (empty($THEME->block_r_min_width)) ? 0 :   $THEME->block_r_min_width;
-$rmax = (empty($THEME->block_r_max_width)) ? 210 : $THEME->block_r_max_width;
-
-define('BLOCK_L_MIN_WIDTH', $lmin);
-define('BLOCK_L_MAX_WIDTH', $lmax);
-define('BLOCK_R_MIN_WIDTH', $rmin);
-define('BLOCK_R_MAX_WIDTH', $rmax);
-
-page_map_class(PAGE_ADMIN, 'page_admin');
-
-class page_admin extends page_base {
-
-    var $section = '';
-    var $visiblepathtosection;
-    var $extraurlparams = array();
-    var $extrabutton = '';
-    var $url = '';
-
-    // hack alert!
-    // this function works around the inability to store the section name
-    // in default block, maybe we should "improve" the blocks a bit?
-    function init_extra($section) {
-        global $CFG;
-
-        if($this->full_init_done) {
-            return;
-        }
-
-        $adminroot =& admin_get_root(false, false); //settings not required - only pages
-
-        // fetch the path parameter
-        $this->section = $section;
-        $current =& $adminroot->locate($section, true);
-        $this->visiblepathtosection = array_reverse($current->visiblepath);
-
-        // all done
-        $this->full_init_done = true;
-    }
-
-    function blocks_get_default() {
-        return 'admin_tree,admin_bookmarks';
-    }
-
-    // seems reasonable that the only people that can edit blocks on the admin pages
-    // are the admins... but maybe we want a role for this?
-    function user_allowed_editing() {
-        return has_capability('moodle/site:manageblocks', get_context_instance(CONTEXT_SYSTEM));
-    }
-
-    // has to be fixed. i know there's a "proper" way to do this
-    function user_is_editing() {
-        global $USER;
-        return $USER->adminediting;
-    }
-
-    function url_get_path() {
-        global $CFG;
-        if (!empty($this->url)) {
-            return $this->url;
-        }
-
-        $adminroot =& admin_get_root(false, false); //settings not required - only pages
-
-        $root =& $adminroot->locate($this->section);
-        if (is_a($root, 'admin_externalpage')) {
-            return $root->url;
-        } else {
-            return ($CFG->wwwroot . '/' . $CFG->admin . '/settings.php');
-        }
-    }
-
-    /**
-     * Use this to pass extra HTML that is added after the turn blocks editing on/off button.
-     *
-     * @param string $extrabutton HTML code.
-     */
-    function set_extra_button($extrabutton) {
-        $this->extrabutton = $extrabutton;
-    }
-
-    /**
-     * Use this to pass extra URL parameters that, for example, the blocks editing controls need to reload the current page accurately.
-     *
-     * @param array $extraurlparams paramname => value array.
-     */
-    function set_extra_url_params($extraurlparams, $actualurl = '') {
-        $this->extraurlparams = $extraurlparams;
-        if (!empty($actualurl)) {
-            $this->url = $actualurl;
-        }
-    }
-
-    function url_get_parameters() {  // only handles parameters relevant to the admin pagetype
-        return array_merge($this->extraurlparams, array('section' => $this->section));
-    }
-
-    function blocks_get_positions() {
-        return array(BLOCK_POS_LEFT, BLOCK_POS_RIGHT);
-    }
-
-    function blocks_default_position() {
-        return BLOCK_POS_LEFT;
-    }
-
-    function blocks_move_position(&$instance, $move) {
-        if($instance->position == BLOCK_POS_LEFT && $move == BLOCK_MOVE_RIGHT) {
-            return BLOCK_POS_RIGHT;
-        } else if ($instance->position == BLOCK_POS_RIGHT && $move == BLOCK_MOVE_LEFT) {
-            return BLOCK_POS_LEFT;
-        }
-        return $instance->position;
-    }
-
-    // does anything need to be done here?
-    function init_quick($data) {
-        parent::init_quick($data);
-    }
-
-    function print_header($section = '', $focus='') {
-        global $USER, $CFG, $SITE;
-
-        $this->init_full($section); // we're trusting that init_full() has already been called by now; it should have.
-                                    // if not, print_header() has to be called with a $section parameter
-
-        // The search page currently doesn't handle block editing
-        if ($this->section != 'search' and $this->user_allowed_editing()) {
-            $options = $this->url_get_parameters();
-            if ($this->user_is_editing()) {
-                $caption = get_string('blockseditoff');
-                $options['adminedit'] = 'off';
-            } else {
-                $caption = get_string('blocksediton');
-                $options['adminedit'] = 'on';
-            }
-            $buttons = print_single_button($this->url_get_path(), $options, $caption, 'get', '', true);
-        } else {
-            $buttons = '&nbsp;';
-        }
-        $buttons .= $this->extrabutton;
-
-        $navlinks = array();
-        foreach ($this->visiblepathtosection as $element) {
-            $navlinks[] = array('name' => $element, 'link' => null, 'type' => 'misc');
-        }
-        $navigation = build_navigation($navlinks);
-
-        print_header("$SITE->shortname: " . implode(": ",$this->visiblepathtosection), $SITE->fullname, $navigation, $focus, '', true, $buttons, '');
-    }
-
-    function get_type() {
-        return PAGE_ADMIN;
-    }
-}
-
-?>

admin/phpinfo.php

@@ -2,32 +2,38 @@
        // phpinfo.php - shows phpinfo for the current server
 
     require_once("../config.php");
-    require_once($CFG->libdir.'/adminlib.php');
 
-    admin_externalpage_setup('phpinfo');
+    $topframe    = optional_param('topframe', false, PARAM_BOOL);
+    $bottomframe = optional_param('bottomframe', false, PARAM_BOOL);
 
-    admin_externalpage_print_header();
+    require_login();
 
-    echo '<div class="phpinfo">';
+    if (!isadmin()) {
+        error("Only the admin can use this page");
+    }
 
-    ob_start();
-    phpinfo(INFO_GENERAL + INFO_CONFIGURATION + INFO_MODULES);
-    $html = ob_get_contents();
-    ob_end_clean();
+    if (!$topframe && !$bottomframe) {
+        ?>
 
-/// 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);
+        <head>
+        <title>PHP info</title>
+        </head>
 
-    echo $html;
+        <frameset rows="80,*">
+           <frame src="phpinfo.php?topframe=true&amp;sesskey=<?php echo $USER->sesskey ?>">
+           <frame src="phpinfo.php?bottomframe=true&amp;sesskey=<?php echo $USER->sesskey ?>">
+        </frameset>
 
-    echo '</div>';
-
-    admin_externalpage_print_footer();
+        <?php
+    } else if ($topframe && confirm_sesskey()) {
+        $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;
+    } else if ($bottomframe && confirm_sesskey()) {
+        phpinfo();
+        exit;
+    }
 ?>

admin/process_email.php

@@ -16,8 +16,8 @@ if ($_ENV['RECIPIENT'] == $CFG->noreplyaddress) {
     }
     
     $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) {
@@ -54,7 +54,7 @@ if ($modid == '0') { // special
 }
 else {
     $modname = get_field("modules","name","id",$modid);
-    include_once('mod/'.$modname.'/lib.php');
+    require_once('mod/'.$modname.'/lib.php');
 }
 $function = $modname.'_process_email';
 

admin/questiontypes.php

@@ -0,0 +1,171 @@
+<?PHP // $Id$
+      // Allows the admin to manage questiontypes
+      // This page is adapted from modules.php
+      
+      // This page is not yet in service, the whole plug-in architecture
+      // for question types is still under construction.
+
+    require_once('../config.php');
+
+    $show    = optional_param('show', '', PARAM_SAFEDIR);
+    $hide    = optional_param('hide', '', PARAM_SAFEDIR);
+    $delete  = optional_param('delete', '', PARAM_SAFEDIR);
+    $confirm = optional_param('confirm', '', PARAM_BOOL);
+
+    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");
+    $strdelete = get_string("delete");
+    $strversion = get_string("version");
+    $strhide = get_string("hide");
+    $strshow = get_string("show");
+    $strsettings = get_string("settings");
+    $strquestions = get_string("questions");
+    $strquestiontype = get_string("questiontype", 'quiz');
+
+    print_header("$site->shortname: $strquestions", "$site->fullname", 
+                 "<a href=\"index.php\">$stradministration</a> -> ".
+                 "<a href=\"configure.php\">$strconfiguration</a> -> $strquestions");
+
+    print_heading($strquestions);
+   
+
+/// If data submitted, then process and store.
+
+    if (!empty($hide) and confirm_sesskey()) {
+        if (!$qtype = get_record("question_types", "name", $hide)) {
+            error("Question type doesn't exist!");
+        }
+        set_field("question_types", "visible", "0", "id", $qtype->id);            // Hide question type
+    }
+
+    if (!empty($show) and confirm_sesskey()) {
+        if (!$qtype = get_record("question_types", "name", $show)) {
+            error("Question type doesn't exist!");
+        }
+        set_field("question_types", "visible", "1", "id", $qtype->id);            // Show question type
+    }
+
+    if (!empty($delete) and confirm_sesskey()) {
+      
+        $strqtypename = get_string("qtypename", "qtype_$delete");
+
+        if (!$confirm) {
+            notice_yesno(get_string("qtypedeleteconfirm", "admin", $strqtypename), 
+                         "questiontypes.php?delete=$delete&amp;confirm=1&amp;sesskey=$USER->sesskey", 
+                         "questiontypes.php");
+            print_footer();
+            exit;
+
+        } else {  // Delete everything!!
+
+            if ($delete == "random") {
+                error("You can not delete the random question type!!");
+            }
+
+            if (!$qtype = get_record("question_types", "name", $delete)) {
+                error("Question type doesn't exist!");
+            }
+
+            // OK, first delete all the questions
+            if ($questions = get_records("quiz_questions", "qtype", $qtype->id)) {
+                foreach ($questions as $question) {
+                    if (! quiz_delete_question($coursemod->id, $coursemod->section)) {
+                        notify("Could not delete the $strqtypename with id = $question->id");
+                    }
+                }
+            }
+
+            // And the qtype entry itself
+            if (!delete_records("question_types", "name", $qtype->name)) {
+                notify("Error occurred while deleting the $strqtypename record from question_types table");
+            }
+
+            // Then the tables themselves
+
+            if ($tables = $db->Metatables()) {
+                $prefix = $CFG->prefix.$qtype->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->qtype = $strqtypename;
+            $a->directory = "$CFG->dirroot/qtype/$delete";
+            notice(get_string("qtypedeletefiles", "", $a), "questiontypes.php");
+        }
+    }
+
+/// Get and sort the existing questiontypes
+
+    if (!$qtypes = get_records("question_types")) {
+        error("No question types found!!");        // Should never happen
+    }
+
+    foreach ($qtypes as $qtype) {
+        $strqtypename = get_string("qtypename", "qtype_$qtype->name");
+        $qtypebyname[$strqtypename] = $qtype;
+    }
+    ksort($qtypebyname);
+
+/// Print the table of all questiontypes
+
+    $table->head  = array ($strquestiontype, $strquestions, $strversion, "$strhide/$strshow", $strdelete, $strsettings);
+    $table->align = array ("left", "right", "left", "center", "center", "center");
+    $table->wrap  = array ("nowrap", "", "", "", "","");
+    $table->size  = array ("100%", "10", "10", "10", "10","12");
+    $table->width = "100";
+
+    foreach ($qtypebyname as $qtypename => $qtype) {
+
+        $icon = "<img src=\"$CFG->dirroot/mod/quiz/questiontypes/$qtype->name/icon.gif\" hspace=\"10\" height=\"16\" width=\"16\" border=\"0\" alt=\"\" />";
+
+        if (file_exists("$CFG->dirroot/mod/quiz/questiontypes/$qtype->name/config.html")) {
+            $settings = "<a href=\"questiontype.php?qtype=$qtype->name\">$strsettings</a>";
+        } else {
+            $settings = "";
+        }
+
+        $count = count_records('quiz_questions', 'qtype', $qtype->id);
+
+        $delete = $count ? '' : "<a href=\"questiontypes.php?delete=$qtype->name&amp;sesskey=$USER->sesskey\">$strdelete</a>";
+        
+        if ($qtype->visible) {
+            $visible = "<a href=\"questiontypes.php?hide=$qtype->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=\"questiontypes.php?show=$qtype->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 ($qtype->name == "random") {
+            $delete = "";
+            $visible = "";
+            $class = "";
+        }
+        $table->data[] = array ("<span $class>$icon $qtypename</span>", $count, $qtype->version, $visible, $delete, $settings);
+    }
+    print_table($table);
+
+    echo "<br /><br />";
+
+    print_footer();
+
+?>

admin/register.php

@@ -5,14 +5,16 @@
 
     require_login();
 
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
+    if (!isadmin()) {
+        error("Only the admin can use this page");
+    }
 
     if (!$site = get_site()) {
         redirect("index.php");
     }
 
     if (!confirm_sesskey()) {
-        print_error('confirmsesskeybad', 'error');
+        error(get_string('confirmsesskeybad', 'error'));
     }
 
     if (!$admin = get_admin()) {
@@ -23,164 +25,170 @@
         $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");
-    $navlinks = array();
-    $navlinks[] = array('name' => $stradministration, 'link' => "../$CFG->admin/index.php", 'type' => 'misc');
-    $navlinks[] = array('name' => $strregistration, 'link' => null, 'type' => 'misc');
-    $navigation = build_navigation($navlinks);
-    print_header("$site->shortname: $strregistration", $site->fullname, $navigation);
+
+    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
 
-    echo "<form id=\"mform1\" class=\"mform\" action=\"http://moodle.org/register/\" method=\"post\">\n";
-    echo '<fieldset id="registration">';
-    echo '<legend>'.get_string("registrationinfotitle").'</legend>';
+    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=\"" . get_site_identifier() . "\" />\n";
-    echo "<input type=\"hidden\" name=\"host\" value=\"".$_SERVER["HTTP_HOST"]."\" />\n";
-    echo "<input type=\"hidden\" name=\"lang\" value=\"".current_language()."\" />\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 "<input type=\"hidden\" name=\"version\" value=\"$CFG->version\" />\n";
-    echo "<input type=\"hidden\" name=\"release\" value=\"$CFG->release\" />\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 '<div class="fitem">';
-    echo '<div class="fitemtitle"><label>URL</label></div>';
-    echo '<div class="felement ftext">'.$CFG->wwwroot.'</div>';
-    echo '</div>';
+    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 '<div class="fitem">';
-    echo '<div class="fitemtitle"><label>'.get_string("currentversion").'</label></div>';
-    echo '<div class="felement ftext">'."$CFG->release ($CFG->version)".'</div>';
-    echo '</div>';
-
-    echo '<div class="fitem">';
-    echo '<div class="fitemtitle"><label for="sitename">'.get_string("fullsitename").'</label></div>';
-    echo '<div class="felement ftext">';
-    echo '<input size="50" id="sitename" type="text" name="sitename" value="'.format_string($site->fullname).'" />';
-    echo '</div>';
-    echo '</div>';
-
-    echo '<div class="fitem">';
-    echo '<div class="fitemtitle"><label for="menucountry">'.get_string("country").'</label></div>';
-    echo '<div class="felement ftext">';
+    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 '</div>';
-    echo '</div>';
+    echo "</td>\n";
+    echo "</tr>\n";
 
-    echo '<div class="fitem">';
-    echo '<div class="fitemtitle"><label for="menupublic">'."<a href=\"http://moodle.org/sites/?country=$admin->country\" title=\"".get_string("publicdirectorytitle")."\">".get_string("publicdirectory")."</a>".'</label></div>';
-    echo '<div class="felement ftext">';
+    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 '</div>';
-    echo '</div>';
+    echo "</td>\n";
+    echo "</tr>\n";
 
-    echo '<div class="fitem">';
-    echo '<div class="fitemtitle"><label for="menucontact">'.get_string("registrationcontact").'</label></div>';
-    echo '<div class="felement ftext">';
+    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 '</div>';
-    echo '</div>';
+    echo "</td>\n";
+    echo "</tr>\n";
 
-    echo '<div class="fitem">';
-    echo '<div class="fitemtitle"><label>'.get_string("statistics")."<br />(".get_string("notpublic").')'.'</label></div>';
-    echo '<div class="felement ftext">';
+    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 "<input type=\"hidden\" name=\"courses\" value=\"$count\">\n";
     echo '<br />';
 
-    $count = count_records('user', 'deleted', 0);
+    $count = count_records('user')-1;
     echo get_string("users").": ".$count;
-    echo "<input type=\"hidden\" name=\"users\" value=\"$count\" />\n";
+    echo "<input type=\"hidden\" name=\"users\" value=\"$count\">\n";
     echo '<br />';
 
-    // total number of role assignments
-    $count = count_records('role_assignments');
-    echo get_string('roleassignments', 'role').": ".$count;
-    echo "<input type=\"hidden\" name=\"roleassignments\" value=\"$count\" />\n";
+    $count = count_records('user_students');
+    echo get_string("enrolments").": ".$count;
+    echo "<input type=\"hidden\" name=\"enrolments\" value=\"$count\">\n";
     echo '<br />';
 
-    // first find all distinct roles with mod/course:update
-    // please change the name and strings to something appropriate to reflect the new data collected
-    $sql = "SELECT COUNT(DISTINCT u.id)
-            FROM {$CFG->prefix}role_capabilities rc,
-                 {$CFG->prefix}role_assignments ra,
-                 {$CFG->prefix}user u
-            WHERE (rc.capability = 'moodle/course:update' or rc.capability='moodle/site:doanything')
-                   AND rc.roleid = ra.roleid
-                   AND u.id = ra.userid";
-
-    $count = count_records_sql($sql);
+    $count = count_records('user_teachers');
     echo get_string("teachers").": ".$count;
-    echo "<input type=\"hidden\" name=\"courseupdaters\" value=\"$count\" />\n";
+    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 "<input type=\"hidden\" name=\"posts\" value=\"$count\">\n";
     echo '<br />';
 
     $count = count_records('question');
     echo get_string("questions", 'quiz').": ".$count;
-    echo "<input type=\"hidden\" name=\"questions\" value=\"$count\" />\n";
+    echo "<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 '</div>';
-    echo '</div>';
+    echo "<input type=\"hidden\" name=\"resources\" value=\"$count\">\n";
+    echo '<br />';
 
-    echo '<div class="fitem">';
-    echo '<div class="fitemtitle"><label for="adminname">'.get_string("administrator").'</label></div>';
-    echo '<div class="felement ftext">';
-    echo "<input size=\"50\" type=\"text\" id=\"adminname\" name=\"adminname\" value=\"".fullname($admin, true)."\" />";
-    echo '</div>';
-    echo '</div>';
+    echo "</td>\n";
+    echo "</tr>\n";
 
-    echo '<div class="fitem">';
-    echo '<div class="fitemtitle"><label for="adminemail">'.get_string("email").'</label></div>';
-    echo '<div class="felement ftext">';
-    echo "<input size=\"50\" type=\"text\" id=\"adminemail\" name=\"adminemail\" value=\"$admin->email\" />";
-    echo '</div>';
-    echo '</div>';
+    echo "<tr valign=\"top\">\n";
+    echo "<td align=\"center\" colspan=\"2\"><hr size=\"1\" noshade>".get_string("administrator")."</td>\n";
+    echo "</tr>\n";
 
-    echo '<div class="fitem">';
-    echo '<div class="fitemtitle"><label for="menumailme">'.get_string("registrationemail").'</label></div>';
-    echo '<div class="felement ftext">';
+    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 '</div>';
-    echo '</div>';
+    echo "</td>\n";
+    echo "</tr>\n";
 
-    echo '<div class="felement fsubmit"><input name="submitbutton" value="'.get_string('registrationsend').'" type="submit" id="id_submitbutton" /></div>';
+    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 "</fieldset>\n";
 
+    echo "</table>\n";
     echo "</form>\n";
 
+    print_simple_box_end();
+
+    echo "<br />\n";
+
     print_footer();
 
 ?>

admin/replace.php

@@ -2,65 +2,57 @@
       /// Search and replace strings throughout all texts in the whole database
 
 require_once('../config.php');
-require_once($CFG->dirroot.'/course/lib.php');
-require_once($CFG->libdir.'/adminlib.php');
-
-admin_externalpage_setup('replace');
 
 $search  = optional_param('search', '', PARAM_RAW);
 $replace = optional_param('replace', '', PARAM_RAW);
 
+require_login();
+
+if (!isadmin()) {
+    error("Admins only");
+}
+
 ###################################################################
-admin_externalpage_print_header();
-
-print_heading('Search and replace text throughout the whole database');
+print_header('Search and replace throughout the whole database', 'Replace text within the whole database');
 
 
-if (!data_submitted() or !$search or !$replace or !confirm_sesskey()) {   /// Print a form
+if (!$search or !$replace or !confirm_sesskey()) {   /// Print a form
 
     print_simple_box_start('center');
-    echo '<div class="mdl-align">';
-    echo '<form action="replace.php" method="post">';
-    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
-    echo 'Search whole database for: <input type="text" name="search" /><br />';
-    echo 'Replace with this string: <input type="text" name="replace" /><br />';
-    echo '<input type="submit" value="Yes, do it now" /><br />';
+    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>';
     print_simple_box_end();
-    admin_externalpage_print_footer();
     die;
 }
 
-print_simple_box_start('center');
 
-if (!db_replace($search, $replace)) {
-    error('An error has occured during this process'); 
+if (!$tables = $db->Metatables() ) {    // No tables yet at all.
+    error("no tables");
 }
 
-print_simple_box_end();
-
-/// Try to replace some well-known serialised contents (html blocks)
-notify('Replacing in html blocks...');
-$sql = "SELECT bi.*
-          FROM {$CFG->prefix}block_instance bi
-          JOIN {$CFG->prefix}block b ON b.id = bi.blockid
-         WHERE b.name = 'html'";
-if ($instances = get_records_sql($sql)) {
-    foreach ($instances as $instance) {
-        $blockobject = block_instance('html', $instance);
-        $blockobject->config->text = str_replace($search, $replace, $blockobject->config->text);
-        $blockobject->instance_config_commit($blockobject->pinned);
+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 $table SET $column = REPLACE($column, '$search', '$replace');");
+                $db->debug = false;
+            }
+        }
     }
 }
-
-/// Rebuild course cache which might be incorrect now
-notify('Rebuilding course cache...');
-rebuild_course_cache();
-notify('...finished');
+print_simple_box_end();
 
 print_continue('index.php');
 
-admin_externalpage_print_footer();
-
 ?>

admin/report.php

@@ -0,0 +1,26 @@
+<?php // $Id$
+      // Display all the reports available in admin/report
+
+    require_once('../config.php');
+
+    if (!isadmin()) {
+        error("You are not allowed to look at this page");
+    }
+
+    $stradmin = get_string('administration');
+    $strreports = get_string('reports');
+
+    print_header($strreports, $strreports,
+                 '<a href="index.php">'.$stradmin.'</a> -> '.$strreports);
+
+    $directories = get_list_of_plugins('admin/report');
+
+    foreach ($directories as $directory) {
+        echo '<div class="plugin '.$directory.'">';
+        include_once($CFG->dirroot.'/admin/report/'.$directory.'/mod.php');  // Fragment for listing
+        echo '</div>';
+    }
+
+    print_footer();
+?>
+

admin/report/backups/index.php

@@ -1,135 +0,0 @@
-<?php // $Id$
-      // 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');
-    admin_externalpage_print_header();
-
-/// Scheduled backups are disabled by the server admin
-    if (!empty($CFG->disablescheduledbackups)) {
-        print_error('scheduledbackupsdisabled', '', '', NULL, true);
-    }
-
-/// Scheduled backups aren't active by the site admin
-    $backup_config = backup_get_config();
-    if (empty($backup_config->backup_sche_active)) {
-        notify(get_string('scheduledbackupsinactive'));
-    }
-
-/// 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("next");
-
-/// Decide when to show last execution logs or detailed logs
-/// Lastlog view
-    if (!$courseid) {
-        print_heading($backuploglaststatus);
-        print_simple_box_start('center');
-    /// Now, get every record from backup_courses
-        $courses = get_records("backup_courses");
-
-        if (!$courses) {
-            notify(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 = get_field ("course","fullname","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>";
-        }
-        print_simple_box_end();
-/// Detailed View !!
-    } else {
-        print_heading($backuplogdetailed);
-
-        $coursename = get_field("course","fullname","id","$courseid");
-        print_heading("$strcourse: $coursename");
-
-        print_simple_box_start('center');
-
-    /// First, me get all the distinct backups for that course in backup_log
-        $executions = get_records_sql("SELECT DISTINCT laststarttime,laststarttime
-                                       FROM {$CFG->prefix}backup_log
-                                       WHERE courseid = '$courseid'
-                                       ORDER BY laststarttime DESC");
-
-    /// Iterate over backup executions
-        if (!$executions) {
-            notify(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\">";
-                print_simple_box("<center>".userdate($execution->laststarttime)."</center>", "center");
-                echo "</td>";
-                echo "</tr>";
-                $logs = get_records_sql("SELECT *
-                                         FROM {$CFG->prefix}backup_log
-                                         WHERE courseid = '$courseid'  AND
-                                               laststarttime = '$execution->laststarttime'
-                                         ORDER BY id");
-                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>";
-        }
-        print_simple_box_end();
-    }
-
-    print_footer();
-
-?>

admin/report/backups/settings.php

@@ -1,3 +0,0 @@
-<?php  // $Id$
-$ADMIN->add('reports', new admin_externalpage('reportbackups', get_string('backups', 'admin'), "$CFG->wwwroot/$CFG->admin/report/backups/index.php",'moodle/site:backup'));
-?>

admin/report/courseoverview/db/access.php

@@ -1,42 +0,0 @@
-<?php  // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-$report_courseoverview_capabilities = array(
-
-    'report/courseoverview:view' => array(
-        'riskbitmask' => RISK_PERSONAL,
-        'captype' => 'read',
-        'contextlevel' => CONTEXT_SYSTEM,
-        'legacy' => array(
-            'teacher' => CAP_ALLOW,
-            'editingteacher' => CAP_ALLOW,
-            'admin' => CAP_ALLOW
-        ),
-
-        'clonepermissionsfrom' => 'moodle/site:viewreports',
-    )
-);
-
-?>

admin/report/courseoverview/index.php

@@ -2,21 +2,19 @@
 
     require_once('../../../config.php');
     require_once($CFG->dirroot.'/lib/statslib.php');
-    require_once($CFG->libdir.'/adminlib.php');
 
     $report     = optional_param('report', STATS_REPORT_ACTIVE_COURSES, PARAM_INT);
     $time       = optional_param('time', 0, PARAM_INT);
     $numcourses = optional_param('numcourses', 20, PARAM_INT);
 
-    admin_externalpage_setup('reportcourseoverview');
-    admin_externalpage_print_header();
-
     if (empty($CFG->enablestats)) {
-        if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM))) {
-            redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=stats", get_string('mustenablestats', 'admin'), 3);
-        } else {
-            error("Stats is not enabled.");
-        }
+        error("Stats is not enabled.");
+    }
+
+    require_login();
+
+    if (!isadmin()) {
+        error("This page is for admins only");
     }
 
     $course = get_site();
@@ -25,14 +23,16 @@
     $strreports = get_string('reports');
     $strcourseoverview = get_string('courseoverview');
 
+    $strnav = '<a href="'.$CFG->wwwroot.'/admin/index.php">'.get_string('administration').'</a> -> <a href="'.$CFG->wwwroot.'/admin/report.php">'.$strreports.'</a> -> '.$strcourseoverview;
+    
     $reportoptions = stats_get_report_options($course->id,STATS_MODE_RANKED);
 
     $tableprefix = $CFG->prefix.'stats_';
 
-    $earliestday = get_field_sql('SELECT timeend FROM '.$tableprefix.'daily ORDER BY timeend');
-    $earliestweek = get_field_sql('SELECT timeend FROM '.$tableprefix.'weekly ORDER BY timeend');
-    $earliestmonth = get_field_sql('SELECT timeend FROM '.$tableprefix.'monthly ORDER BY timeend');
-
+    $earliestday = get_field_sql('SELECT timeend FROM '.$tableprefix.'daily ORDER BY timeend LIMIT 1');
+    $earliestweek = get_field_sql('SELECT timeend FROM '.$tableprefix.'weekly ORDER BY timeend LIMIT 1');
+    $earliestmonth = get_field_sql('SELECT timeend FROM '.$tableprefix.'monthly ORDER BY timeend LIMIT 1');
+    
     if (empty($earliestday)) $earliestday = time();
     if (empty($earliestweek)) $earliestweek = time();
     if (empty($earliestmonth)) $earliestmonth = time();
@@ -44,13 +44,15 @@
     $timeoptions = stats_get_time_options($now,$lastweekend,$lastmonthend,$earliestday,$earliestweek,$earliestmonth);
 
     if (empty($timeoptions)) {
-        print_error('nostatstodisplay', "", $CFG->wwwroot.'/course/view.php?id='.$course->id);
+        error(get_string('nostatstodisplay'), $CFG->wwwroot.'/course/view.php?id='.$course->id);
     }
 
+    print_header($strcourseoverview, $strcourseoverview, $strnav,'','',true,'&nbsp');
+
     echo '<form action="index.php" method="post">'."\n";
-    echo '<div>';
 
     $table->width = '*';
+
     $table->align = array('left','left','left','left','left','left');
     $table->data[] = array(get_string('statsreporttype'),choose_from_menu($reportoptions,'report',$report,'','','',true),
                            get_string('statstimeperiod'),choose_from_menu($timeoptions,'time',$time,'','','',true),
@@ -58,63 +60,52 @@
                            '<input type="submit" value="'.get_string('view').'" />') ;
 
     print_table($table);
-    echo '</div>';
     echo '</form>';
 
-    print_heading($reportoptions[$report]);
-
-
     if (!empty($report) && !empty($time)) {
         $param = stats_get_parameters($time,$report,SITEID,STATS_MODE_RANKED);
-        if (!empty($param->sql)) {
-            $sql = $param->sql;
-        } else {
-            $sql = "SELECT courseid,".$param->fields." FROM ".$CFG->prefix.'stats_'.$param->table
-                ." WHERE timeend >= $param->timeafter AND stattype = 'activity' AND roleid = 0"
-                ." GROUP BY courseid "
-                .$param->extras
-                ." ORDER BY ".$param->orderby;
-        }
-        error_log($sql);
-
-        $courses = get_records_sql($sql, 0, $numcourses);
+        
+        $sql = "SELECT courseid,".$param->fields." FROM ".$CFG->prefix.'stats_'.$param->table
+            ." WHERE timeend >= ".$param->timeafter
+            ." GROUP BY courseid "
+            .$param->extras
+            ." ORDER BY ".$param->orderby
+            ." LIMIT ".$numcourses;
+        
+        $courses = get_records_sql($sql);
 
         if (empty($courses)) {
-            notify(get_string('statsnodata'));echo '</td></tr></table>';echo '<p>after notify</p>';
-
-        } else {
-            if (empty($CFG->gdversion)) {
-                echo '<div class="graph">(' . get_string("gdneed") .')</div>';
-            } else {
-                echo '<div class="graph"><img alt="'.get_string('courseoverviewgraph').'" src="'.$CFG->wwwroot.'/'.$CFG->admin.'/report/courseoverview/reportsgraph.php?time='.$time.'&report='.$report.'&numcourses='.$numcourses.'" /></div>';
-            }
-
-            $table = new StdClass;
-            $table->align = array('left','center','center','center');
-            $table->head = array(get_string('course'),$param->line1);
-            if (!empty($param->line2)) {
-                $table->head[] = $param->line2;
-            }
-            if (!empty($param->line3)) {
-                $table->head[] = $param->line3;
-            }
-
-            foreach  ($courses as $c) {
-                $a = array();
-                $a[] = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$c->courseid.'">'.get_field('course','shortname','id',$c->courseid).'</a>';
-
-                $a[] = $c->line1;
-                if (isset($c->line2)) {
-                    $a[] = $c->line2;
-                }
-                if (isset($c->line3)) {
-                    $a[] = round($c->line3,2);
-                }
-                $table->data[] = $a;
-            }
-            print_table($table);
+            error(get_string('statsnodata'),$CFG->wwwroot.'/admin/report/courseoverview/index.php');
         }
+
+        echo '<center><img src="'.$CFG->wwwroot.'/admin/report/courseoverview/reportsgraph.php?time='.$time.'&report='.$report.'&numcourses='.$numcourses.'" /></center>';
+        
+        $table = new object();
+        $table->align = array('left','center','center','center');
+        $table->head = array(get_string('course'),$param->line1);
+        if (!empty($param->line2)) {
+            $table->head[] = $param->line2; 
+        }
+        if (!empty($param->line3)) {
+            $table->head[] = $param->line3;
+        }
+        
+        foreach  ($courses as $c) {
+            $a = array();
+            $a[] = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$c->courseid.'">'.get_field('course','shortname','id',$c->courseid).'</a>';
+
+            $a[] = $c->line1;
+            if (isset($c->line2)) {
+                $a[] = $c->line2;
+            }
+            if (isset($c->line3)) {
+                $a[] = $c->line3;
+            }
+            $table->data[] = $a;
+        }
+        print_table($table);
     }
-    admin_externalpage_print_footer();
+    
+    print_footer();
 
 ?>

admin/report/courseoverview/mod.php

@@ -0,0 +1,54 @@
+<?php
+
+    if (!defined('MOODLE_INTERNAL')) {
+        die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
+    }
+
+    if (!empty($CFG->enablestats)) {
+   
+        $strreports = get_string('reports');
+        $strcourseoverview = get_string('courseoverview');
+
+        print_heading("$strcourseoverview:");
+
+        require_once($CFG->dirroot.'/lib/statslib.php');
+
+        $report     = optional_param('report', STATS_REPORT_ACTIVE_COURSES, PARAM_INT);
+        $time       = optional_param('time', 0, PARAM_INT);
+        $numcourses = optional_param('numcourses', 20, PARAM_INT);
+
+        $course = get_site();
+        stats_check_uptodate($course->id);
+
+
+        $reportoptions = stats_get_report_options($course->id,STATS_MODE_RANKED);
+
+        $tableprefix = $CFG->prefix.'stats_';
+
+        $earliestday = get_field_sql('SELECT timeend FROM '.$tableprefix.'daily ORDER BY timeend LIMIT 1');
+        $earliestweek = get_field_sql('SELECT timeend FROM '.$tableprefix.'weekly ORDER BY timeend LIMIT 1');
+        $earliestmonth = get_field_sql('SELECT timeend FROM '.$tableprefix.'monthly ORDER BY timeend LIMIT 1');
+
+        if (empty($earliestday)) $earliestday = time();
+        if (empty($earliestweek)) $earliestweek = time();
+        if (empty($earliestmonth)) $earliestmonth = time();
+
+        $now = stats_get_base_daily();
+        $lastweekend = stats_get_base_weekly();
+        $lastmonthend = stats_get_base_monthly();
+
+        $timeoptions = stats_get_time_options($now,$lastweekend,$lastmonthend,$earliestday,$earliestweek,$earliestmonth);
+
+        $table->width = '*';
+        $table->align = array('left','left','left','left','left','left');
+        $table->data[] = array(get_string('statsreporttype'),choose_from_menu($reportoptions,'report',$report,'','','',true),
+                get_string('statstimeperiod'),choose_from_menu($timeoptions,'time',$time,'','','',true),
+                '<input type="text" name="numcourses" size="3" maxlength="2" value="'.$numcourses.'" />',
+                '<input type="submit" value="'.get_string('view').'" />') ;
+
+        echo '<form action="report/courseoverview/index.php" method="post">'."\n";
+        print_table($table);
+        echo '</form>';
+    }
+?>
+

admin/report/courseoverview/reportsgraph.php

@@ -10,28 +10,27 @@
 
     require_login();
 
-    require_capability('report/courseoverview:view', get_context_instance(CONTEXT_SYSTEM));
+    if (!isadmin()) {
+        error("You must be an admin to use this page");
+    }
 
-    stats_check_uptodate();
+    stats_check_uptodate($course->id);
 
     $param = stats_get_parameters($time,$report,SITEID,STATS_MODE_RANKED);
 
-    if (!empty($param->sql)) {
-        $sql = $param->sql;
-    } else {
-        $sql = "SELECT courseid,".$param->fields." FROM ".$CFG->prefix.'stats_'.$param->table
-            ." WHERE timeend >= $param->timeafter AND stattype = 'activity' AND roleid = 0"
-            ." GROUP BY courseid "
-            .$param->extras
-            ." ORDER BY ".$param->orderby;
-    }
-
-    $courses = get_records_sql($sql, 0, $numcourses);
-
+    $sql = "SELECT courseid,".$param->fields." FROM ".$CFG->prefix.'stats_'.$param->table
+        ." WHERE timeend >= ".$param->timeafter
+        ." GROUP BY courseid "
+        .$param->extras
+        ." ORDER BY ".$param->orderby
+        ." LIMIT ".$numcourses;
+    
+    $courses = get_records_sql($sql);
+    
     if (empty($courses)) {
-        print_error('statsnodata', "", $CFG->wwwroot.'/'.$CFG->admin.'/report/courseoverview/index.php');
+        error(get_string('statsnodata'),$CFG->wwwroot.'/admin/report/course/index.php');
     }
-
+    
 
     $graph = new graph(750,400);
 
@@ -39,8 +38,6 @@
     $graph->parameter['legend_size'] = 10;
     $graph->parameter['x_axis_angle'] = 90;
     $graph->parameter['title'] = false; // moodle will do a nicer job.
-    $graph->y_tick_labels = null;
-    $graph->offset_relation = null;
     if ($report != STATS_REPORT_ACTIVE_COURSES) {
         $graph->parameter['y_decimal_left'] = 2;
     }
@@ -53,5 +50,5 @@
     $graph->y_format['bar1'] = array('colour' => 'blue','bar' => 'fill','legend' => $param->{$param->graphline});
 
     $graph->draw_stack();
-
+    
 ?>

admin/report/courseoverview/settings.php

@@ -1,3 +0,0 @@
-<?php  // $Id$
-$ADMIN->add('reports', new admin_externalpage('reportcourseoverview', get_string('courseoverview', 'admin'), "$CFG->wwwroot/$CFG->admin/report/courseoverview/index.php",'report/courseoverview:view'));
-?>

admin/report/courseoverview/version.php

@@ -1,29 +0,0 @@
-<?PHP // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-$plugin->version  = 2007101503;
-$plugin->requires = 2007101532;
-
-?>

admin/report/log/mod.php

@@ -0,0 +1,23 @@
+<?php
+
+    if (!defined('MOODLE_INTERNAL')) {
+        die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
+    }
+
+    require_once($CFG->dirroot.'/course/lib.php');
+    require_once($CFG->dirroot.'/course/report/log/lib.php');
+
+    $course = get_site();
+
+    print_heading(get_string('chooselogs') .':');
+
+    print_log_selector_form($course); 
+
+    echo '<br />';
+    print_heading(get_string('chooselivelogs') .':');
+
+    echo '<center><h3>';
+    link_to_popup_window('/course/report/log/live.php?id='. $course->id,'livelog', get_string('livelogs'), 500, 800);
+    echo '</h3></center>';
+
+?>

admin/report/log/settings.php

@@ -1,5 +0,0 @@
-<?php  // $Id$
-// just a link to course report
-$ADMIN->add('reports', new admin_externalpage('reportlog', get_string('log', 'admin'), "$CFG->wwwroot/course/report/log/index.php?id=".SITEID, 'coursereport/log:view'));
-$ADMIN->add('reports', new admin_externalpage('reportloglive', get_string('loglive', 'coursereport_log'), "$CFG->wwwroot/course/report/log/indexlive.php?id=".SITEID, 'coursereport/log:viewlive'));
-?>

admin/report/question/index.php

@@ -1,73 +0,0 @@
-<?php // $Id$
-
-    require_once('../../../config.php');
-    require_once($CFG->dirroot.'/question/upgrade.php');
-    require_once($CFG->libdir.'/adminlib.php');
-
-    admin_externalpage_setup('reportquestion');
-    admin_externalpage_print_header();
-
-    print_heading(get_string('adminreport', 'question'));
-
-    $probstr = '';
-    $contextupgradeversion = 2007081000;
-    if ($CFG->version < $contextupgradeversion){
-        ///cwrqpfs issue
-        $probstr = print_heading(get_string('cwrqpfs', 'question'), '', 3, 'main', true);
-
-        if ($updates = question_cwqpfs_to_update()){
-
-            $probstr .=get_string('cwrqpfsinfo', 'question');
-            $probstr .= '<ul>';
-            $catlist = join(array_keys($updates), ',');
-            //get info about cateogries and no of questions used outside category's course
-            $categories = get_records_sql('SELECT qc.*, c.fullname as coursename FROM '.$CFG->prefix.'question_categories as qc, '
-                        .$CFG->prefix.'course as c WHERE qc.course = c.id AND qc.id IN ('.$catlist.')');
-            foreach ($updates as $id => $publish){
-                $categories[$id]->caturl = "$CFG->wwwroot/question/category.php?sesskey=".sesskey().
-                            "&amp;edit=$id&amp;courseid=".$categories[$id]->course;
-                if ($categories[$id]->publish){
-                    $categories[$id]->changefrom = get_string('published', 'question');
-                    $categories[$id]->changeto = get_string('unpublished', 'question');
-                } else {
-                    $categories[$id]->changefrom = get_string('unpublished', 'question');
-                    $categories[$id]->changeto = get_string('published', 'question');
-                }
-                $probstr .= '<li>'.get_string('changepublishstatuscat', 'question', $categories[$id]);
-                if ($questions = get_records_sql('SELECT q.*, qui.id as quizid, qui.name as quizname, cm.id as cmid, '
-                               .'qui.course, c.fullname as coursename FROM '.$CFG->prefix.'question q, '
-                               .$CFG->prefix.'quiz_question_instances qqi, '
-                               .$CFG->prefix.'quiz qui, '
-                               .$CFG->prefix.'course_modules cm, '
-                               .$CFG->prefix.'modules m, '
-                               .$CFG->prefix.'course c '
-                            .'WHERE (q.category = '.$id.' AND qqi.question = q.id '
-                            .'AND qqi.quiz = qui.id '
-                            .'AND qui.course = c.id '
-                            .'AND cm.instance = qui.id '
-                            .'AND cm.module = m.id '
-                            .'AND m.name = \'quiz\''
-                            .'AND ('.$categories[$id]->course.' <> qui.course)) ORDER BY qui.id ASC')){
-
-                    $probstr .= '<ul>';
-                    foreach ($questions as $question){
-                        $question->quizurl = "$CFG->wwwroot/mod/quiz/edit.php?cmid=".$question->cmid;
-                        $question->qurl = "$CFG->wwwroot/question/question.php?cmid={$question->cmid}&amp;id={$question->id}&amp;returnurl=".urlencode($FULLME);
-                        $probstr .= '<li>'.get_string('questionaffected', 'question', $question).'</li>';
-                    }
-                    $probstr .= '</ul>';
-                }
-                $probstr .= '</li>';
-            }
-            $probstr .= '</ul>';
-        } else {
-            $probstr .=('<p>'.get_string('cwrqpfsnoprob', 'question').'</p>');
-        }
-    }
-    if ($probstr) {
-        print_box($probstr);
-    } else {
-        print_box(get_string('noprobs', 'question'), 'boxwidthnarrow boxaligncenter generalbox');
-    }
-    admin_externalpage_print_footer();
-?>

admin/report/question/settings.php

@@ -1,3 +0,0 @@
-<?php  // $Id$
-$ADMIN->add('reports', new admin_externalpage('reportquestion', get_string('question', 'admin'), "$CFG->wwwroot/$CFG->admin/report/question/index.php", 'moodle/site:config'));
-?>

admin/report/security/db/access.php

@@ -1,36 +0,0 @@
-<?php  // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-$report_security_capabilities = array(
-
-    'report/security:view' => array(
-        'riskbitmask' => RISK_CONFIG,
-        'captype' => 'read',
-        'contextlevel' => CONTEXT_SYSTEM,
-        'legacy' => array(
-            'admin' => CAP_ALLOW
-        ),
-    )
-);

admin/report/security/index.php

@@ -1,127 +0,0 @@
-<?php  //$Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards Martin Dougiamas  http://dougiamas.com     //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-require_once('../../../config.php');
-require_once($CFG->dirroot.'/'.$CFG->admin.'/report/security/lib.php');
-require_once($CFG->libdir.'/adminlib.php');
-
-require_login();
-
-$issue = optional_param('issue', '', PARAM_FILE); // show detailed info about one issue only
-
-$issues = report_security_get_issue_list();
-
-// test if issue valid string
-if (array_search($issue, $issues, true) === false) {
-    $issue = '';
-}
-
-// we may need a bit more memory and this may take a long time to process
-@raise_memory_limit('128M');
-@set_time_limit(0);
-
-// Print the header.
-admin_externalpage_setup('reportsecurity');
-admin_externalpage_print_header();
-
-print_heading(get_string('reportsecurity', 'report_security'));
-
-echo '<div id="timewarning">'.get_string('timewarning', 'report_security').'</div>';
-while(@ob_end_flush());
-@flush();
-
-$strok       = '<span class="statusok">'.get_string('statusok', 'report_security').'</span>';
-$strinfo     = '<span class="statusinfo">'.get_string('statusinfo', 'report_security').'</span>';
-$strwarning  = '<span class="statuswarning">'.get_string('statuswarning', 'report_security').'</span>';
-$strserious  = '<span class="statusserious">'.get_string('statusserious', 'report_security').'</span>';
-$strcritical = '<span class="statuscritical">'.get_string('statuscritical', 'report_security').'</span>';
-
-$strissue    = get_string('issue', 'report_security');
-$strstatus   = get_string('status', 'report_security');
-$strdesc     = get_string('description', 'report_security');
-$strconfig   = get_string('configuration', 'report_security');
-
-$statusarr = array(REPORT_SECURITY_OK       => $strok,
-                   REPORT_SECURITY_INFO     => $strinfo,
-                   REPORT_SECURITY_WARNING  => $strwarning,
-                   REPORT_SECURITY_SERIOUS  => $strserious,
-                   REPORT_SECURITY_CRITICAL => $strcritical);
-
-$url = "$CFG->wwwroot/$CFG->admin/report/security/index.php";
-
-if ($issue and ($result = $issue(true))) {
-    report_security_hide_timearning();
-
-    $table = new object();
-    $table->head  = array($strissue, $strstatus, $strdesc, $strconfig);
-    $table->size  = array('30%', '10%', '50%', '10%' );
-    $table->align = array('left', 'left', 'left', 'left');
-    $table->width = '90%';
-    $table->data  = array();
-
-    // print detail of one issue only
-    $row = array();
-    $row[0] = report_security_doc_link($issue, $result->name);
-    $row[1] = $statusarr[$result->status];
-    $row[2] = $result->info;
-    $row[3] = is_null($result->link) ? '&nbsp;' : $result->link;
-
-    $CFG->pagepath = "report/security/$issue"; // help link in footer
-
-    $table->data[] = $row;
-
-    print_table($table);
-
-    print_box($result->details, 'generalbox boxwidthnormal boxaligncenter'); // TODO: add proper css
-
-    print_continue($url);
-
-} else {
-    report_security_hide_timearning();
-
-    $table = new object();
-    $table->head  = array($strissue, $strstatus, $strdesc);
-    $table->size  = array('30%', '10%', '60%' );
-    $table->align = array('left', 'left', 'left');
-    $table->width = '90%';
-    $table->data  = array();
-
-    foreach ($issues as $issue) {
-        $result = $issue(false);
-        if (!$result) {
-            // ignore this test
-            continue;
-        }
-        $row = array();
-        $row[0] = "<a href='$url?issue=$result->issue'>$result->name</a>";
-        $row[1] = $statusarr[$result->status];
-        $row[2] = $result->info;
-
-        $table->data[] = $row;
-    }
-    print_table($table);
-}
-
-print_footer();

admin/report/security/settings.php

@@ -1,3 +0,0 @@
-<?php  //$Id$
-
-$ADMIN->add('reports', new admin_externalpage('reportsecurity', get_string('reportsecurity', 'report_security'), "$CFG->wwwroot/$CFG->admin/report/security/index.php",'report/security:view'));

admin/report/security/version.php

@@ -1,29 +0,0 @@
-<?PHP // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-$plugin->version  = 2007101500;
-$plugin->requires = 2007101533;
-
-?>

admin/report/spamcleaner/index.php

@@ -1,373 +0,0 @@
-<?php
-
-/**
- * Spam Cleaner
- *
- * Helps an admin to clean up spam in Moodle
- *
- * @version $Id$
- * @authors Dongsheng Cai, Martin Dougiamas, Amr Hourani
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- */
-
-// Configuration
-
-// List of known spammy keywords, please add more here
-
-$autokeywords = array(
-                    "<img",
-                    "fuck",
-                    "casino",
-                    "porn",
-                    "xxx",
-                    "cialis",
-                    "viagra",
-                    "poker",
-                    "warcraft"
-                );
-
-
-/////////////////////////////////////////////////////////////////////////////////
-
-require_once('../../../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-
-require_js(array('yui_dom-event', 'yui_connection', 'yui_json'));
-
-$keyword = optional_param('keyword', '', PARAM_RAW);
-$autodetect = optional_param('autodetect', '', PARAM_RAW);
-$del = optional_param('del', '', PARAM_RAW);
-$delall = optional_param('delall', '', PARAM_RAW);
-$ignore = optional_param('ignore', '', PARAM_RAW);
-$reset = optional_param('reset', '', PARAM_RAW);
-$id = optional_param('id', '', PARAM_INT);
-
-require_login();
-admin_externalpage_setup('reportspamcleaner');
-
-// Implement some AJAX calls 
-
-// Delete one user
-if (!empty($del) && confirm_sesskey() && ($id != $USER->id)) {
-    if (isset($SESSION->users_result[$id])) {
-        $user = $SESSION->users_result[$id];
-        if (delete_user($user)) {
-            unset($SESSION->users_result[$id]);
-            echo json_encode(true);
-        } else {
-            echo json_encode(false);
-        }
-    } else {
-        echo json_encode(false);
-    }
-    exit;
-}
-
-// Delete lots of users
-if (!empty($delall) && confirm_sesskey()) {
-    if (!empty($SESSION->users_result)) {
-        foreach ($SESSION->users_result as $userid => $user) {
-            if ($userid != $USER->id) {
-                if (delete_user($user)) {
-                    unset($SESSION->users_result[$userid]);
-                }
-            }
-        }
-    }
-    echo json_encode(true);
-    exit;
-}
-
-if (!empty($ignore)) {
-    unset($SESSION->users_result[$id]);
-    echo json_encode(true);
-    exit;
-}
-
-
-admin_externalpage_print_header();
-
-// Print headers and things
-
-print_spamcleaner_javascript();
-
-print_box(get_string('spamcleanerintro', 'report_spamcleaner'));
-
-print_box_start();     // The forms section at the top
-
-?>
-
-<div class="mdl-align">
-
-<form method="post" action="index.php">
-  <div>
-    <input type="text" name="keyword" id="keyword_el" value="<?php p($keyword) ?>" /> 
-    <input type="hidden" name="sesskey" value="<?php echo sesskey();?>" />
-    <input type="submit" value="<?php echo get_string('spamsearch', 'report_spamcleaner')?>" />
-  </div>
-</form>
-<p><?php echo get_string('spameg', 'report_spamcleaner');?></p>
-
-<hr />
-
-<form method="post"  action="index.php">
-  <div>
-    <input type="submit" name="autodetect" value="<?php echo get_string('spamauto', 'report_spamcleaner');?>" />
-  </div>
-</form>
-
-
-</div>
-
-<?php
-print_box_end(); 
-
-echo '<div id="result" class="mdl-align">';
-
-// Print list of resulting profiles
-
-if (!empty($keyword)) {               // Use the keyword(s) supplied by the user
-    $keywords = explode(',', $keyword);
-    foreach ($keywords as $key => $keyword) {
-        $keywords[$key] = trim($keyword);
-    }
-    search_spammers($keywords);
-
-} else if (!empty($autodetect)) {     // Use the inbuilt keyword list to detect users
-    search_spammers($autokeywords);
-}
-
-echo '</div>';
-
-/////////////////////////////////////////////////////////////////////////////////
-
-
-///  Functions 
-
-
-function search_spammers($keywords) {
-
-    global $CFG, $USER; 
-
-    if (!is_array($keywords)) {
-        $keywords = array($keywords);    // Make it into an array
-    }
-
-    $like = sql_ilike();
-
-    $keywordfull = array();
-    foreach ($keywords as $keyword) {
-        $keyword = addslashes($keyword);   // Just to be safe
-        $keywordfull[] = " description $like '%$keyword%' ";
-        $keywordfull2[] = " p.summary $like '%$keyword%' ";
-    }
-    $conditions = '( '.implode(' OR ', $keywordfull).' )';
-    $conditions2 = '( '.implode(' OR ', $keywordfull2).' )';
-
-    $sql = "SELECT * FROM {$CFG->prefix}user WHERE deleted = 0 AND id <> {$USER->id} AND $conditions";  // Exclude oneself
-    $sql2= "SELECT u.*, p.summary FROM {$CFG->prefix}user AS u, {$CFG->prefix}post AS p WHERE $conditions2 AND u.deleted = 0 AND u.id=p.userid AND u.id <> {$USER->id}";
-    $spamusers_desc = get_recordset_sql($sql);
-    $spamusers_blog = get_recordset_sql($sql2);
-
-    $keywordlist = implode(', ', $keywords);
-    print_box(get_string('spamresult', 'report_spamcleaner').s($keywordlist)).' ...';
-
-    print_user_list(array($spamusers_desc, $spamusers_blog), $keywords);
-
-}
-
-
-
-function print_user_list($users_rs, $keywords) {
-    global $CFG, $SESSION;
-
-    // reset session everytime this function is called
-    $SESSION->users_result = array();
-    $count = 0;
-
-    foreach ($users_rs as $rs) {
-        while ($user = rs_fetch_next_record($rs)) {
-            if (!$count) {
-                echo '<table border="1" width="100%" id="data-grid"><tr><th>&nbsp;</th><th>'.get_string('user','admin').'</th><th>'.get_string('spamdesc', 'report_spamcleaner').'</th><th>'.get_string('spamoperation', 'report_spamcleaner').'</th></tr>';
-            }
-            $count++;
-            filter_user($user, $keywords, $count);
-        }
-    }
-
-    if (!$count) {
-        echo get_string('spamcannotfinduser', 'report_spamcleaner');
-
-    } else {
-        echo '</table>';
-        echo '<div class="mld-align">
-              <button id="removeall_btn">'.get_string('spamdeleteall', 'report_spamcleaner').'</button>
-              </div>';
-    }
-}
-function filter_user($user, $keywords, $count) {
-    global $CFG;
-    $image_search = false;
-    if (in_array('<img', $keywords)) {
-        $image_search = true;
-    }
-    if (isset($user->summary)) {
-        $user->description = '<h3>'.get_string('spamfromblog', 'report_spamcleaner').'</h3>'.$user->summary;
-        unset($user->summary);
-    }
-    if (preg_match('#<img.*src=[\"\']('.$CFG->pixpath.')#', $user->description, $matches)
-        && $image_search) {
-        $result = false;
-        foreach ($keywords as $keyword) {
-            if (preg_match('#'.$keyword.'#', $user->description)
-                && ($keyword != '<img')) {
-                $result = true;
-            }
-        }
-        if ($result) {
-            echo print_user_entry($user, $keywords, $count);
-        } else {
-            unset($user);
-        }
-    } else {
-        echo print_user_entry($user, $keywords, $count);
-    }
-}
-
-
-function print_user_entry($user, $keywords, $count) {
-
-    global $SESSION, $CFG;
-
-    $smalluserobject = new object;      // All we need to delete them later
-    $smalluserobject->id = $user->id;
-    $smalluserobject->email = $user->email;
-    $smalluserobject->auth = $user->auth;
-    $smalluserobject->firstname = $user->firstname;
-    $smalluserobject->lastname = $user->lastname;
-
-    if (empty($SESSION->users_result[$user->id])) {
-        $SESSION->users_result[$user->id] = $smalluserobject;
-        $html = '<tr valign="top" id="row-'.$user->id.'" class="result-row">';
-        $html .= '<td width="10">'.$count.'</td>';
-        $html .= '<td width="30%" align="left"><a href="'.$CFG->wwwroot."/user/view.php?course=1&amp;id=".$user->id.'" title="'.s($user->username).'">'.fullname($user).'</a>';
-
-        $html .= "<ul>";
-        $profile_set = array('city'=>true, 'country'=>true, 'email'=>true);
-        foreach ($profile_set as $key=>$value) {
-            if (isset($user->$key)){
-                $html .= '<li>'.$user->$key.'</li>';
-            }
-        }
-        $html .= "</ul>";
-        $html .= '</td>';
-
-        foreach ($keywords as $keyword) {
-            $user->description = highlight($keyword, $user->description);
-        }
-
-        $html .= '<td align="left">'.format_text($user->description, FORMAT_MOODLE).'</td>';
-        $html .= '<td width="100px" align="center">';
-        $html .= '<button onclick="del_user(this,'.$user->id.')">'.get_string('deleteuser', 'admin').'</button><br />';
-        $html .= '<button onclick="ignore_user(this,'.$user->id.')">'.get_string('ignore', 'admin').'</button>';
-        $html .= '</td>';
-        $html .= '</tr>';
-        return $html;
-    } else {
-        return null;
-    }
-
-
-}
-
-function print_spamcleaner_javascript()  {
-
-$sesskey = sesskey();
-
-?>
-
-<script type="text/javascript">
-//<![CDATA[
-var row = null;
-var delall_cb = {
-    success: function(o){
-        try {
-            var resp = YAHOO.lang.JSON.parse(o.responseText);
-        } catch(e) {
-            alert('<?php echo get_string('spaminvalidresult', 'report_spamcleaner');?>');
-            return;
-        }
-        if(resp == true){
-            window.location.href=window.location.href;
-        }
-    }
-}
-function init() {
-    YAHOO.util.Event.addListener("removeall_btn", "click", function(){
-        var yes = confirm('<?php echo get_string('spamdeleteallconfirm', 'report_spamcleaner');?>');
-        if(yes){
-            var cObj = YAHOO.util.Connect.asyncRequest('POST', '<?php echo me();?>?delall=yes&sesskey=<?php echo $sesskey;?>', delall_cb); 
-        }
-    });
-}
-var del_cb = {
-    success: function(o) {
-        try {
-            var resp = YAHOO.lang.JSON.parse(o.responseText);
-        } catch(e) {
-            alert('<?php echo get_string('spaminvalidresult', 'report_spamcleaner');?>');
-            return;
-        }
-        if(row) {
-            if(resp == true){
-                while(row.tagName != 'TR') {
-                    row = row.parentNode;
-                }
-                row.parentNode.removeChild(row);
-                row = null;
-            } else {
-                alert('<?php echo get_string('spamcannotdelete', 'report_spamcleaner');?>');
-            }
-        }
-    }
-}
-var ignore_cb = {
-    success: function(o){
-        try {
-            var resp = YAHOO.lang.JSON.parse(o.responseText);
-        } catch(e) {
-            alert('<?php echo get_string('spaminvalidresult', 'report_spamcleaner');?>');
-            return;
-        }
-        if(row) {
-            if(resp == true){
-                while(row.tagName != 'TR') {
-                    row = row.parentNode;
-                }
-                row.parentNode.removeChild(row);
-                row = null;
-            }
-        }
-    }
-}
-function del_user(obj, id) {
-    var yes = confirm('<?php echo get_string('spamdeleteconfirm', 'report_spamcleaner');?>');
-    if(yes){
-        row = obj;
-        var cObj = YAHOO.util.Connect.asyncRequest('POST', '<?php echo me();?>?del=yes&sesskey=<?php echo $sesskey;?>&id='+id, del_cb); 
-    }
-}
-function ignore_user(obj, id) {
-    row = obj;
-    var cObj = YAHOO.util.Connect.asyncRequest('POST', '<?php echo me();?>?ignore=yes&sesskey=<?php echo $sesskey;?>&id='+id, ignore_cb); 
-}
-YAHOO.util.Event.onDOMReady(init);
-//]]>
-</script>
-
-<?php 
-}
-
-admin_externalpage_print_footer();
-
-?>

admin/report/spamcleaner/settings.php

@@ -1,5 +0,0 @@
-<?php
-
-// spam cleaner
-$ADMIN->add('reports', new admin_externalpage('reportspamcleaner', get_string('spamcleaner','report_spamcleaner'), "$CFG->wwwroot/$CFG->admin/report/spamcleaner/index.php", 'moodle/site:config'));
-

admin/report/stats/index.php

@@ -0,0 +1,63 @@
+<?php  // $Id$
+
+    require_once('../../../config.php');
+    require_once($CFG->dirroot.'/lib/statslib.php');
+    require_once($CFG->dirroot.'/course/report/stats/lib.php');
+
+    if (empty($CFG->enablestats)) {
+        error("Stats is not enabled.");
+    }
+
+    $courseid = required_param('course', PARAM_INT);
+    $report   = optional_param('report', 0, PARAM_INT);
+    $time     = optional_param('time', 0, PARAM_INT);
+    $mode     = optional_param('mode', STATS_MODE_GENERAL, PARAM_INT);
+    $userid   = optional_param('userid', 0, PARAM_INT);
+
+    if ($report == STATS_REPORT_USER_LOGINS) {
+        $courseid = SITEID; //override
+    }
+
+    if ($mode == STATS_MODE_RANKED) {
+        redirect($CFG->wwwroot.'/'.$CFG->admin.'/report.php?time='.$time);
+    }
+
+    if (!$course = get_record("course","id",$courseid)) {
+        error("That's an invalid course id");
+    }
+
+    if (!empty($userid)) {
+        if (!$user = get_record('user','id',$userid)) {
+            error("That's an invalid user id");
+        }
+    }
+
+    require_login();
+    if (!isteacher($course->id)) {
+        error("You need to be a teacher to use this page");
+    }
+
+    add_to_log($course->id, "course", "report stats", "report/stats/index.php?course=$course->id", $course->id); 
+
+    stats_check_uptodate($course->id);
+    
+    
+    $strreports = get_string("reports");
+    $strstats = get_string('stats');
+
+    $menu = report_stats_mode_menu($course, $mode, $time);
+
+
+    $crumb = "<a href=\"{$CFG->wwwroot}/admin\">".get_string('administration')."</a> ->
+              <a href=\"{$CFG->wwwroot}/admin/report.php\">$strreports</a> ->
+              $strstats";
+
+    print_header("$course->shortname: $strstats", "$course->fullname", 
+                  $crumb, '', '', true, '&nbsp', $menu);
+    
+    
+    require_once($CFG->dirroot.'/course/report/stats/report.php');
+    
+    print_footer();
+
+?>

admin/report/stats/mod.php

@@ -0,0 +1,12 @@
+<?php  //$Id$
+
+    if (!defined('MOODLE_INTERNAL')) {
+        die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
+    }
+    
+    if (!empty($CFG->enablestats)) {
+        echo '<p style="text-align:center;">';
+        echo '<a href="'.$CFG->wwwroot.'/admin/report/stats/index.php?course='.$course->id.'">'.get_string('stats').'</a>';
+        echo '</p>';
+    }
+?>

admin/report/stats/settings.php

@@ -1,4 +0,0 @@
-<?php  // $Id$
-// just a link to course report
-$ADMIN->add('reports', new admin_externalpage('reportstats', get_string('stats', 'admin'), "$CFG->wwwroot/course/report/stats/index.php", 'coursereport/stats:view'));
-?>

admin/report/unittest/db/access.php

@@ -1,40 +0,0 @@
-<?php  // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-$report_unittest_capabilities = array(
-
-    'report/unittest:view' => array(
-        'riskbitmask' => RISK_DATALOSS,
-        'captype' => 'read',
-        'contextlevel' => CONTEXT_SYSTEM,
-        'legacy' => array(
-            'admin' => CAP_ALLOW
-        ),
-
-        'clonepermissionsfrom' => 'moodle/site:config',
-    )
-);
-
-?>

admin/report/unittest/ex_reporter.php

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

admin/report/unittest/ex_simple_test.php

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

admin/report/unittest/index.php

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

admin/report/unittest/settings.php

@@ -1,3 +0,0 @@
-<?php  //$Id$
-$ADMIN->add('reports', new admin_externalpage('reportunittest', get_string('simpletest', 'admin'), "$CFG->wwwroot/$CFG->admin/report/unittest/index.php", 'report/unittest:view'));
-?>

admin/report/unittest/version.php

@@ -1,29 +0,0 @@
-<?PHP // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-$plugin->version  = 2007101501;
-$plugin->requires = 2007101532;
-
-?>

admin/roles/allowassign.php

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

admin/roles/allowoverride.php

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

admin/roles/assign.html

@@ -1,112 +0,0 @@
-<form id="assignform" method="post" action="">
-<div style="text-align:center;">
-<label for="extendperiod"><?php print_string('enrolperiod') ?></label> <?php choose_from_menu($periodmenu, "extendperiod", $defaultperiod, $unlimitedperiod); ?>
-<label for="extendbase"><?php print_string('startingfrom') ?></label> <?php choose_from_menu($basemenu, "extendbase", 3, ""); ?>
-
-<input type="hidden" name="previoussearch" value="<?php p($previoussearch) ?>" />
-<input type="hidden" name="userid" value="<?php p($userid) ?>" />
-<input type="hidden" name="courseid" value="<?php p($courseid) ?>" />
-<input type="hidden" name="sesskey" value="<?php p(sesskey()) ?>" />
-<input type="hidden" name="contextid" value="<?php p($contextid) ?>" />
-<input type="hidden" name="roleid" value="<?php p($roleid) ?>" />
-  <table summary="" style="margin-left:auto;margin-right:auto" border="0" cellpadding="5" cellspacing="0">
-    <tr>
-      <td valign="top">
-          <label for="removeselect"><?php print_string('existingusers', 'role', count($contextusers)); ?></label>
-          <br />
-          <select name="removeselect[]" size="20" id="removeselect" multiple="multiple"
-                  onfocus="getElementById('assignform').add.disabled=true;
-                           getElementById('assignform').remove.disabled=false;
-                           getElementById('assignform').addselect.selectedIndex=-1;">
-
-          <?php
-            $i = 0;
-            foreach ($contextusers as $contextuser) {
-                $fullname = fullname($contextuser, true);
-                if ($contextuser->hidden) {
-                    $hidden=' ('.get_string('hiddenassign').') ';
-                } else {
-                    $hidden="";
-                }
-                echo "<option value=\"$contextuser->id\">".$fullname.", ".$contextuser->email.$hidden."</option>\n";
-                $i++;    
-            }
-            if ($i==0) {
-                echo '<option/>'; // empty select breaks xhtml strict
-            }
-          ?>
-          
-          </select></td>
-      <td valign="top">
-        <br />
-        <label title="<?php print_string('hiddenassign') ?>">
-            <input type="checkbox" name="hidden" value="1" />
-            <img src="<?php echo $CFG->pixpath; ?>/t/hide.gif" alt="<?php print_string('hiddenassign') ?>" class="hide-show-image" />
-            <?php helpbutton('hiddenassign', get_string('hiddenassign')); ?>
-        </label>
-        <?php check_theme_arrows(); ?>
-        <p class="arrow_button">
-            <input name="add" id="add" type="submit" value="<?php echo $THEME->larrow.'&nbsp;'.get_string('add'); ?>" title="<?php print_string('add'); ?>" /><br />
-            <input name="remove" id="remove" type="submit" value="<?php echo get_string('remove').'&nbsp;'.$THEME->rarrow; ?>" title="<?php print_string('remove'); ?>" />
-        </p>
-      </td>
-      <td valign="top">
-          <label for="addselect"><?php print_string('potentialusers', 'role', $usercount); ?></label>
-          <br />
-          <select name="addselect[]" size="20" id="addselect" multiple="multiple"
-                  onfocus="getElementById('assignform').add.disabled=false;
-                           getElementById('assignform').remove.disabled=true;
-                           getElementById('assignform').removeselect.selectedIndex=-1;">
-          <?php
-            $i=0;
-            if (!empty($searchtext)) {
-                echo "<optgroup label=\"$strsearchresults (" . $usercount . ")\">\n";
-                while ($user = rs_fetch_next_record($availableusers)) {
-                    $fullname = fullname($user, true);
-                    echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
-                    $i++;
-                }
-                echo "</optgroup>\n";
-
-            } else {
-                if ($usercount > MAX_USERS_PER_PAGE) {
-                    echo '<optgroup label="'.get_string('toomanytoshow').'"><option></option></optgroup>'."\n"
-                          .'<optgroup label="'.get_string('trysearching').'"><option></option></optgroup>'."\n";
-                } else {
-                    while ($user = rs_fetch_next_record($availableusers)) {
-                        $fullname = fullname($user, true);
-                        echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
-                        $i++;
-                    }
-                }
-            }
-            if ($i==0) {
-                echo '<option/>'; // empty select breaks xhtml strict
-            }
-          ?>
-         </select>
-         <br />
-         <label for="searchtext" class="accesshide"><?php p($strsearch) ?></label>
-         <input type="text" name="searchtext" id="searchtext" size="30" value="<?php p($searchtext, true) ?>"
-                  onfocus ="getElementById('assignform').add.disabled=true;
-                            getElementById('assignform').remove.disabled=true;
-                            getElementById('assignform').removeselect.selectedIndex=-1;
-                            getElementById('assignform').addselect.selectedIndex=-1;"
-                  onkeydown = "var keyCode = event.which ? event.which : event.keyCode;
-                               if (keyCode == 13) {
-                                    getElementById('assignform').previoussearch.value=1;
-                                    getElementById('assignform').submit();
-                               } " />
-         <input name="search" id="search" type="submit" value="<?php p($strsearch) ?>" />
-         <?php
-              if (!empty($searchtext)) {
-                  echo '<input name="showall" id="showall" type="submit" value="'.$strshowall.'" />'."\n";
-              }
-         ?>
-       </td>
-    </tr>
-  </table>
-</div>
-</form>
-
-