Bumping to 1.6.2 for releasing

Also fixed some notices

README.txt

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

admin/admin.html

@@ -62,17 +62,23 @@
                       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";
+              } 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 echo $searchtext ?>" 
+         <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;

admin/admin.php

@@ -1,14 +1,10 @@
 <?PHP // $Id$
       // Admin-only script to assign administrative rights to users
 
-    require_once("../config.php");
+    require_once('../config.php');
     
     define("MAX_USERS_PER_PAGE", 50);
 
-    optional_variable($add, "");
-    optional_variable($remove, "");
-    optional_variable($search, "");
-
     if (! $site = get_site()) {
         redirect("$CFG->wwwroot/$CFG->admin/index.php");
     }
@@ -81,7 +77,7 @@
     }
 
 /// Is there a current search?
-    $previoussearch = (!empty($frm->search) or ($frm->previoussearch == 1)) ;
+    $previoussearch = (!empty($frm->search) or (isset($frm->previoussearch) and $frm->previoussearch == 1)) ;
 
 /// Get all existing admins
     $admins = get_admins();
@@ -105,11 +101,18 @@
 
 /// If no search results then get potential users excluding current admins
     if (empty($searchusers)) {
-        if (!$users = get_users(true, '', true, $adminlist, 'firstname ASC, lastname ASC', '', '',
-                                0, 99999, 'id, firstname, lastname, email') ) {
-            $users = array();
+
+        $usercount =  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();
+            }
         }
-        $usercount = count($users);
     }
 
     $searchtext = (isset($frm->searchtext)) ? $frm->searchtext : "";

admin/auth.php

@@ -1,7 +1,10 @@
 <?PHP  // $Id$
        // config.php - allows admin to edit all configuration variables
 
-    include("../config.php");
+    require_once('../config.php');
+
+    $auth = optional_param('auth', '', PARAM_SAFEDIR);
+
     require_login();
 
     if (!$site = get_site()) {
@@ -16,12 +19,13 @@
         error(get_string('confirmsesskeybad', 'error'));
     }
 
+    $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");
@@ -31,6 +35,14 @@
             notify("Error defining the authentication method");
         }
 
+        // load the auth plugin library
+        require_once("{$CFG->dirroot}/auth/$auth/lib.php");
+
+        $err = array();
+        if (function_exists('auth_validate_form')) {
+            auth_validate_form($config, $err);
+        }
+
         if (count($err) == 0) {
             foreach ($config as $name => $value) {
                 if (preg_match('/^pluginconfig_(.+?)$/', $name, $matches)) {
@@ -62,16 +74,25 @@
     }
 
     $modules = get_list_of_plugins("auth");
+    $options = array();
     foreach ($modules as $module) {
         $options[$module] = get_string("auth_$module"."title", "auth");
     }
     asort($options);
-    if (isset($_GET['auth']) && in_array($_GET['auth'], $modules)) {
-        $auth = $_GET['auth'];
+    if (!empty($auth) && in_array($auth, $modules)) {
     } else {
         $auth = $config->auth;
     }
-    $auth = clean_filename($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;
@@ -85,11 +106,13 @@
     if (! isset($config->changepassword)) {
         $config->changepassword = "";
     }
-    $user_fields = array("firstname", "lastname", "email", "phone1", "phone2", "department", "address", "city", "country", "description", "idnumber", "lang");
-
-    if (empty($focus)) {
-        $focus = "";
+    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");
@@ -129,20 +152,39 @@
     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>";
-        echo "<input type=\"text\" name=\"changepassword\" size=\"40\" value=\"$config->changepassword\" />";
+        $passurl = $config->{'auth_'.$auth.'_changepasswordurl'};
+        echo "<input type=\"text\" name=\"auth_{$auth}_changepasswordurl\" size=\"40\" value=\"$passurl\" />";
         echo "</td>";
         echo "<td>";
-        print_string("changepasswordhelp","auth");
+        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>";
 
     }
@@ -198,14 +240,6 @@
 
 /// Functions /////////////////////////////////////////////////////////////////
 
-function validate_form(&$form, &$err) {
-
-   // if (empty($form->fullname))
-   //     $err["fullname"] = get_string("missingsitename");
-
-    return;
-}
-
 //
 // Good enough for most auth plugins
 // but some may want a custom one if they are offering
@@ -239,10 +273,18 @@ function print_auth_lock_options ($auth, $user_fields, $helptext, $retrieveopts,
     foreach ($user_fields as $field) {
 
         // Define some vars we'll work with
-        optional_variable($pluginconfig->{"field_map_$field"}, '');
-        optional_variable($pluginconfig->{"field_updatelocal_$field"}, '');
-        optional_variable($pluginconfig->{"field_updateremote_$field"}, '');
-        optional_variable($pluginconfig->{"field_lock_$field"}, '');
+        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;

admin/block.php

@@ -14,7 +14,7 @@
         error("Site isn't defined!");
     }
 
-    $blockid = required_param( 'block',PARAM_INT );
+    $blockid = required_param('block', PARAM_INT);
    
     if(($blockrecord = blocks_get_record($blockid)) === false) {
         error('This block does not exist');
@@ -57,7 +57,11 @@
     $strconfiguration = get_string('configuration');
     $strmanageblocks = get_string('manageblocks');
     $strblockname = $block->get_title();
-
+    
+    // $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> -> ".

admin/blocks.php

@@ -6,7 +6,7 @@
     require_once($CFG->libdir.'/blocklib.php');
     require_once($CFG->libdir.'/tablelib.php');
 
-    $confirm  = optional_param('confirm', 0, PARAM_INT);
+    $confirm  = optional_param('confirm', 0, PARAM_BOOL);
     $hide     = optional_param('hide', 0, PARAM_INT);
     $show     = optional_param('show', 0, PARAM_INT);
     $delete   = optional_param('delete', 0, PARAM_INT);
@@ -156,7 +156,7 @@
 
     $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'multiple', 'delete', 'settings'));
     $table->define_headers(array($strname, $strcourses, $strversion, $strhide.'/'.$strshow, $strmultiple, $strdelete, $strsettings));
-    $table->define_baseurl($CFG->wwwroot.'/admin/blocks.php');
+    $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
 
     $table->set_attribute('cellspacing', '0');
     $table->set_attribute('id', 'blocks');
@@ -218,7 +218,7 @@
         
         $table->define_columns(array('block', 'delete'));
         $table->define_headers(array($strname, $strdelete));
-        $table->define_baseurl($CFG->wwwroot.'/admin/blocks.php');
+        $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
     
         $table->set_attribute('cellspacing', '0');
         $table->set_attribute('id', 'incompatible');

admin/calendar.html

@@ -1,6 +1,6 @@
 
 <form method="post" action="calendar.php">
-<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
+<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
 <table class="formtable">
     <tr>
       <th>adminseesall:</th>

admin/calendar.php

@@ -35,8 +35,7 @@
         }
         if(isset($form->forcetimezone)) {
             // To protect from SQL injections ...
-            $form->forcetimezone = str_replace(';', '', $form->forcetimezone);
-            $form->forcetimezone = str_replace('\'', '', $form->forcetimezone);
+            $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)) {

admin/config.php

@@ -3,6 +3,10 @@
 
     require_once('../config.php');
 
+    $installing = optional_param('installing', 0, PARAM_BOOL);
+
+    $focus = '';
+
     if ($site = get_site()) {   // If false then this is a new installation
         require_login();
         if (!isadmin()) {
@@ -32,9 +36,22 @@
         if (count($err) == 0) {
             foreach ($config as $name => $value) {
                 if ($name == "sessioncookie") {
-                    $value = eregi_replace("[^a-zA-Z]", "", $value);
+                    $value = eregi_replace("[^a-zA-Z0-9_]", "", $value);
                 }
-                unset($conf);
+                if ($name == "defaultallowedmodules") {
+                    $value = implode(',',$value);
+                }
+                if ($name == 'hiddenuserfields') {
+                    if (in_array('none', $value)) {
+                        $value = '';
+                    } else {
+                        $value = implode(',',$value);
+                    }
+                }
+                if ($name == "locale") {
+                    $value = trim($value);
+                }
+                $conf = new object();
                 $conf->name  = $name;
                 $conf->value = $value;
                 if ($current = get_record('config', 'name', $name)) {
@@ -48,8 +65,16 @@
                     }
                 }
             }
-            redirect('index.php', get_string('changessaved'), 1);
-            exit;
+            if ($installing) {
+                print_header();
+                notify(get_string('changessaved'), 'notifysuccess');
+                print_continue('index.php');
+                exit;
+            } else {
+                // the following redirect was randomly breaking upgrades because it did double redirects,
+                // we must not use it during install/upgrade
+                redirect('index.php', get_string('changessaved'), 1);
+            }
 
         } else {
             foreach ($err as $key => $value) {
@@ -62,12 +87,6 @@
 
     if (empty($config)) {
         $config = $CFG;
-        if (!$config->locale = get_field('config', 'value', 'name', 'locale')) {
-            $config->locale = $CFG->lang;
-        }
-    }
-    if (empty($focus)) {
-        $focus = '';
     }
 
     $sesskey = !empty($USER->id) ? $USER->sesskey : '';
@@ -92,7 +111,7 @@
 
 
 /// Get all the configuration fields and helptext
-    include('configvars.php');
+    require('configvars.php');
 
 /// Cycle through the sections to get the sectionnames
     $linktext = '';
@@ -105,7 +124,6 @@
         
     echo "<center>$linktext</center>\n";
 
-    print_simple_box_start('center');
     
     echo '<form method="post" action="config.php" name="form">';
     echo '<center><input type="submit" value="'.get_string('savechanges').'" /></center>';
@@ -135,13 +153,13 @@
 
     }
     echo '<center>';
+    echo '<input type="hidden" name="installing" value="'.$installing.'" />';
     echo '<input type="hidden" name="sesskey" value="'.$sesskey.'" />';
     echo '<input type="submit" value="'.get_string('savechanges').'" />';
     echo '</center>';
                 
     echo '</form>';
     
-    print_simple_box_end();
 
 
     

admin/configvars.php

@@ -1,5 +1,6 @@
 <?php // $Id$
       // Shane Elliott
+defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
 
 /// Add new sitewide configuration variables to this file.
 
@@ -68,7 +69,7 @@ class configvar {
 
 /// debug
     unset($options);
-    $options[7]  = $strno;
+    $options[5]  = $strno;
     $options[15] = $stryes;
 
     $misc['debug'] = new configvar (get_string('configdebug', 'admin'),
@@ -88,8 +89,19 @@ class configvarrss extends configvar {
         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
@@ -129,6 +141,8 @@ class configvarrss extends configvar {
 /// 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'),
@@ -143,8 +157,8 @@ class configvarrss extends configvar {
 
 /// slasharguments
     unset($options);
-    $options[0] = "file.php?file=/pic.jpg";
-    $options[1] = "file.php/pic.jpg";
+    $options[0] = "file.php?file=/1/pic.jpg";
+    $options[1] = "file.php/1/pic.jpg";
 
     $operatingsystem['slasharguments'] = new configvar (get_string('configslasharguments', 'admin'),
         choose_from_menu ($options, 'slasharguments', $config->slasharguments, '', '', '', true) );
@@ -212,6 +226,71 @@ class configvarrss extends configvar {
         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
@@ -233,12 +312,20 @@ class configvarrss extends configvar {
 /// 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" />' );
+        '<input name="locale" type="text" size="15" value="'.s($config->locale).'" alt="locale" />' );
+
+/// docroot
+    $interface['docroot'] = new configvar ( get_string('configdocroot', 'admin'),
+        '<input name="docroot" type="text" size="60" value="'.s($config->docroot).'" alt="docroot" />' );
+
+/// doctonewwindow
+    $interface['doctonewwindow'] = new configvar ( get_string('configdoctonewwindow', 'admin'),
+        choose_from_menu($noyesoptions, 'doctonewwindow', $config->doctonewwindow, '', '', '', true) );
 
 /// timezone
-    
     $interface['timezone'] = new configvar ( get_string('configtimezone', 'admin'),
         choose_from_menu (get_list_of_timezones(), 'timezone', $config->timezone, get_string('serverlocaltime'), '', '99', true ) );
 
@@ -309,6 +396,23 @@ class configvarrss extends configvar {
     $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>' );
 
 
 
@@ -346,6 +450,9 @@ class configvarrss extends configvar {
     $security['notifyloginthreshold'] = new configvar (get_string('confignotifyloginthreshold', 'admin'),
         choose_from_menu($options, 'notifyloginthreshold', $config->notifyloginthreshold, '', '', '', true) );
 
+    $security['protectusernames'] = new configvar (get_string('configprotectusernames', 'admin'),
+        choose_from_menu($noyesoptions, 'protectusernames', $config->protectusernames, '', '', '', true) );
+
 /// secureforms
     $security['secureforms'] = new configvar (get_string('configsecureforms', 'admin'),
         choose_from_menu ($noyesoptions, 'secureforms', $config->secureforms, '', '', '', true) );
@@ -471,10 +578,69 @@ class configvarrss extends configvar {
     $mail['denyemailaddresses'] = new configvar (get_string('configdenyemailaddresses', 'admin'),
         '<input name="denyemailaddresses" type="text" size="60" value="'.s($config->denyemailaddresses).'" alt="denyemailaddresses" />' );
 
+    if (!empty($CFG->unicodedb)) { ///These options are only available if running under unicodedb
+    /// sitemailcharset
+        unset($options);
+        unset($charsets);
+        $charsets = get_list_of_charsets();
+        $options['0'] = get_string('none');
+        $options = array_merge($options, $charsets);
+        $mail['sitemailcharset'] = new configvar (get_string('configsitemailcharset', 'admin'),
+            choose_from_menu($options, 'sitemailcharset', $config->sitemailcharset, '', '', '', true));
 
+    /// allowusermailcharset
+        $mail['allowusermailcharset'] = new configvar (get_string('configallowusermailcharset', 'admin'),
+            choose_from_menu($noyesoptions, 'allowusermailcharset', $config->allowusermailcharset, '', '', '', true));
+    }
+    
+/// enable stats
+if (empty($CFG->disablestatsprocessing)) {
+    $stats['enablestats'] = new configvar (get_string('configenablestats','admin'),
+        choose_from_menu($noyesoptions, 'enablestats', $config->enablestats, '', '', '', true) );
 
+    unset($options);
+    $options['none'] = get_string('none');
+    $options[60*60*24*7] = get_string('numweeks','moodle',1);
+    $options[60*60*24*14] = get_string('numweeks','moodle',2);
+    $options[60*60*24*21] = get_string('numweeks','moodle',3);
+    $options[60*60*24*28] = get_string('nummonths','moodle',1);
+    $options[60*60*24*56] = get_string('nummonths','moodle',2);
+    $options[60*60*24*84] = get_string('nummonths','moodle',3);
+    $options[60*60*24*112] = get_string('nummonths','moodle',4);
+    $options[60*60*24*140] = get_string('nummonths','moodle',5);
+    $options[60*60*24*168] = get_string('nummonths','moodle',6);
+    $options['all'] = get_string('all');
+    
+    $stats['statsfirstrun'] = new configvar (get_string('configstatsfirstrun','admin'),
+       choose_from_menu($options,'statsfirstrun',$config->statsfirstrun,'','','',true) );
 
+    unset($options);
+    $options[0] = get_string('untilcomplete');
+    $options[60*60] = '1 '.get_string('hour');
+    $options[60*60*2] = '2 '.get_string('hours');
+    $options[60*60*3] = '3 '.get_string('hours');
+    $options[60*60*4] = '4 '.get_string('hours');
+    $options[60*60*5] = '5 '.get_string('hours');
+    $options[60*60*6] = '6 '.get_string('hours');
+    $options[60*60*7] = '7 '.get_string('hours');
+    $options[60*60*8] = '8 '.get_string('hours');
 
+    if (empty($config->statsruntimestarthour)) {
+        $config->statsruntimestarthour = 0;
+    }
+    if (empty($config->statsruntimestartminute)) {
+        $config->statsruntimestartminute = 0;
+    }
+
+    $stats['statsmaxruntime'] = new configvar (get_string('configstatsmaxruntime','admin'),
+      choose_from_menu($options,'statsmaxruntime',$config->statsmaxruntime,'','','',true) );                                        
+
+    $stats['statsruntimestart'] = new configvar (get_string('configstatsruntimestart','admin'),
+      print_time_selector("statsruntimestarthour","statsruntimestartminute",make_timestamp(2000,1,1,$config->statsruntimestarthour,$config->statsruntimestartminute),5,true) );
+
+    $stats['statsuserthreshold'] = new configvar (get_string('configstatsuserthreshold','admin'),
+      '<input type="text" name="statsuserthreshold" size="4" value="'.$config->statsuserthreshold.'" />');
+}                                        
 
 ////////////////////////////////////////////////////////////////////
 
@@ -485,6 +651,10 @@ class configvarrss extends configvar {
     $configvars['mail']            = $mail;
     $configvars['user']            = $user;
     $configvars['permissions']     = $permissions;
+    $configvars['requestedcourse'] = $reqcourse;
     $configvars['misc']            = $misc;
+if (empty($CFG->disablestatsprocessing)) {
+    $configvars['stats']           = $stats;
+}
 
 ?>

admin/courses.php

@@ -0,0 +1,42 @@
+<?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");
+    $strcourses        = get_string("courses");
+
+    print_header("$site->shortname: $stradministration: $strcourses", "$site->fullname", 
+                 "<a href=\"index.php\">$stradministration</a> -> $strcourses");
+
+    print_heading($strcourses);
+
+    $table->align = array ("right", "left");
+
+    $table->data[] = array('<b><a href="../course/index.php?edit=on&amp;sesskey='.$USER->sesskey.'">'.get_string("managecourses")."</a></b>",
+                           get_string("adminhelpcourses"));
+    $table->data[] = array("<b><a href=\"enrol.php?sesskey=$USER->sesskey\">".get_string("enrolmentplugins")."</a></b>",
+                           get_string("adminhelpenrolments"));
+    $table->data[] = array("<b><a href=\"../course/index.php?edit=off&amp;sesskey=$USER->sesskey\">".get_string("assignstudents")."</a></b>",
+                           get_string("adminhelpassignstudents"));
+    $table->data[] = array("<b><a href=\"../course/index.php?edit=on&amp;sesskey=$USER->sesskey\">".get_string("assignteachers")."</a></b>",
+                           get_string("adminhelpassignteachers")." <img src=\"../pix/t/user.gif\" height=\"11\" width=\"11\" alt=\"\" />");
+    $table->data[] = array("<b><a href=\"creators.php?sesskey=$USER->sesskey\">".get_string("assigncreators")."</a></b>",
+                           get_string("adminhelpassigncreators"));
+    $table->data[] = array("<b><a href=\"admin.php?sesskey=$USER->sesskey\">".get_string("assignadmins")."</a></b>",
+                           get_string("adminhelpassignadmins"));
+
+    print_table($table);
+
+    print_footer($site);
+
+?>

admin/creators.html

@@ -64,10 +64,7 @@
           ?>
          </select>
          <br />
-         <script type="text/javascript">
-            function
-         </script>
-         <input type="text" name="searchtext" size="30" value="<?php echo $searchtext ?>" 
+         <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;

admin/creators.php

@@ -1,14 +1,10 @@
 <?PHP // $Id$
       // Admin only script to assign course creator rights to users
 
-    require_once("../config.php");
+    require_once('../config.php');
 
     define("MAX_USERS_PER_PAGE", 50);
 
-    optional_variable($search, "");
-    optional_variable($add, "");
-    optional_variable($remove, "");
-
     if (! $site = get_site()) {
         redirect("$CFG->wwwroot/$CFG->admin/index.php");
     }
@@ -50,6 +46,7 @@
 
     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
 
@@ -73,7 +70,7 @@
     }
 
 /// Is there a current search?
-    $previoussearch = (!empty($frm->search) or ($frm->previoussearch == 1)) ;
+    $previoussearch = (!empty($frm->search) or (isset($frm->previoussearch) && $frm->previoussearch == 1)) ;
 
 
 /// Get all existing creators

admin/cron.php

@@ -26,7 +26,8 @@
         chdir(dirname($_SERVER['argv'][0]));
     }
 
-    require_once("../config.php");
+    require_once(dirname(__FILE__) . '/../config.php');
+    require_once($CFG->dirroot.'/lib/adminlib.php');
 
     if (!$alreadyadmin = isadmin()) {
         unset($_SESSION['USER']);
@@ -34,16 +35,30 @@
         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;
     }
 
     //unset test cookie, user must login again anyway
     setcookie('MoodleSessionTest'.$CFG->sessioncookie, '', time() - 3600, '/');
 
+/// switch to site language and locale
+	if (!empty($CFG->courselang)) {
+        unset ($CFG->courselang);
+	}
+    if (!empty($SESSION->lang)) {
+        unset ($SESSION->lang);
+    }
+    $USER->lang = '';
+    moodle_setlocale();
+
+/// send mime type and encoding
+    @header('Content-Type: text/plain; charset='.current_charset());
+
 /// Start output log
 
     $timenow  = time();
 
-    mtrace("<pre>");
     mtrace("Server Time: ".date('r',$timenow)."\n\n");
 
 /// Run all cron jobs for each module
@@ -69,6 +84,31 @@
     }
     mtrace("Finished activity modules");
 
+    mtrace("Starting blocks");
+    if ($blocks = get_records_select("block", "cron > 0 AND (($timenow - lastcron) > cron)")) {
+        // we will need the base class.
+        require_once($CFG->dirroot.'/blocks/moodleblock.class.php');
+        foreach ($blocks as $block) {
+            $blockfile = $CFG->dirroot.'/blocks/'.$block->name.'/block_'.$block->name.'.php';
+            if (file_exists($blockfile)) {
+                require_once($blockfile);
+                $classname = 'block_'.$block->name;
+                $blockobj = new $classname; 
+                if (method_exists($blockobj,'cron')) {
+                    mtrace("Processing cron function for ".$block->name.'....','');
+                    if ($blockobj->cron()) {
+                        if (!set_field('block','lastcron',$timenow,'id',$block->id)) {
+                            mtrace('Error: could not update timestamp for '.$block->name);
+                        }
+                    }
+                    mtrace('done.');
+                }
+            }
+
+        }
+    }
+    mtrace("Finished blocks");
+
     if (!empty($CFG->langcache)) {
         mtrace('Updating languages cache');
         get_list_of_languages();
@@ -104,12 +144,28 @@
         $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
         if ($users = get_users_unconfirmed($oneweek)) {
             foreach ($users as $user) {
-                if (delete_records("user", "id", $user->id)) {
+                if (delete_records('user', 'id', $user->id)) {
                     mtrace("Deleted unconfirmed user for ".fullname($user, true)." ($user->id)");
                 }
             }
         }
         flush();
+
+
+
+        /// Delete users who haven't completed profile within required period
+
+        $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
+        if ($users = get_users_not_fully_set_up($oneweek)) {
+            foreach ($users as $user) {
+                if (delete_records('user', 'id', $user->id)) {
+                    mtrace("Deleted not fully setup user $user->username ($user->id)");
+                }
+            }
+        }
+        flush();
+
+
     
         /// Delete old logs to save space (this might need a timer to slow it down...)
     
@@ -122,8 +178,8 @@
         /// Delete old cached texts
 
         if (!empty($CFG->cachetext)) {   // Defined in config.php
-            $cachelifetime = time() - $CFG->cachetext;
-            delete_records_select("cache_text", "timemodified < '$cachelifetime'");
+            $cachelifetime = time() - $CFG->cachetext - 60;  // Add an extra minute to allow for really heavy sites
+            delete_records_select('cache_text', "timemodified < '$cachelifetime'");
         }
         flush();
 
@@ -134,6 +190,31 @@
 
         sync_metacourses();
 
+        //
+        // generate new password emails for users 
+        //
+        mtrace('checking for create_password');
+        if (count_records('user_preferences', 'name', 'create_password', 'value', '1')) {
+            mtrace('creating passwords for new users');
+            $newusers = get_records_sql("SELECT  u.id as id, u.email, u.firstname, 
+                                                u.lastname, u.username,
+                                                p.id as prefid 
+                                        FROM {$CFG->prefix}user u 
+                                             JOIN {$CFG->prefix}user_preferences p ON u.id=p.userid
+                                        WHERE p.name='create_password' AND p.value=1 AND u.email !='' ");
+
+            foreach ($newusers as $newuserid => $newuser) {
+                $newuser->emailstop = 0; // send email regardless
+                // email user                               
+                if (setnew_password_and_mail($newuser)) {
+                    // remove user pref
+                    delete_records('user_preferences', 'id', $newuser->prefid);
+                } else {
+                    trigger_error("Could not create and mail new user password!");
+                }
+            }
+        }
+
     } // End of occasional clean-up tasks
 
 
@@ -142,6 +223,12 @@
         //Perhaps a long time and memory could help in large sites
         @set_time_limit(0);
         @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 
+            // memory management is truly awful but we can help it.
+            @apache_child_terminate();
+        }
         if (file_exists("$CFG->dirroot/backup/backup_scheduled.php") and
             file_exists("$CFG->dirroot/backup/backuplib.php") and
             file_exists("$CFG->dirroot/backup/lib.php") and
@@ -153,7 +240,7 @@
             mtrace("Running backups if required...");
     
             if (! schedule_backup_cron()) {
-                mtrace("ERORR: Something went wrong while performing backup tasks!!!");
+                mtrace("ERROR: Something went wrong while performing backup tasks!!!");
             } else {
                 mtrace("Backup tasks finished.");
             }
@@ -172,11 +259,64 @@
     }
 
 /// Run the enrolment cron, if any
-    require_once("$CFG->dirroot/enrol/$CFG->enrol/enrol.php");
-    $enrol = new enrolment_plugin();
-    $enrol->cron();
-    if (!empty($enrol->log)) {
-        mtrace($enrol->log);
+    if (!($plugins = explode(',', $CFG->enrol_plugins_enabled))) {
+        $plugins = array($CFG->enrol);
+    }
+    require_once($CFG->dirroot .'/enrol/enrol.class.php');
+    foreach ($plugins as $p) {
+        $enrol = enrolment_factory::factory($p);
+        if (method_exists($enrol, 'cron')) {
+            $enrol->cron();
+        }
+        if (!empty($enrol->log)) {
+            mtrace($enrol->log);
+        }
+        unset($enrol);
+    }
+
+    if (!empty($CFG->enablestats) and empty($CFG->disablestatsprocessing)) {
+
+        // check we're not before our runtime
+        $timetocheck = strtotime("$CFG->statsruntimestarthour:$CFG->statsruntimestartminute today");
+
+        if (time() > $timetocheck) {
+            $time = 60*60*20; // set it to 20 here for first run... (overridden by $CFG)
+            $clobber = true;
+            if (!empty($CFG->statsmaxruntime)) {
+                $time = $CFG->statsmaxruntime+(60*30); // add on half an hour just to make sure (it could take that long to break out of the loop)
+            }
+            if (!get_field_sql('SELECT id FROM '.$CFG->prefix.'stats_daily 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.
+                }
+            }
+            if (set_cron_lock('statsrunning',true,$time, $clobber)) {
+                require_once($CFG->dirroot.'/lib/statslib.php');
+                $return = stats_cron_daily();
+                if (stats_check_runtime() && $return == STATS_RUN_COMPLETE) {
+                    stats_cron_weekly();
+                }
+                if (stats_check_runtime() && $return == STATS_RUN_COMPLETE) {
+                    $return = $return && stats_cron_monthly();
+                }
+                if (stats_check_runtime() && $return == STATS_RUN_COMPLETE) {
+                    stats_clean_old();
+                }
+                set_cron_lock('statsrunning',false);
+                if (!empty($firsttime)) {
+                    set_cron_lock('statsfirstrunlock',false);
+                }
+            }
+        }
     }
 
     //Unset session variables and destroy it

admin/dbperformance.php

@@ -1,7 +1,11 @@
 <?PHP  // $Id$
        // dbperformance.php - shows latest ADOdb stats for the current server
 
-    require_once("../config.php");
+    require_once('../config.php');
+
+    $topframe    = optional_param('topframe', 0, PARAM_BOOL);
+    $bottomframe = optional_param('bottomframe', 0, PARAM_BOOL);
+    $do          = optional_param('do', '', PARAM_ALPHA);
 
     require_login();
 
@@ -13,13 +17,13 @@
     $stradministration = get_string("administration");
     $site = get_site();
 
-    if (isset($topframe)) {
+    if (!empty($topframe)) {
         print_header("$site->shortname: $strdatabaseperformance", "$site->fullname", 
                      "<a target=\"$CFG->framename\" href=\"index.php\">$stradministration</a> -> Database performance");
         exit;
     }
 
-    if (isset($bottomframe) or isset($_GET['do'])) {
+    if (!empty($bottomframe) or !empty($do)) {
         $perf =&NewPerfMonitor($db);
         $perf->UI($pollsecs=5);
         exit;

admin/delete.php

@@ -7,8 +7,8 @@
 
     require_login();
 
-    $sure = optional_param('sure', '');
-    $reallysure = optional_param('reallysure', '');
+    $sure       = optional_param('sure', 0, PARAM_BOOL);
+    $reallysure = optional_param('reallysure', 0, PARAM_BOOL);
 
     if (!isadmin()) {
         error('You must be admin to use this script!');

admin/editor.html

@@ -1,5 +1,6 @@
 <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>
@@ -15,6 +16,7 @@
     <?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>
@@ -112,18 +114,18 @@
         <input type="checkbox" name="buttons[formatblock]"<?php print(in_array("formatblock", $buttons)) ? " checked=\"checked\"": "";?> /> <?php print_string("formatblock","editor");?></td>
     </tr>
     <tr>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_format_bold.gif" width="18" height="18" alt="<?php print_string("bold","editor");?>" title="<?php print_string("bold","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_format_italic.gif" width="18" height="18" alt="<?php print_string("italic","editor");?>" title="<?php print_string("italic","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_format_underline.gif" width="18" height="18" alt="<?php print_string("underline","editor");?>" title="<?php print_string("underline","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_format_strike.gif" width="18" height="18" alt="<?php print_string("strikethrough","editor");?>" title="<?php print_string("strikethrough","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_format_sub.gif" width="18" height="18" alt="<?php print_string("subscript","editor");?>" title="<?php print_string("subscript","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_format_sup.gif" width="18" height="18" alt="<?php print_string("superscript","editor");?>" title="<?php print_string("superscript","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_copy.gif" width="18" height="18" alt="<?php print_string("copy","editor");?>" title="<?php print_string("copy","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_cut.gif" width="18" height="18" alt="<?php print_string("cut","editor");?>" title="<?php print_string("cut","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_paste.gif" width="18" height="18" alt="<?php print_string("paste","editor");?>" title="<?php print_string("paste","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_wordclean.gif" width="18" height="18" alt="<?php print_string("wordclean","editor");?>" title="<?php print_string("wordclean","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_undo.gif" width="18" height="18" alt="<?php print_string("undo","editor");?>" title="<?php print_string("undo","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_redo.gif" width="18" height="18" alt="<?php print_string("redo","editor");?>" title="<?php print_string("redo","editor");?>" /></td>
+        <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>
@@ -140,18 +142,18 @@
         <td><input type="checkbox" name="buttons[redo]"<?php print(in_array("redo", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
     </tr>
     <tr>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_align_left.gif" width="18" height="18" alt="<?php print_string("justifyleft","editor");?>" title="<?php print_string("justifyleft","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_align_center.gif" width="18" height="18" alt="<?php print_string("justifycenter","editor");?>" title="<?php print_string("justifycenter","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_align_right.gif" width="18" height="18" alt="<?php print_string("justifyright","editor");?>" title="<?php print_string("justifyright","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_align_justify.gif" width="18" height="18" alt="<?php print_string("justifyfull","editor");?>" title="<?php print_string("justifyfull","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_left_to_right.gif" width="18" height="18" alt="<?php print_string("lefttoright","editor");?>" title="<?php print_string("lefttoright","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_right_to_left.gif" width="18" height="18" alt="<?php print_string("righttoleft","editor");?>" title="<?php print_string("righttoleft","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_list_num.gif" width="18" height="18" alt="<?php print_string("orderedlist","editor");?>" title="<?php print_string("orderedlist","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_list_bullet.gif" width="18" height="18" alt="<?php print_string("unorderedlist","editor");?>" title="<?php print_string("unorderedlist","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_indent_less.gif" width="18" height="18" alt="<?php print_string("outdent","editor");?>" title="<?php print_string("outdent","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_indent_more.gif" width="18" height="18" alt="<?php print_string("indent","editor");?>" title="<?php print_string("indent","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_color_fg.gif" width="18" height="18" alt="<?php print_string("forecolor","editor");?>" title="<?php print_string("forecolor","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_color_bg.gif" width="18" height="18" alt="<?php print_string("hilitecolor","editor");?>" title="<?php print_string("hilitecolor","editor");?>" /></td>
+        <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>
@@ -168,18 +170,18 @@
         <td><input type="checkbox" name="buttons[hilitecolor]"<?php print(in_array("hilitecolor", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
     </tr>
     <tr>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_hr.gif" width="18" height="18" alt="<?php print_string("horizontalrule","editor");?>" title="<?php print_string("horizontalrule","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_anchor.gif" width="18" height="18" alt="<?php print_string("createanchor","editor");?>" title="<?php print_string("createanchor","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_link.gif" width="18" height="18" alt="<?php print_string("insertlink","editor");?>" title="<?php print_string("insertlink","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_unlink.gif" width="18" height="18" alt="<?php print_string("removelink","editor");?>" title="<?php print_string("removelink","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_image.gif" width="18" height="18" alt="<?php print_string("insertimage","editor");?>" title="<?php print_string("insertimage","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/insert_table.gif" width="18" height="18" alt="<?php print_string("inserttable","editor");?>" title="<?php print_string("inserttable","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/em.icon.smile.gif" width="18" height="18" alt="<?php print_string("insertsmile","editor");?>" title="<?php print_string("insertsmile","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/icon_ins_char.gif" width="18" height="18" alt="<?php print_string("insertchar","editor");?>" title="<?php print_string("insertchar","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/spell-check.gif" width="18" height="18" alt="<?php print_string("spellcheck","editor");?>" title="<?php print_string("spellcheck","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_html.gif" width="18" height="18" alt="<?php print_string("htmlmode","editor");?>" title="<?php print_string("htmlmode","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/fullscreen_maximize.gif" width="18" height="18" alt="<?php print_string("popupeditor","editor");?>" title="<?php print_string("popupeditor","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_replace.gif" width="18" height="18" alt="<?php print_string("popupeditor","editor");?>" title="<?php print_string("searchandreplace","editor");?>" /></td>
+        <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>
@@ -196,7 +198,7 @@
         <td><input type="checkbox" name="buttons[search_replace]"<?php print(in_array("search_replace", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
     </tr>
     <tr>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_nolink.gif" width="18" height="18" alt="<?php print_string("horizontalrule","editor");?>" title="<?php print_string("nolink","editor");?>" /></td>
+        <td><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>
@@ -226,6 +228,69 @@
     </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>
@@ -234,6 +299,7 @@
 
 <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>

admin/editor.php

@@ -1,7 +1,10 @@
 <?php // $Id$
 /// configuration routines for HTMLArea editor
 
-    require_once("../config.php");
+    require_once('../config.php');
+
+    $currentpage = optional_param('tab', 1, PARAM_INT);
+
     require_login();
 
     if (!isadmin()) {
@@ -12,20 +15,38 @@
 
         // do we want default values?
         if (isset($data->resettodefaults)) {
-            if (!(reset_to_defaults())) {
+            if (!(reset_to_defaults($currentpage))) {
                 error("Editor settings could not be restored!");
             }
         } else {
 
-            if (!(editor_update_config($data))) {
+            if (!(editor_update_config($data, $currentpage))) {
                 error("Editor settings could not be updated!");
             }
         }
-        redirect("$CFG->wwwroot/$CFG->admin/editor.php", get_string("changessaved"), 1);
+        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();
 
@@ -37,8 +58,11 @@
                      "<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();
@@ -67,7 +91,7 @@ function editor_convert_to_array ($string) {
    return $fonts;
 }
 
-function editor_update_config ($data) {
+function editor_update_config ($data, $editor) {
 
 /// Updates the editor config values.
 
@@ -75,6 +99,8 @@ function editor_update_config ($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),
@@ -115,6 +141,30 @@ function editor_update_config ($data) {
         }
     }
     $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))) {
@@ -125,7 +175,7 @@ function editor_update_config ($data) {
     return true;
 }
 
-function reset_to_defaults () {
+function reset_to_defaults ($editor) {
 /// Reset the values to default
 
     global $CFG;
@@ -133,6 +183,8 @@ function reset_to_defaults () {
 
     $updatedata = array();
 
+    switch ( $editor ) {
+        case 1: // HTMLArea.
     $updatedata['editorbackgroundcolor'] = $defaults['editorbackgroundcolor'];
     $updatedata['editorfontfamily'] = $defaults['editorfontfamily'];
     $updatedata['editorfontsize'] = $defaults['editorfontsize'];
@@ -141,6 +193,16 @@ function reset_to_defaults () {
     $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))) {
@@ -211,4 +273,34 @@ function editor_get_dictionaries () {
 
 }
 
+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

@@ -2,10 +2,11 @@
        // enrol.php - allows admin to edit all enrollment variables
        //             Yes, enrol is correct English spelling.
 
-    include("../config.php");
-
-    $enrol = optional_param('enrol', $CFG->enrol, PARAM_ALPHA);
+    require_once('../config.php');
 
+    $enrol = optional_param('enrol', $CFG->enrol, PARAM_SAFEDIR);
+    $CFG->pagepath = 'enrol';
+    
     require_login();
 
     if (!$site = get_site()) {
@@ -20,69 +21,91 @@
         error(get_string('confirmsesskeybad', 'error'));
     }
 
-    require_once("$CFG->dirroot/enrol/$enrol/enrol.php");   /// Open the class
+    require_once("$CFG->dirroot/enrol/enrol.class.php");   /// Open the factory class
 
-    $enrolment = new enrolment_plugin();
-
-
-/// If data submitted, then process and store.
+/// Save settings
 
     if ($frm = data_submitted()) {
-        if ($enrolment->process_config($frm)) {
-            set_config('enrol', $frm->enrol);
-            redirect("enrol.php?sesskey=$USER->sesskey", get_string("changessaved"), 1);
+        if (empty($frm->enable)) {
+            $frm->enable = array();
         }
-    } else {
-        $frm = $CFG;
+        if (empty($frm->default)) {
+            $frm->default = '';
+        }
+        if ($frm->default && $frm->default != 'manual' && !in_array($frm->default, $frm->enable)) {
+            $frm->enable[] = $frm->default;
+        }
+        asort($frm->enable);
+        $frm->enable = array_merge(array('manual'), $frm->enable); // make sure manual plugin is called first
+        set_config('enrol_plugins_enabled', implode(',', $frm->enable));
+        set_config('enrol', $frm->default);
+        redirect("enrol.php?sesskey=$USER->sesskey", get_string("changessaved"), 1);
     }
 
-/// Otherwise fill and print the form.
+/// Print the form
 
-    /// get language strings
-    $str = get_strings(array('enrolments', 'users', 'administration', 'settings'));
+    $str = get_strings(array('enrolmentplugins', 'users', 'administration', 'settings', 'edit'));
 
+    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();
     foreach ($modules as $module) {
         $options[$module] = get_string("enrolname", "enrol_$module");
     }
     asort($options);
 
-    print_header("$site->shortname: $str->enrolments", "$site->fullname",
-                  "<a href=\"index.php\">$str->administration</a> -> 
-                   <a href=\"users.php\">$str->users</a> -> $str->enrolments");
+    print_simple_box(get_string('configenrolmentplugins', 'admin'), 'center', '700');
 
     echo "<form target=\"{$CFG->framename}\" name=\"enrolmenu\" method=\"post\" action=\"enrol.php\">";
     echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\">";
-    echo "<div align=\"center\"><p><b>";
 
+    $table = new stdClass();
+    $table->head = array(get_string('name'), get_string('enable'), get_string('default'), $str->settings);
+    $table->align = array('left', 'center', 'center', 'center');
+    $table->size = array('60%', '', '', '15%');
+    $table->width = '700';
+    $table->data = array();
 
-/// Choose an enrolment method
-    echo get_string('chooseenrolmethod').': ';
-    choose_from_menu ($options, "enrol", $enrol, "",
-                      "document.location='enrol.php?sesskey=$USER->sesskey&enrol='+document.enrolmenu.enrol.options[document.enrolmenu.enrol.selectedIndex].value", "");
+    $modules = get_list_of_plugins("enrol");
+    foreach ($modules as $module) {
 
-    echo "</b></p></div>";
-    
-/// Print current enrolment type description    
-    print_simple_box_start("center", "80%");
-    print_heading($options[$enrol]);
+        // skip if directory is empty
+        if (!file_exists("$CFG->dirroot/enrol/$module/enrol.php")) {
+            continue;
+        }
 
-    print_simple_box_start("center", "60%", '', 5, 'informationbox');
-    print_string("description", "enrol_$enrol");
-    print_simple_box_end();
+        $name = get_string("enrolname", "enrol_$module");
+        $plugin = enrolment_factory::factory($module);
+        $enable = '<input type="checkbox" name="enable[]" value="'.$module.'"';
+        if (stristr($CFG->enrol_plugins_enabled, $module) !== false) {
+            $enable .= ' checked="checked"';
+        }
+        if ($module == 'manual') {
+            $enable .= ' disabled="disabled"';
+        }
+        $enable .= ' />';
+        if (method_exists($plugin, 'print_entry')) {
+            $default = '<input type="radio" name="default" value="'.$module.'"';
+            if ($CFG->enrol == $module) {
+                $default .= ' checked="checked"';
+            }
+            $default .= ' />';
+        } else {
+            $default = '';
+        }
+        $table->data[$name] = array($name, $enable, $default,
+                                '<a href="enrol_config.php?sesskey='.$USER->sesskey.'&amp;enrol='.$module.'">'.$str->edit.'</a>');
+    }
+    asort($table->data);
 
-    echo "<hr />";
-   // print_heading($str->settings);
-    
-    $enrolment->config_form($frm);
+    print_table($table);
 
-    echo "<center><p><input type=\"submit\" value=\"".get_string("savechanges")."\"></p></center>\n";
+    echo "<center><input type=\"submit\" value=\"".get_string("savechanges")."\"></center>\n";
     echo "</form>";
 
-    print_simple_box_end();
-
     print_footer();
 
-    exit;
-?>
+?>

admin/enrol_config.php

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

admin/environment.php

@@ -31,12 +31,12 @@
 
     require_once('../config.php');
     require_once($CFG->libdir.'/environmentlib.php');
+    require_once($CFG->libdir.'/componentlib.class.php');
 
 
 /// Parameters
-    $action = optional_param('action', '', PARAM_ALPHA);
-    $sesskey = optional_param('sesskey');
-    $version = optional_param('version');
+    $action  = optional_param('action', '', PARAM_ACTION);
+    $version = optional_param('version', '', PARAM_FILE); //
 
 /// Security checks
     require_login();
@@ -55,14 +55,48 @@
     $strenvironment = get_string('environment', 'admin');
     $strerror = get_string('error');
     $strmoodleversion = get_string('moodleversion');
+    $strupdate = get_string('updatecomponent', 'admin');
     $strupwards = get_string('upwards', 'admin');
+    $strmisc = get_string('miscellaneous');
 
 /// Print the header stuff
     print_header("$SITE->shortname: $strenvironment", $SITE->fullname,
-                 "<a href=\"index.php\">$stradmin</a> -> ".$strenvironment);
+                 "<a href=\"index.php\">$stradmin</a> -> <a href=\"misc.php\">$strmisc</a> -> "
+                 .$strenvironment);
+
+/// Print the component download link
+    echo '<div class="reportlink"><a href="environment.php?action=updatecomponent&amp;sesskey='.$USER->sesskey.'">'.$strupdate.'</a></div>';
 
     print_heading($strenvironment);
 
+/// Handle the 'updatecomponent' action
+    if ($action == 'updatecomponent' && confirm_sesskey()) {
+    /// Create component installer and execute it
+        if ($cd = new component_installer('http://download.moodle.org', 
+                                          'environment', 
+                                          'environment.zip')) {
+            $status = $cd->install(); //returns ERROR | UPTODATE | INSTALLED
+            switch ($status) {
+                case ERROR:
+                    if ($cd->get_error() == 'remotedownloadnotallowed') {
+                        $a = new stdClass();
+                        $a->url = 'http://download.moodle.org/environment/environment.zip';
+                        $a->dest= $CFG->dataroot.'/';
+                        print_simple_box(get_string($cd->get_error(), 'error', $a), 'center', '', '', 5, 'errorbox');
+                    } else {
+                        print_simple_box(get_string($cd->get_error(), 'error'), 'center', '', '', 5, 'errorbox');
+                    }
+                    break;
+                case UPTODATE:
+                    print_simple_box(get_string($cd->get_error(), 'error'), 'center');
+                    break;
+                case INSTALLED:
+                    print_simple_box(get_string('componentinstalled', 'admin'), 'center');
+                    break;
+            }
+        }
+    }
+
 /// Start of main box
     print_simple_box_start('center');
 
@@ -107,6 +141,11 @@
 /// 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
     print_footer();
 ?>

admin/environment.xml

@@ -34,4 +34,30 @@
       </PHP_EXTENSION>
     </PHP_EXTENSIONS>
   </MOODLE>
+  <MOODLE version="1.7">
+    <DATABASE level="required">
+      <VENDOR name="mysql" version="4.1.16">
+        <FEEDBACK>
+          <ON_ERROR message="mysql416required" />
+        </FEEDBACK>
+        <BYPASS function="bypass_mysql416_reqs" message="mysql416bypassed" />
+      </VENDOR>
+      <VENDOR name="postgres" version="7.4" />
+      <VENDOR name="mssql" version="8.0" />
+      <VENDOR name="oracle" version="9.0" />
+    </DATABASE>
+    <PHP version="4.3.0" level="required" />
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="iconvrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="mbstringrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+    </PHP_EXTENSIONS>
+  </MOODLE>
 </COMPATIBILITY_MATRIX>

admin/filter.php

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

admin/filters.html

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

admin/filters.php

@@ -1,172 +1,333 @@
-<?PHP // $Id$
-      // Allows the admin to create, delete and rename course categories
+<?php // $Id$
+    // filters.php
+    // Edit list of available text filters
 
-    require_once("../config.php");
+    require_once('../config.php');
+    require_once($CFG->libdir.'/tablelib.php');
 
-    optional_variable($iselect);
-    optional_variable($uselect);
-    optional_variable($add);
-    optional_variable($remove);
-    optional_variable($up);
-    optional_variable($down);
+    // defines
+    define('FILTER_TABLE','filter_administration_table');
 
+    // check for allowed access
     require_login();
 
     if (!isadmin()) {
-        error("Only administrators can use this page!");
+        error('Only administrators can use the filters administration page');
     }
-
     if (!$site = get_site()) {
-        error("Site isn't defined!");
+        error('Site is not defined in filters administration page');
     }
 
-/// Print headings
+    // 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);
 
-    $stradministration = get_string("administration");
-    $strconfiguration = get_string("configuration");
-    $strmanagefilters = get_string("managefilters");
-    $strversion = get_string("version");
-    $strsettings = get_string("settings");
-    $strup = get_string("up");
-    $strdown = get_string("down");
-    $stractive = get_string("active");
-    $strinactive = get_string("inactive");
-    $strcachetext = get_string("cachetext", "admin");
-    $strconfigcachetext = get_string("configcachetext", 'admin');
-    $strfilteruploadedfiles = get_string("filteruploadedfiles", "admin");
-    $strfilterall = get_string("filterall", "admin");
-    $strconfigfilteruploadedfiles = get_string("configfilteruploadedfiles", 'admin');
-    $strconfigfilterall = get_string("configfilterall", "admin");
+    // some basic information
+    $url = 'filters.php';
+    $myurl = "$url?sesskey=" . sesskey();
+    $img = "$CFG->pixpath/t";
 
-    print_header("$site->shortname: $strmanagefilters", "$site->fullname", 
-                 "<a href=\"index.php\">$stradministration</a> -> ".
-                 "<a href=\"configure.php\">$strconfiguration</a> -> $strmanagefilters");
-
-    print_heading($strmanagefilters);
-
-
-/// Make a list of all available filters and the best names for them we can find
-    $allfilters = array();
-
-    $filterlocations = array("mod", "filter");
+    // 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 $key => $plugin) {
-            if (is_readable("$CFG->dirroot/$filterlocation/$plugin/filter.php")) {
+        foreach ($plugins as $plugin) {
+            $pluginpath = "$CFG->dirroot/$filterlocation/$plugin/filter.php";
+            $settingspath = "$CFG->dirroot/$filterlocation/$plugin/filterconfig.html";
+            if (is_readable($pluginpath)) {
                 $name = trim(get_string("filtername", $plugin));
-                if (empty($name) or $name == "[[filtername]]") {
-                    $name = $plugin;
+                if (empty($name) or ($name == '[[filtername]]')) {
+                    $name = ucfirst($plugin);
+                }
+                $installedfilters["$filterlocation/$plugin"] = $name;
+                if (is_readable($settingspath)) {
+                    $filtersettings[] = "$filterlocation/$plugin";
                 }
-                $allfilters["$filterlocation/$plugin"] = $name;
             }
         }
     }
 
-   
-/// Make an array of all the currently installed filters
-
-    $installedfilters = array();
+    // get all the currently selected filters
     if (!empty($CFG->textfilters)) {
-        $installedfilters = explode(',',$CFG->textfilters);
+        $oldactivefilters = explode(',', $CFG->textfilters);
+        $oldactivefilters = array_unique($oldactivefilters);
+    } else {
+        $oldactivefilters = array();
+    }
 
-        // Do a little cleanup for robustness
-        foreach ($installedfilters as $key => $installedfilter) {
-            if (empty($installedfilter)) {
-                unset($installedfilters[$key]);
-                set_config("textfilters", implode(',', $installedfilters));
-            }
+    // take this opportunity to clean up filters
+    $activefilters = array();
+    foreach ($oldactivefilters as $oldactivefilter) {
+        if (!empty($oldactivefilter) and array_key_exists($oldactivefilter, $installedfilters)) {
+            $activefilters[] = $oldactivefilter;
         }
     }
 
-    $selectedfilter = "none";
+    //======================
+    // Process Actions
+    //======================
 
-/// If data submitted, then process and store.
+    if ($params->action=="") {
+        // store cleaned active filers in db
+        set_config('textfilters', implode(',', $activefilters));
+    } elseif (($params->action=="hide") and confirm_sesskey()) {
+        $key=array_search($params->filterpath, $activefilters);
+        // check filterpath is valid
+        if ($key===false) {
+            // ignore it - doubleclick??
+        } else {
+            // just delete it
+            unset($activefilters[$key]);
+            set_config('textfilters', implode(',', $activefilters));
+        }
+    } elseif (($params->action=="show") and confirm_sesskey()) {
+        // check filterpath is valid
+        if (!array_key_exists($params->filterpath, $installedfilters)) {
+            error("Filter $params->filterpath is not currently installed", $url);
+        } elseif (array_search($params->filterpath,$activefilters)) {
+            // filterpath is already active - doubleclick??
+        } else {
+            // add it to installed filters
+            $activefilters[] = $params->filterpath;
+            $activefilters = array_unique($activefilters);
+            set_config('textfilters', implode(',', $activefilters));
+        }
+    } elseif (($params->action=="down") and confirm_sesskey()) {
+        $key=array_search($params->filterpath, $activefilters);
+        // check filterpath is valid
+        if ($key===false) {
+            error("Filter $params->filterpath is not currently active", $url);
+        } elseif ($key>=(count($activefilters)-1)) {
+            // cannot be moved any further down - doubleclick??
+        } else {
+            // swap with $key+1
+            $fsave = $activefilters[$key];
+            $activefilters[$key] = $activefilters[$key+1];
+            $activefilters[$key+1] = $fsave;
+            set_config('textfilters', implode(',', $activefilters));
+        }
+    } elseif (($params->action=="up") and confirm_sesskey()) {
+        $key=array_search($params->filterpath, $activefilters);
+        // check filterpath is valid
+        if ($key===false) {
+            error("Filter $params->filterpath is not currently active", $url);
+        } elseif ($key<1) {
+            //cannot be moved any further up - doubleclick??
+        } else {
+            // swap with $key-1
+            $fsave = $activefilters[$key];
+            $activefilters[$key] = $activefilters[$key-1];
+            $activefilters[$key-1] = $fsave;
+            set_config('textfilters', implode(',', $activefilters));
+        }
+    } elseif (($params->action=="config") and confirm_sesskey()) {
+        set_config('cachetext', $params->cachetext);
+        set_config('filteruploadedfiles', $params->filteruploadedfiles);
+        set_config('filterall', $params->filterall);
+        set_config('filtermatchoneperpage', $params->filtermatchoneperpage);
+        set_config('filtermatchonepertext', $params->filtermatchonepertext);
+    }
 
-    if (!empty($options)) {
-        if (($config = data_submitted()) && confirm_sesskey()) {  
-            unset($config->options);
-            unset($config->sesskey);
-            foreach ($config as $name => $value) {
-                set_config($name, $value);
-            }
+    //======================
+    // 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;
         }
     }
 
-    if (!empty($add) and !empty($uselect) and confirm_sesskey()) {
-        $selectedfilter = $uselect;
-        if (!in_array($selectedfilter, $installedfilters)) {
-            $installedfilters[] = $selectedfilter;
-            set_config("textfilters", implode(',', $installedfilters));
+    // construct the flexible table ready to display
+    $table = new flexible_table(FILTER_TABLE);
+    $table->define_columns(array('name', 'hideshow', 'order', 'settings'));
+    $table->column_style('hideshow', 'text-align', 'center');
+    $table->column_style('order', 'text-align', 'center');
+    $table->column_style('settings', 'text-align', 'center');
+    $table->define_headers(array($txt->name, $txt->hideshow, $txt->updown, $txt->settings));
+    $table->define_baseurl("$CFG->wwwroot/$CFG->admin/filters.php");
+    $table->set_attribute('id', 'blocks');
+    $table->set_attribute('class', 'flexible generaltable generalbox');
+    $table->set_attribute('style', 'margin:auto;');
+    $table->set_attribute('cellpadding', '5');
+    $table->setup();
+
+    // iterate through filters adding to display table
+    $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>";
         }
 
-    } else if (!empty($remove) and !empty($iselect) and confirm_sesskey()) {
-        $selectedfilter = $iselect;
-        foreach ($installedfilters as $key => $installedfilter) {
-            if ($installedfilter == $selectedfilter) {
-                unset($installedfilters[$key]);
+        // 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;
         }
-        set_config("textfilters", implode(',', $installedfilters));
 
-    } else if ((!empty($up) or !empty($down)) and !empty($iselect) and confirm_sesskey()) {
+        // settings link (if defined)
+        $settings = '';
+        if (in_array($path, $filtersettings)) {
+            $settings = "<a href=\"filter.php?filter=" . urlencode($path) . "\">";
+            $settings .= "{$txt->settings}</a>";
+        }
 
-        if (!empty($up)) {
-            if ($allfilters[$iselect]) {
-                foreach ($installedfilters as $key => $installedfilter) {
-                    if ($installedfilter == $iselect) {
-                        $movefilter = $key;
-                        break;
-                    }
-                    $swapfilter = $key;
-                }
-            }
-        }
-        if (!empty($down)) {
-            if ($allfilters[$iselect]) {
-                $choosenext = false;
-                foreach ($installedfilters as $key => $installedfilter) {
-                    if ($choosenext) {
-                        $swapfilter = $key;
-                        break;
-                    }
-                    if ($installedfilter == $iselect) {
-                        $movefilter = $key;
-                        $choosenext = true;
-                    }
-                }
-            }
-        }
-        if (isset($swapfilter) and isset($movefilter)) {
-            $tempfilter = $installedfilters[$swapfilter];
-            $installedfilters[$swapfilter] = $installedfilters[$movefilter];
-            $installedfilters[$movefilter] = $tempfilter;
-            set_config("textfilters", implode(',', $installedfilters));
-        }
-        $selectedfilter = $iselect;
+        // write data into the table object
+        $table->add_data(array($displayname, $hideshow, $updown, $settings));
     }
 
-
-
-/// Make an array of all the currently uninstalled filters
-
-    $uninstalledfilters = array();
-    foreach ($allfilters as $filter => $name) {
-        $installed = false;
-        foreach ($installedfilters as $installedfilter) {
-            if ($installedfilter == $filter) {
-                $installed = true;
-            }
+    // 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);
         }
-        if (!$installed) {
-            $uninstalledfilters[] = $filter;
+        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');
         }
     }
 
-/// Print the current form
+    //==============================
+    // Display logic
+    //==============================
 
-    include("filters.html");
+    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/health.php

@@ -1,12 +1,24 @@
 <?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;
+        }
+    }
+
     define('SEVERITY_NOTICE',      'notice');
     define('SEVERITY_ANNOYANCE',   'annoyance');
     define('SEVERITY_SIGNIFICANT', 'significant');
     define('SEVERITY_CRITICAL',    'critical');
 
+    $solution = optional_param('solution', 0, PARAM_SAFEDIR); //in fact it is class name alhanumeric and _
+
     require_login();
     if (!isadmin()) {
         error('Only the admin can use this page');
@@ -15,9 +27,11 @@
     $site = get_site();
     $stradmin         = get_string('administration');
     $strhealthcenter  = get_string('healthcenter');
+    $strmisc          = get_string('miscellaneous');
 
     print_header($site->shortname.': '.$strhealthcenter, $site->fullname,
-                  '<a href="index.php">'.$stradmin.'</a> -> '.$strhealthcenter);
+                  '<a href="index.php">'.$stradmin.'</a> -> <a href="misc.php">'.$strmisc.'</a> ->'.
+                  $strhealthcenter);
 
 echo <<<STYLES
 <style type="text/css">
@@ -81,9 +95,7 @@ dd.solution li {
 </style>
 STYLES;
 
-    $solution = optional_param('solution', NULL);
-
-    if(!empty($solution) && class_exists($solution)) {
+    if(strpos($solution, 'problem_') === 0 && class_exists($solution)) {
         health_print_solution($solution);
     }
     else {
@@ -215,18 +227,13 @@ class problem_000001 extends problem_base {
 
 class problem_000002 extends problem_base {
     function title() {
-        return 'Extra characters at the end of config.php';
+        return 'Extra characters at the end of config.php or other library function';
     }
     function exists() {
-        // [pj] When the requirements are raised to PHP 4.3.0 this will be file_get_contents()
-        if($fp = @fopen('../config.php', 'r')) {
-            $contents = fread($fp, 16384); // 16K should be enough
-            $ending = substr($contents, -2);
-            unset($contents);
-            if($ending == '?>') {
-                return false;
-            }
-            fclose($fp);
+        global $extraws;
+
+        if($extraws === '') {
+            return false;
         }
         return true;
     }
@@ -234,11 +241,11 @@ class problem_000002 extends problem_base {
         return SEVERITY_SIGNIFICANT;
     }
     function description() {
-        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.';
+        return 'Your Moodle configuration file config.php or another library file, contains some characters after the closing PHP tag (?>). This causes Moodle to exhibit several kinds of problems (such as broken downloaded files) and must be fixed.';
     }
     function solution() {
         global $CFG;
-        return 'You need to edit <strong>'.$CFG->dirroot.'/config.php</strong> and remove all characters (including spaces and returns) after the ending ?> tag. These two characters should be the very last in that file.';
+        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.';
     }
 }
 
@@ -349,24 +356,41 @@ class problem_000008 extends problem_base {
         return 'PHP: memory_limit cannot be controlled by Moodle';
     }
     function exists() {
-        $memlimit = @ini_get('memory_limit');
-        if(empty($memlimit)) {
+        $oldmemlimit = @ini_get('memory_limit');
+        if(empty($oldmemlimit)) {
             // PHP not compiled with memory limits, this means that it's
-            // probably limited to 8M so we have a problem...
-            return true;
+            // 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;
         }
-        // Otherwise, raise_memory_limit in setup.php will do the trick
+        $oldmemlimit = get_real_size($oldmemlimit);
+        //now lets change the memory limit to something unique below 128M==134217728
+        @ini_set('memory_limit', 134217720);
+        $testmemlimit = get_real_size(@ini_get('memory_limit'));
+        //verify the change had any effect at all
+        if ($oldmemlimit == $testmemlimit) {
+            //memory limit can not be changed - is it big enough then?
+            if ($oldmemlimit < get_real_size('128M')) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+        @ini_set('memory_limit', $oldmemlimit);
         return false;
     }
     function severity() {
-        return SEVERITY_ANNOYANCE;
+        return SEVERITY_NOTICE;
     }
     function description() {
-        return 'The settings for PHP on your server do not allow a script to request more memory during its execution. This means that 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.';
+        return 'The settings for PHP on your server do not allow a script to request more memory during its execution. '.
+               'This means that there is a hard limit of '.@ini_get('memory_limit').' for each script. '.
+               'It is possible that certain operations within Moodle will require more than this amount in order '.
+               'to complete successfully, especially if there are lots of data to be processed.';
     }
     function solution() {
-        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?';
+        return 'It is recommended that you contact your web server administrator to address this issue.';
     }
 }
 
@@ -420,7 +444,7 @@ class problem_000010 extends problem_base {
             $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></li>';
+            $desc .= '<li>can not run automatic test, you can verify it <a href="'.$CFG->wwwroot.'/file.php/testslasharguments" target="_blank">here</a> manually</li>';
         } else if ($this->status() == 0) {
             $desc .= '<li>slashargument test <strong>failed</strong>, please check server configuration</li>';
         } else {
@@ -461,13 +485,13 @@ class problem_000010 extends problem_base {
     function status() {
         global $CFG;
         $handle = @fopen($CFG->wwwroot.'/file.php?file=/testslasharguments', "r");
-        $contents = trim(@fread($handle, 7));
+        $contents = @trim(fread($handle, 10));
         @fclose($handle);
         if ($contents != 'test -1') {
             return -1;
         }
         $handle = @fopen($CFG->wwwroot.'/file.php/testslasharguments', "r");
-        $contents = trim(@fread($handle, 6));
+        $contents = trim(@fread($handle, 10));
         @fclose($handle);
         switch ($contents) {
             case 'test 1': return 1;
@@ -498,7 +522,7 @@ class problem_000011 extends problem_base {
     }
     function solution() {
         global $CFG;
-        if (isset($_GET['resetsesserrorcounter'])) {
+        if (optional_param('resetsesserrorcounter', 0, PARAM_BOOL)) {
             if (get_field('config', 'name', 'name', 'session_error_counter')) {
                 delete_records('config', 'name', 'session_error_counter');
             }
@@ -534,7 +558,8 @@ class problem_00000x extends problem_base {
 TODO:
 
     session.save_path -- it doesn't really matter because we are already IN a session, right?
+    detect unsupported characters in $CFG->wwwroot - see bug Bug #6091 - relative vs absolute path during backup/restore process
 
 */
 
-?>
+?>

admin/index.php

@@ -1,29 +1,32 @@
 <?php // $Id$
 
 /// Check that config.php exists, if not then call the install script
-    if (!file_exists("../config.php")) {
+    if (!file_exists('../config.php')) {
         header('Location: ../install.php');
         die;
     }
 
-    require_once("../config.php");
-    include_once("$CFG->dirroot/lib/adminlib.php");  // Contains various admin-only functions
-
-
 /// Check that PHP is of a sufficient version
-
-    if (!check_php_version("4.1.0")) {
-        $version = phpversion();
-        print_heading("Sorry, Moodle requires PHP 4.1.0 or later (currently using version $version)");
+/// Moved here because older versions do not allow while(@ob_end_clean());
+    if (version_compare(phpversion(), "4.3.0") < 0) {
+        $phpversion = phpversion();
+        echo "Sorry, Moodle requires PHP 4.3.0 or later (currently using version $phpversion)";
         die;
     }
 
-/// This is a Moodle 1.5 hack ONLY to fix accidental bad versions from version.php
-/// Do not copy this code into HEAD
-  
-    if ($CFG->version == '2005072100') {
-        set_config('version', 2005060221);
-    }
+/// 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');
+    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 some PHP server settings
@@ -73,13 +76,6 @@
         $CFG->version = "";
     }
 
-/// Turn off time limits and try to flush everything all the time, sometimes upgrades can be slow.
-
-    @set_time_limit(0);
-    @ob_implicit_flush(true);
-    @ob_end_flush();
-
-
 /// Check if the main tables have been installed yet or not.
 
     if (! $tables = $db->Metatables() ) {    // No tables yet at all.
@@ -104,12 +100,12 @@
             print_header($strlicense, $strlicense, $strlicense, "", "", false, "&nbsp;", "&nbsp;");
             print_heading("<a href=\"http://moodle.org\">Moodle</a> - Modular Object-Oriented Dynamic Learning Environment");
             print_heading(get_string("copyrightnotice"));
-            print_simple_box_start("center");
+            print_simple_box_start('center');
             echo text_to_html(get_string("gpl"));
             print_simple_box_end();
             echo "<br />";
             notice_yesno(get_string("doyouagree"), "index.php?agreelicence=true",
-                                                   "http://moodle.org/doc/?frame=licence.html");
+                                                   "http://docs.moodle.org/en/License");
             exit;
         }
 
@@ -148,7 +144,7 @@
             $a->newversion = "$release ($version)";
             $strdatabasechecking = get_string("databasechecking", "", $a);
 
-            if (empty($_GET['confirmupgrade'])) {
+            if (empty($confirmupgrade)) {
                 print_header($strdatabasechecking, $stradministration, $strdatabasechecking,
                         "", "", false, "&nbsp;", "&nbsp;");
                 notice_yesno(get_string('upgradesure', 'admin', $a->newversion), 'index.php?confirmupgrade=yes', 'index.php');
@@ -184,11 +180,7 @@
         print_header($strcurrentversion, $stradministration, $strcurrentversion,
                      "", "", false, "&nbsp;", "&nbsp;");
 
-        if (set_config("version", $version)) {
-            print_heading("Moodle $release ($version)");
-            print_continue("index.php");
-            die;
-        } else {
+        if (!set_config("version", $version)) {
             $db->debug=true;
             if (main_upgrade(0)) {
                 print_continue("index.php");
@@ -199,7 +191,6 @@
         }
     }
 
-
 /// Updated human-readable release version if necessary
 
     if ($release <> $CFG->release) {  // Update the release version
@@ -209,16 +200,10 @@
         if (!set_config("release", $release)) {
             notify("ERROR: Could not update release version in database!!");
         }
-        print_continue("index.php");
-        print_simple_box_start("CENTER");
-        include("$CFG->dirroot/lang/en/docs/release.html");
-        print_simple_box_end();
-        print_continue("index.php");
+        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");
@@ -231,17 +216,22 @@
         }
     }
 
+/// 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");
+        redirect("config.php?installing=1");
     }
 
-
-
 /// Find and check all main modules and load them up or upgrade them if necessary
     upgrade_activity_modules("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
+/// Check all questiontype plugins and upgrade if necessary
+    // 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
     require_once("$CFG->dirroot/backup/lib.php");
     upgrade_backup_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
@@ -254,8 +244,11 @@
     upgrade_blocks_plugins("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
 /// Check all enrolment plugins and upgrade if necessary
-    upgrade_enrol_plugins("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
+    upgrade_plugins('enrol', 'enrol', "$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
+/// Check for local database customisations
+    require_once("$CFG->dirroot/lib/locallib.php");
+    upgrade_local_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
 
 /// Set up the overall site name etc.
@@ -300,8 +293,8 @@
 
 /// Check if we are returning from moodle.org registration and if so, we mark that fact to remove reminders
 
-    if (!empty($_GET['id'])) {
-        if ($_GET['id'] == $CFG->siteidentifier) {
+    if (!empty($id)) {
+        if ($id == $CFG->siteidentifier) {
             set_config('registered', time());
         }
     }
@@ -313,26 +306,43 @@
     print_simple_box_start('center', '100%', '', 20);
     print_heading($stradministration);
 
+/// Deprecated database! Warning!!
+    if (!empty($CFG->migrated_to_new_db)) {
+        print_simple_box_start('center','60%');
+        print_string('dbmigrationdeprecateddb','admin');
+        print_simple_box_end();
+    }
+
     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");
+                                    "$CFG->wwwroot/$CFG->admin/upgrade$CFG->upgrade.php"), "center", '60%');
         print_spacer(10,10);
     }
 
     if (ini_get_bool('register_globals') && !ini_get_bool('magic_quotes_gpc')) {
-        print_simple_box(get_string('globalsquoteswarning', 'admin'), 'center');
+        print_simple_box(get_string('globalsquoteswarning', 'admin'), 'center', '60%');
     }
 
+    if (is_dataroot_insecure()) {
+        print_simple_box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot), 'center', '60%');
+    }
 
 /// If no recently cron run
     $lastcron = get_field_sql('SELECT max(lastcron) FROM ' . $CFG->prefix . 'modules');
     if (time() - $lastcron > 3600 * 24) {
-        print_simple_box(get_string('cronwarning', 'admin') , 'center');
+        $strinstallation = get_string('installation', 'install');
+        $helpbutton = helpbutton('install', $strinstallation, 'moodle', true, false, '', true);
+        print_simple_box(get_string('cronwarning', 'admin')."&nbsp;".$helpbutton, 'center', '60%');
     }
 
 /// Alert if we are currently in maintenance mode
     if (file_exists($CFG->dataroot.'/1/maintenance.html')) {
-        print_simple_box(get_string('sitemaintenancewarning', 'admin') , 'center');
+        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   ;-)
@@ -341,7 +351,7 @@
     if (!isset($CFG->registered) || $CFG->registered < (time() - 3600*24*30*6)) {
         $options = array();
         $options['sesskey'] = $USER->sesskey;
-        print_simple_box_start('center');
+        print_simple_box_start('center','60%');
         echo '<div align="center">';
         print_string('pleaseregister', 'admin');
         print_single_button('register.php', $options, get_string('registration'));
@@ -349,112 +359,134 @@
         print_simple_box_end();
     }
 
-    $table->tablealign = "right";
+    $table->tablealign = "center";
     $table->align = array ("right", "left");
     $table->wrap = array ("nowrap", "nowrap");
     $table->cellpadding = 5;
     $table->cellspacing = 0;
-    $table->width = "40%";
+    $table->width = '40%';
 
-    $configdata  = "<font size=\"+1\">&nbsp;</font><a href=\"config.php\">".get_string("configvariables", 'admin')."</a> - <font size=\"1\">".
-                    get_string("adminhelpconfigvariables")."</font><br />";
-    $configdata .= "<font size=\"+1\">&nbsp;</font><a href=\"site.php\">".get_string("sitesettings")."</a> - <font size=\"1\">".
-                    get_string("adminhelpsitesettings")."</font><br />";
-    $configdata .= "<font size=\"+1\">&nbsp;</font><a href=\"../theme/index.php\">".get_string("themes")."</a> - <font size=\"1\">".
-                    get_string("adminhelpthemes")."</font><br />";
-    $configdata .= "<font size=\"+1\">&nbsp;</font><a href=\"lang.php\">".get_string("language")."</a> - <font size=\"1\">".
-                    get_string("adminhelplanguage")."</font><br />";
-    $configdata .= "<font size=\"+1\">&nbsp;</font><a href=\"modules.php\">".get_string("managemodules")."</a> - <font size=\"1\">".
-                    get_string("adminhelpmanagemodules")."</font><br />";
-    $configdata .= "<font size=\"+1\">&nbsp;</font><a href=\"blocks.php\">".get_string("manageblocks")."</a> - <font size=\"1\">".
-                    get_string("adminhelpmanageblocks")."</font><br />";
-    $configdata .= "<font size=\"+1\">&nbsp;</font><a href=\"filters.php\">".get_string("managefilters")."</a> - <font size=\"1\">".
-                    get_string("adminhelpmanagefilters")."</font><br />";
+    $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 .= "<font size=\"+1\">&nbsp;</font><a href=\"backup.php\">".get_string("backup")."</a> - <font size=\"1\">".
-                        get_string("adminhelpbackup")."</font><br />";
+        $configdata .= '<div class="adminlink"><a href="backup.php">'.get_string('backup').
+                       '</a> - <span class="explanation">'.get_string('adminhelpbackup').'</span></div>';
     }
-    $configdata .= "<font size=\"+1\">&nbsp;</font><a href=\"editor.php\">". get_string("editorsettings") ."</a> - <font size=\"1\">".
-                    get_string("adminhelpeditorsettings")."</font><br />";
-    $configdata .= "<font size=\"+1\">&nbsp;</font><a href=\"calendar.php\">". get_string('calendarsettings', 'admin') ."</a> - <font size=\"1\">".
-                    get_string('helpcalendarsettings', 'admin')."</font><br />";
-    $configdata .= "<font size=\"+1\">&nbsp;</font><a href=\"maintenance.php\">". get_string('sitemaintenancemode', 'admin') ."</a> - <font size=\"1\">".
-                    get_string('helpsitemaintenance', 'admin')."</font><br />";
+    $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("<font size=\"+1\"><b><a href=\"configure.php\">".get_string("configuration")."</a></b></font>",
-                            $configdata);
+    $table->data[] = array('<strong><a href="configure.php">'.get_string('configuration').'</a></strong>', $configdata);
 
 
-    $userdata = "<font size=\"+1\">&nbsp;</font><a href=\"auth.php?sesskey=$USER->sesskey\">".get_string("authentication")."</a> - <font size=\"1\">".
-                 get_string("adminhelpauthentication")."</font><br />";
-    $userdata .= "<font size=\"+1\">&nbsp;</font><a href=\"user.php\">".get_string("edituser")."</a> - <font size=\"1\">".
-                 get_string("adminhelpedituser")."</font><br />";
-    $userdata .= "<font size=\"+1\">&nbsp;</font><a href=\"$CFG->wwwroot/$CFG->admin/user.php?newuser=true&amp;sesskey=$USER->sesskey\">".
-                 get_string("addnewuser")."</a> - <font size=\"1\">".
-                 get_string("adminhelpaddnewuser")."</font><br />";
-    $userdata .= "<font size=\"+1\">&nbsp;</font><a href=\"$CFG->wwwroot/$CFG->admin/uploaduser.php?sesskey=$USER->sesskey\">".
-                 get_string("uploadusers")."</a> - <font size=\"1\">".
-                 get_string("adminhelpuploadusers")."</font><br />";
+    $userdata =  '<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 /><font size=\"+1\">&nbsp;</font><a href=\"enrol.php?sesskey=$USER->sesskey\">".get_string("enrolments")."</a> - <font size=\"1\">".
-                 get_string("adminhelpenrolments")."</font><br />";
-    $userdata .= "<font size=\"+1\">&nbsp;</font><a href=\"../course/index.php?edit=off&amp;sesskey=$USER->sesskey\">".get_string("assignstudents")."</a> - <font size=\"1\">".
-                 get_string("adminhelpassignstudents")."</font><br />";
+    $table->data[] = array('<strong><a href="users.php">'.get_string('users').'</a></strong>', $userdata);
 
-    $userdata .= "<font size=\"+1\">&nbsp;</font><a href=\"../course/index.php?edit=on&amp;sesskey=$USER->sesskey\">".get_string("assignteachers")."</a> - <font size=\"1\">".
-                 get_string("adminhelpassignteachers").
-                 " <img src=\"../pix/t/user.gif\" height=\"11\" width=\"11\" alt=\"\" /></font><br />";
-    $userdata .= "<font size=\"+1\">&nbsp;</font><a href=\"creators.php?sesskey=$USER->sesskey\">".get_string("assigncreators")."</a> - <font size=\"1\">".
-                 get_string("adminhelpassigncreators")."</font><br />";
-    $userdata .= "<font size=\"+1\">&nbsp;</font><a href=\"admin.php?sesskey=$USER->sesskey\">".get_string("assignadmins")."</a> - <font size=\"1\">".
-                 get_string("adminhelpassignadmins")."</font><br />";
+    $coursedata = '<div class="adminlink"><a href="../course/index.php?edit=on&amp;sesskey='.$USER->sesskey.'">'.get_string('managecourses').
+                 '</a> - <span class="explanation">'.get_string('adminhelpcourses').'</span></div>';
+    $coursedata .= '<div class="adminlink"><a href="enrol.php?sesskey='.$USER->sesskey.'">'.get_string('enrolmentplugins').
+                 '</a> - <span class="explanation">'.get_string('adminhelpenrolments').'</span></div>';
+    $coursedata .= '<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>';
+    $coursedata .= '<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>';
+    $coursedata .= '<div class="adminlink"><a href="creators.php?sesskey='.$USER->sesskey.'">'.get_string('assigncreators').
+                 '</a> - <span class="explanation">'.get_string('adminhelpassigncreators').'</span></div>';
+    $coursedata .= '<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("<font size=\"+1\"><b><a href=\"users.php\">".get_string("users")."</a></b></font>", $userdata);
+    $table->data[] = array('<strong><a href="courses.php">'.get_string('courses').'</a></strong>', $coursedata);
 
-    $table->data[] = array("<font size=\"+1\"><b><a href=\"../course/index.php?edit=on&amp;sesskey=$USER->sesskey\">".get_string("courses")."</a></b></font>",
-                           "<font size=\"+1\">&nbsp;</font>".get_string("adminhelpcourses"));
-    $table->data[] = array("<font size=\"+1\"><b><a href=\"../course/log.php?id=$site->id\">".get_string("logs")."</a></b></font>",
-                           "<font size=\"+1\">&nbsp;</font>".get_string("adminhelplogs"));
-
-    $table->data[] = array("<font size=\"+1\"><b><a href=\"../files/index.php?id=$site->id\">".get_string("sitefiles")."</a></b></font>",
-                           "<font size=\"+1\">&nbsp;</font>".get_string("adminhelpsitefiles"));
-
-    $table->data[] = array('<font size="+1"><b><a href="environment.php">'.get_string('environment','admin').'</a></b></font>',
-                           "<font size=\"+1\">&nbsp;</font>".get_string('adminhelpenvironment'));
+    $miscdata = '<div class="adminlink"><a href="../files/index.php?id='.$site->id.'">'.get_string('sitefiles').
+                 '</a> - <span class="explanation">'.get_string('adminhelpsitefiles').'</span></div>';
+    $miscdata .= '<div class="adminlink"><a href="stickyblocks.php">'.get_string('stickyblocks','admin').
+                 '</a> - <span class="explanation">'.get_string('adminhelpstickyblocks').'</span></div>';
+    $miscdata .= '<div class="adminlink"><a href="report.php">'.get_string('reports').
+                 '</a> - <span class="explanation">'.get_string('adminhelpreports').'</span></div>';
+//to be enabled later
+/*    $miscdata .= '<div class="adminlink"><a href="health.php">'.get_string('healthcenter').
+                 '</a> - <span class="explanation">'.get_string('adminhelphealthcenter').'</span></div>';*/
+    $miscdata .= '<div class="adminlink"><a href="environment.php">'.get_string('environment', 'admin').
+                 '</a> - <span class="explanation">'.get_string('adminhelpenvironment').'</span></div>';
+/// Optional stuff
     if (file_exists("$CFG->dirroot/$CFG->admin/$CFG->dbtype")) {
-        $table->data[] = array("<font size=\"+1\"><b><a href=\"$CFG->dbtype/frame.php\">".get_string("managedatabase")."</a></b></font>",
-                               "<font size=\"+1\">&nbsp;</font>".get_string("adminhelpmanagedatabase"));
+        $miscdata .= '<div class="adminlink"><a href="'.$CFG->dbtype.'/frame.php">'.get_string('managedatabase').
+        			 '</a> - <span class="explanation">'.get_string('adminhelpmanagedatabase').'</span></div>';
     }
 
+    $table->data[] = array('<strong><a href="misc.php">'.get_string('miscellaneous').'</a></strong>', $miscdata);
+
+
+/// 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_table($table);
 
     //////////////////////////////////////////////////////////////////////////////////////////////////
     ////  IT IS ILLEGAL AND A VIOLATION OF THE GPL TO REMOVE OR MODIFY THE COPYRIGHT NOTICE BELOW ////
-    $copyrighttext = "<a href=\"http://moodle.org/\">Moodle</a> ".
-                     "<a href=\"../doc/?frame=release.html\">$CFG->release</a> ($CFG->version)<br />".
-                     "Copyright &copy; 1999 onwards by Martin Dougiamas<br />".
-                     "<a href=\"../doc/?frame=licence.html\">GNU Public License</a>";
-    echo "<center><p><font size=\"1\">$copyrighttext</font></p></center>";
+    $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 '<table width="100%" cellspacing="0"><tr>';
-    echo '<td align="center" width="33%">';
-    print_single_button($CFG->wwwroot.'/doc/', NULL, get_string('documentation'));
-    echo '</td>';
-
-    echo '<td align="center" width="33%">';
-    print_single_button('phpinfo.php', NULL, get_string('phpinfo'));
-    echo '</td>';
-
-    echo '<td align="center" width="33%">';
+    echo '<div align="center">';
     $options = array();
     $options['sesskey'] = $USER->sesskey;
     print_single_button('register.php', $options, get_string('registration'));
-    echo '</td></tr></table>';
+    echo '</div>';
+
 
     print_simple_box_end();
 
+    
+    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,6 +1,8 @@
 <?php
 
-   include('../config.php');
+   require_once('../config.php');
+
+   $confirm = optional_param('confirm', 0, PARAM_BOOL);
 
    require_login();
 
@@ -12,7 +14,7 @@
                 "Convert all tables from MYISAM to InnoDB");
 
 
-   if (!empty($confirm) and confirm_sesskey()) {
+   if ($confirm and confirm_sesskey()) {
 
        print_heading("Please be patient and wait for this to complete...");
 
@@ -24,7 +26,7 @@
        }
    } else {
        notice_yesno("Are you sure you want convert all your tables to the InnoDB format?", 
-                    "innodb.php?confirm=yes&sesskey=".sesskey(), "index.php");
+                    "innodb.php?confirm=1&sesskey=".sesskey(), "index.php");
    }
 
 ?>

admin/lang.php

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

admin/langdoc.php

@@ -9,6 +9,7 @@ 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');
 
     //
     // Some local configuration
@@ -21,8 +22,6 @@ Thanks:     Jaime Villate for important bug fixing, koen roggemans for his job a
                                     // or to filenames with filesize() == 0
     $filetemplate = '';             // template for new files, i.e. '$Id$';
 
-    require_once("../config.php");
-
     $currentfile = optional_param('currentfile', 'docs/README.txt', PARAM_PATH); 
 
     require_login();
@@ -49,9 +48,13 @@ Thanks:     Jaime Villate for important bug fixing, koen roggemans for his job a
                  'choosefile.popup', '', true);
 
     $currentlang = current_language();
-    $langdir = "$CFG->dirroot/lang/$currentlang";
-    $enlangdir = "$CFG->dirroot/lang/en";
+    $langdir = "$CFG->dataroot/lang/$currentlang";
+    $enlangdir = "$CFG->dirroot/lang/en_utf8";
 
+
+    if (!file_exists($langdir)) {
+        error ('to edit this language pack, you need to put it in '.$CFG->dataroot.'/lang');
+    }
     // Shall I save POSTed data?
 
     if (isset($_POST['currentfile'])) {
@@ -70,7 +73,7 @@ Thanks:     Jaime Villate for important bug fixing, koen roggemans for his job a
 
     // Get all files from /docs directory
 
-    if (! $files = get_directory_list("$CFG->dirroot/lang/en/docs", "CVS")) {
+    if (! $files = get_directory_list("$CFG->dirroot/lang/en_utf8/docs", "CVS")) {
         error("Could not find English language docs files!");
     }
 
@@ -82,7 +85,7 @@ Thanks:     Jaime Villate for important bug fixing, koen roggemans for his job a
         if (( !file_exists("$langdir/docs/$file")) || (filesize("$langdir/docs/$file") == 0)) {
             $options["docs/$file"] .= "$filemissingmark";
         } else {       
-            if (filemtime("$langdir/docs/$file") < filemtime("$CFG->dirroot/lang/en/docs/$file")) {
+            if (filemtime("$langdir/docs/$file") < filemtime("$CFG->dirroot/lang/en_utf8/docs/$file")) {
                 $options["docs/$file"] .= "$fileoldmark";
             }
         }    
@@ -90,13 +93,13 @@ Thanks:     Jaime Villate for important bug fixing, koen roggemans for his job a
 
     // Get all files from /help directory
 
-    if (! $files = get_directory_list("$CFG->dirroot/lang/en/help", "CVS")) {
+    if (! $files = get_directory_list("$CFG->dirroot/lang/en_utf8/help", "CVS")) {
         error("Could not find English language help files!");
     }
 
     foreach ($files as $filekey => $file) {    // check all the help files.
         $options["help/$file"] = "help/$file";
-        if (( !file_exists("$langdir/help/$file")) || (filesize("$CFG->dirroot/lang/en/help/$file") == 0)) {
+        if (( !file_exists("$langdir/help/$file")) || (filesize("$CFG->dirroot/lang/en_utf8/help/$file") == 0)) {
             $options["help/$file"] .= "$filemissingmark";
         } else {
             if (filemtime("$langdir/help/$file") < filemtime("$langdir/help/$file")) {
@@ -158,11 +161,17 @@ $langdir/$currentfile")."</font></p>";
 ."</font></p>";
         }
 
+        //en_utf8 in dataroot is not editable
+        if ($currentlang == 'en_utf8') {
+            $editable = false;
+        }
+
         echo "<table align=\"center\"><tr valign=\"center\"><td align=\"center\">\n";
         echo "<textarea rows=\"$fileeditorrows\" cols=\"$fileeditorcols\" name=\"\">\n";
         echo htmlspecialchars(file_get_contents("$enlangdir/$currentfile"));
         echo "</textarea>\n";
-        link_to_popup_window("/lang/en/$currentfile", "popup", get_string("preview"));
+        //link_to_popup_window("/lang/en_utf8/$currentfile", "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";
@@ -176,15 +185,13 @@ $langdir/$currentfile")."</font></p>";
         }
 
         echo "<textarea rows=\"$fileeditorrows\" cols=\"$fileeditorcols\" name=\"filedata\">\n";
-
         if (file_exists("$langdir/$currentfile")) {
-	    echo htmlspecialchars(file_get_contents("$langdir/$currentfile"));
+            echo htmlspecialchars(file_get_contents("$langdir/$currentfile"));
         } else {
             echo ($filetemplate);
         }
-
         echo "</textarea>\n";
-        link_to_popup_window("/lang/$currentlang/$currentfile", "popup", get_string("preview"));
+        link_to_popup_window(help_preview_url($currentfile), 'popup', get_string('preview'));
         echo "</td>\n</tr>\n</table>";
 
         if ($editable) {
@@ -233,4 +240,18 @@ function langdoc_save_file($path, $file, $content) {
     return true;
 }
 
-?>
+
+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='.$currentpathexp[0].'&amp;file='.$currentpathexp[1];
+    } else {
+        $url = '/help.php?module=moodle&amp;file='.$currentfile;
+    }
+    return $url;
+}
+
+?>

admin/langimport.php

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

admin/maintenance.php

@@ -4,7 +4,6 @@
     require('../config.php');
 
     $action = optional_param('action', '', PARAM_ALPHA);
-    $sesskey = optional_param('sesskey');
 
     require_login();
 

admin/misc.php

@@ -0,0 +1,47 @@
+<?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");
+    $strmisc           = get_string("miscellaneous");
+
+    print_header("$site->shortname: $stradministration: $strmisc", "$site->fullname", 
+                 "<a href=\"index.php\">$stradministration</a> -> $strmisc");
+
+    print_heading($strmisc);
+
+    $table->align = array ("right", "left");
+
+    $table->data[] = array('<b><a href="../files/index.php?id='.$site->id.'">'.get_string('sitefiles').'</a></b>',
+                           get_string("adminhelpsitefiles"));
+    $table->data[] = array('<b><a href="stickyblocks.php">'.get_string('stickyblocks','admin')."</a></b>",
+                           get_string('adminhelpstickyblocks'));
+    $table->data[] = array('<b><a href="report.php">'.get_string('reports')."</a></b>",
+                           get_string('adminhelpreports'));
+// to be enabled later
+/*    $table->data[] = array('<b><a href="health.php">'.get_string('healthcenter')."</a></b>",
+                           get_string('adminhelphealthcenter'));*/
+    $table->data[] = array('<b><a href="environment.php">'.get_string('environment', 'admin')."</a></b>",
+                           get_string('adminhelpenvironment'));
+    if (file_exists("$CFG->dirroot/$CFG->admin/$CFG->dbtype")) {
+        $table->data[] = array('<b><a href="'.$CFG->dbtype.'/frame.php">'.get_string('managedatabase')."</a></b>",
+                           get_string('adminhelpmanagedatabase'));
+    }
+
+    print_table($table);
+
+    print_footer($site);
+
+?>
+
+

admin/module.php

@@ -1,7 +1,7 @@
 <?PHP  // $Id$
        // module.php - allows admin to edit all local configuration variables for a module
 
-    require_once("../config.php");
+    require_once('../config.php');
 
     require_login();
 
@@ -16,19 +16,20 @@
 /// If data submitted, then process and store.
 
     if ($config = data_submitted()) {
+        $module = optional_param('module', '', PARAM_SAFEDIR);
 
         if (!confirm_sesskey()) {
             error(get_string('confirmsesskeybad', 'error'));
         }
-        
-        if ($module = optional_param('module', '', PARAM_CLEANFILE)) {
+
+        if ($module != '') {
+            require_once("$CFG->dirroot/mod/$module/lib.php");
             // if the config.html contains a hidden form field giving
             // the module name then the form does not have to prefix all
             // its variable names, we will do it here.
             $moduleprefix = $module.'_';
             // let the module process the form data if it has to,
             // $config is passed to this function by reference
-            require_once("$CFG->dirroot/mod/$module/lib.php");
             $moduleconfig = $module.'_process_options';
             if (function_exists($moduleconfig)) {
                 $moduleconfig($config);
@@ -37,6 +38,9 @@
             $moduleprefix = '';
         }
 
+        unset($config->sesskey);
+        unset($config->module);
+
         foreach ($config as $name => $value) {
             set_config($moduleprefix.$name, $value);
         }
@@ -45,15 +49,18 @@
     }
 
 /// Otherwise print the form.
-
-    $module = required_param('module', '', PARAM_CLEANFILE);
+    $module = required_param('module', PARAM_SAFEDIR);
     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';
+    
     print_header("$site->shortname: $strmodulename: $strconfiguration", $site->fullname,
                   "<a href=\"index.php\">$stradmin</a> -> ".
                   "<a href=\"configure.php\">$strconfiguration</a> -> ".
@@ -61,7 +68,7 @@
 
     print_heading($strmodulename);
 
-    print_simple_box("<center>".get_string("configwarning", 'admin')."</center>", "center", "50%");
+    print_simple_box("<center>".get_string("configwarning", 'admin')."</center>", "center", "60%");
     echo "<br />";
 
     print_simple_box_start("center", "");

admin/modules.php

@@ -1,13 +1,13 @@
 <?PHP // $Id$
-      // Allows the admin to create, delete and rename course categories
+      // Allows the admin to manage activity modules
 
-    require_once("../config.php");
-    require_once("../course/lib.php");
+    require_once('../config.php');
+    require_once('../course/lib.php');
 
-    optional_variable($disable);
-    optional_variable($enable);
-    optional_variable($delete);
-    optional_variable($confirm);
+    $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();
 
@@ -39,6 +39,8 @@
 
     print_heading($strmanagemodules);
    
+    $coursesaffected = false;
+    
 
 /// If data submitted, then process and store.
 
@@ -46,25 +48,29 @@
         if (!$module = get_record("modules", "name", $hide)) {
             error("Module doesn't exist!");
         }
-        set_field("modules", "visible", "0", "id", $module->id);            // Hide main module
-        set_field("course_modules", "visible", "0", "module", $module->id); // Hide all related activity modules
+        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", "module", $module->id); // Show all related activity modules
+        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()) {
       
         $strmodulename = get_string("modulename", "$delete");
 
-        if (empty($confirm)) {
+        if (!$confirm) {
             notice_yesno(get_string("moduledeleteconfirm", "", $strmodulename), 
-                         "modules.php?delete=$delete&amp;confirm=$delete&amp;sesskey=$USER->sesskey", 
+                         "modules.php?delete=$delete&amp;confirm=1&amp;sesskey=$USER->sesskey", 
                          "modules.php");
             print_footer();
             exit;
@@ -121,14 +127,19 @@
                 }
             }  
 
-            rebuild_course_cache();  // Because things have changed
-
+            //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");
         }
     }
+    
+    if ($coursesaffected) {
+        rebuild_course_cache();  // Because things have changed
+    }
+    
 
 /// Get and sort the existing modules
 
@@ -138,6 +149,10 @@
 
     foreach ($modules as $module) {
         $strmodulename = get_string("modulename", "$module->name");
+        // Deal with modules which are lacking the language string
+        if ($strmodulename == '[[modulename]]') {
+            $strmodulename = $module->name;
+        }
         $modulebyname[$strmodulename] = $module;
     }
     ksort($modulebyname);

admin/oacleanup.php

@@ -1,4 +1,4 @@
-<?php
+<?php // $Id$
 
 if (!isset($CFG)) {
 

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

@@ -1,7 +1,7 @@
 <?php  // $Id$
        // register.php - allows admin to register their site on moodle.org
 
-    include("../config.php");
+    require_once('../config.php');
 
     require_login();
 
@@ -139,7 +139,7 @@
     echo "<input type=\"hidden\" name=\"posts\" value=\"$count\">\n";
     echo '<br />';
 
-    $count = count_records('quiz_questions');
+    $count = count_records('question');
     echo get_string("questions", 'quiz').": ".$count;
     echo "<input type=\"hidden\" name=\"questions\" value=\"$count\">\n";
     echo '<br />';

admin/replace.php

@@ -1,10 +1,10 @@
 <?php /// $Id$
       /// Search and replace strings throughout all texts in the whole database
 
-require('../config.php');
+require_once('../config.php');
 
-$search  = optional_param('search', '');
-$replace = optional_param('replace', '');
+$search  = optional_param('search', '', PARAM_RAW);
+$replace = optional_param('replace', '', PARAM_RAW);
 
 require_login();
 
@@ -45,7 +45,7 @@ foreach ($tables as $table) {
         foreach ($columns as $column => $data) {
             if (in_array($data->type, array('text','mediumtext','longtext','varchar'))) {  // Text stuff only
                 $db->debug = true;
-                execute_sql("UPDATE {$CFG->prefix}$table SET $column = REPLACE($column, '$search', '$replace');");
+                execute_sql("UPDATE $table SET $column = REPLACE($column, '$search', '$replace');");
                 $db->debug = false;
             }
         }

admin/report.php

@@ -0,0 +1,28 @@
+<?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');
+    $strmisc = get_string('miscellaneous');
+
+    print_header($strreports, $strreports,
+                 '<a href="index.php">'.$stradmin.'</a> -> <a href="misc.php">'.$strmisc.'</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/courseoverview/index.php

@@ -0,0 +1,111 @@
+<?php
+
+    require_once('../../../config.php');
+    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);
+
+    if (empty($CFG->enablestats)) {
+        error("Stats is not enabled.");
+    }
+
+    require_login();
+
+    if (!isadmin()) {
+        error("This page is for admins only");
+    }
+
+    $course = get_site();
+    stats_check_uptodate($course->id);
+
+    $strreports = get_string('reports');
+    $strcourseoverview = get_string('courseoverview');
+
+    $strnav = '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/index.php">'.get_string('administration').'</a> -> <a href="'.$CFG->wwwroot.'/'.$CFG->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 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);
+
+    if (empty($timeoptions)) {
+        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";
+
+    $table->width = '*';
+
+    $table->align = array('left','left','left','left','left','left');
+    $table->data[] = array(get_string('statsreporttype'),choose_from_menu($reportoptions,'report',$report,'','','',true),
+                           get_string('statstimeperiod'),choose_from_menu($timeoptions,'time',$time,'','','',true),
+                           '<input type="text" name="numcourses" size="3" maxlength="2" value="'.$numcourses.'" />',
+                           '<input type="submit" value="'.get_string('view').'" />') ;
+
+    print_table($table);
+    echo '</form>';
+
+    if (!empty($report) && !empty($time)) {
+        $param = stats_get_parameters($time,$report,SITEID,STATS_MODE_RANKED);
+        
+        $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)) {
+            error(get_string('statsnodata'),$CFG->wwwroot.'/'.$CFG->admin.'/report/courseoverview/index.php');
+        }
+
+        echo '<center><img src="'.$CFG->wwwroot.'/'.$CFG->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);
+    }
+    
+    print_footer();
+
+?>

admin/report/courseoverview/mod.php

@@ -0,0 +1,57 @@
+<?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();
+        $statsstatus = 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>';
+        if ($statsstatus !== NULL) {
+            notify ($statsstatus);
+        }
+
+    }
+?>
+

admin/report/courseoverview/reportsgraph.php

@@ -0,0 +1,54 @@
+<?php // $Id$
+
+    require_once('../../../config.php');
+    require_once($CFG->dirroot.'/lib/statslib.php');
+    require_once($CFG->dirroot.'/lib/graphlib.php');
+
+    $report     = required_param('report', PARAM_INT);
+    $time       = required_param('time', PARAM_INT);
+    $numcourses = required_param('numcourses', PARAM_INT);
+
+    require_login();
+
+    if (!isadmin()) {
+        error("You must be an admin to use this page");
+    }
+
+    stats_check_uptodate($course->id);
+
+    $param = stats_get_parameters($time,$report,SITEID,STATS_MODE_RANKED);
+
+    $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)) {
+        error(get_string('statsnodata'),$CFG->wwwroot.'/'.$CFG->admin.'/report/course/index.php');
+    }
+    
+
+    $graph = new graph(750,400);
+
+    $graph->parameter['legend'] = 'outside-right';
+    $graph->parameter['legend_size'] = 10;
+    $graph->parameter['x_axis_angle'] = 90;
+    $graph->parameter['title'] = false; // moodle will do a nicer job.
+    if ($report != STATS_REPORT_ACTIVE_COURSES) {
+        $graph->parameter['y_decimal_left'] = 2;
+    }
+
+    foreach ($courses as $c) {
+        $graph->x_data[] = get_field('course','shortname','id',$c->courseid);
+        $graph->y_data['bar1'][] = $c->{$param->graphline};
+    }
+    $graph->y_order = array('bar1');
+    $graph->y_format['bar1'] = array('colour' => 'blue','bar' => 'fill','legend' => $param->{$param->graphline});
+
+    $graph->draw_stack();
+    
+?>

admin/report/log/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/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,16 @@
+<?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.'/'.$CFG->admin.'/report/stats/index.php?course='.$course->id.'">'.get_string('stats').'</a>';
+        echo '</p>';
+        $statsstatus = stats_check_uptodate($course->id);
+        if ($statsstatus !== NULL) {
+            notify ($statsstatus);
+        }
+    }
+?>

admin/site.html

@@ -29,19 +29,55 @@
 </tr>
 <tr valign="top">
         <td align="right"><?php print_string("frontpageformat") ?>:</td>
-        <td><?php
+        <td>
+          <table width="100%" cellpadding="0" cellspacing="0" border="0">
+            <tr>
+        <?php
+           $coursecount = (count_records('course') <= FRONTPAGECOURSELIMIT);
            $options = array(FRONTPAGENEWS           =>  get_string("frontpagenews"),
                             FRONTPAGECOURSELIST     =>  get_string("frontpagecourselist"),
                             FRONTPAGECATEGORYNAMES  =>  get_string("frontpagecategorynames"),
-                            FRONTPAGETOPICONLY      =>  get_string("frontpagetopiconly"));
-           if (count_records("course") > 200) {
-               unset($options[1]);
-               if ($form->frontpage == 1) {
-                   $form->frontpage = 2;
-               }
+                            FRONTPAGECATEGORYCOMBO  =>  get_string("frontpagecategorycombo"),
+                            );
+           $values = array(get_string('hide'), get_string('order1', 'admin'), get_string('order2', 'admin'), get_string('order3', 'admin'), get_string('order4', 'admin'));
+           $seq = array_flip(explode(',',$form->frontpage));
+           foreach ($seq as $k => $s) {
+               $seq[$k]++;
+           }
+           if (!$coursecount and isset($seq[FRONTPAGECOURSELIST])) {
+               unset($seq[FRONTPAGECOURSELIST]); //disable course list option when too many course present
+           }
+
+           foreach ($options as $key => $option) {
+               $disabled = (!$coursecount and ($key == FRONTPAGECOURSELIST));
+               echo "<td>$option<br />";
+               choose_from_menu ($values, "frontpage[$key]", isset($seq[$key])?$seq[$key]:0, '', '', 0, false, $disabled);
+               echo '</td>';
            }
-           choose_from_menu ($options, "frontpage", "$form->frontpage", "");
         ?>
+            </tr>
+          </table>
+        </td>
+</tr>
+<tr valign="top">
+        <td align="right"><?php print_string("frontpageformatloggedin") ?>:</td>
+        <td>
+          <table width="100%" cellpadding="0" cellspacing="0" border="0">
+            <tr>
+        <?php
+           $seq = array_flip(explode(',',$form->frontpageloggedin));
+           foreach ($seq as $k => $s) {
+               $seq[$k]++;
+           }
+
+           foreach ($options as $key => $option) {
+               echo "<td>$option<br />";
+               choose_from_menu ($values, "frontpageloggedin[$key]", isset($seq[$key])?$seq[$key]:0, '');
+               echo '</td>';
+           }
+        ?>
+            </tr>
+          </table>
         </td>
 </tr>
 <tr valign="top">

admin/site.php

@@ -1,7 +1,7 @@
 <?php // $Id$
 
-    require_once("../config.php");
-    require_once("../course/lib.php");
+    require_once('../config.php');
+    require_once('../course/lib.php');
 
     if ($site = get_site()) {
         require_login();
@@ -11,6 +11,8 @@
         $site->format = "social";   // override
     }
 
+    $focus = "form.fullname";
+
 /// If data submitted, then process and store.
 
     if ($form = data_submitted()) {
@@ -25,11 +27,23 @@
 
         if (count($err) == 0) {
 
+            $form->frontpage = array_flip($form->frontpage);
+            unset($form->frontpage[0]);
+            $form->frontpage = array_flip($form->frontpage);
+            asort($form->frontpage);
+            $form->frontpage = implode(',',array_flip($form->frontpage));
             set_config("frontpage", $form->frontpage);
-            if ($form->frontpage == FRONTPAGETOPICONLY) {
+            if ($form->frontpage == '') {
                 $form->numsections = 1;    // Force the topic display for this format
             }
 
+            $form->frontpageloggedin = array_flip($form->frontpageloggedin);
+            unset($form->frontpageloggedin[0]);
+            $form->frontpageloggedin = array_flip($form->frontpageloggedin);
+            asort($form->frontpageloggedin);
+            $form->frontpageloggedin = implode(',',array_flip($form->frontpageloggedin));
+            set_config("frontpageloggedin", $form->frontpageloggedin);
+
             $form->timemodified = time();
 
             if ($form->id) {
@@ -91,14 +105,16 @@
 
     if (isset($CFG->frontpage)) {
         $form->frontpage = $CFG->frontpage;
-
     } else {
         $form->frontpage = FRONTPAGECOURSELIST;  // Show course list by default
         set_config("frontpage", $form->frontpage);
     }
 
-    if (empty($focus)) {
-        $focus = "form.fullname";
+    if (isset($CFG->frontpageloggedin)) {
+        $form->frontpageloggedin = $CFG->frontpageloggedin;
+    } else {
+        $form->frontpageloggedin = $form->frontpage;
+        set_config("frontpageloggedin", $form->frontpageloggedin);
     }
 
     $stradmin = get_string("administration");

admin/stickyblocks.php

@@ -0,0 +1,87 @@
+<?PHP // $Id$
+    
+    require_once('../config.php');
+    require_once($CFG->dirroot.'/my/pagelib.php');
+    require_once($CFG->dirroot.'/lib/pagelib.php');
+    require_once($CFG->dirroot.'/lib/blocklib.php');
+
+    $pt  = optional_param('pt', null, PARAM_SAFEDIR); //alhanumeric and -
+
+    $pagetypes = array(PAGE_MY_MOODLE => array('id' => PAGE_MY_MOODLE,
+                                              'lib' => '/my/pagelib.php',
+                                              'name' => get_string('stickyblocksmymoodle','admin')),
+                       PAGE_COURSE_VIEW => array('id' => PAGE_COURSE_VIEW, 
+                                                'lib' => '/lib/pagelib.php',
+                                                'name' => get_string('stickyblockscourseview','admin'))
+                       // ... more?
+                       );
+
+    // for choose_from_menu
+    $options = array();
+    foreach ($pagetypes as $p) {
+        $options[$p['id']] = $p['name'];
+    }
+
+    require_login();
+  
+    if (!isadmin()) {
+        error("Only the admin can use this page");
+    }
+
+    // first thing to do is print the dropdown menu
+
+    $strtitle = get_string('stickyblocks','admin');
+    $strheading = get_string('adminhelpstickyblocks');
+    
+    print_header($strtitle,$strtitle,'<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/index.php">'.
+                 get_string('admin').'</a> -> <a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/misc.php">'.
+                 get_string('miscellaneous').'</a> ->'.$strtitle);
+
+    echo '<table border="0" cellpadding="3" cellspacing="0" width="100%" id="layout-table">';
+    echo '<tr valign="top">';
+    
+
+    if (!empty($pt)) {
+        require_once($CFG->dirroot.$pagetypes[$pt]['lib']);
+        
+        define('ADMIN_STICKYBLOCKS',$pt);
+        
+        $PAGE = page_create_object($pt);
+        
+        $blocks = blocks_setup($PAGE,BLOCKS_PINNED_TRUE);
+        
+        $blocks_preferred_width = bounded_number(180, blocks_preferred_width($blocks[BLOCK_POS_LEFT]), 210);
+        echo '<td style="vertical-align: top; width: '.$blocks_preferred_width.'px;" id="left-column">';
+        
+        blocks_print_group($PAGE, $blocks, BLOCK_POS_LEFT);
+    } else {
+        echo '<td style="vertical-align: top;" id="left-column">';
+    }
+    echo '</td>';
+
+
+    echo '<td valign="top" width="*" id="middle-column">';
+    print_simple_box_start('center');
+    print_heading($strheading);
+    echo '<form method="post" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/stickyblocks.php">'
+        .'<p align="center">'.get_string('stickyblockspagetype','admin').': ';
+    choose_from_menu($options,'pt',$pt,'choose','this.form.submit();');
+    echo '</p></form>';
+    echo get_string('stickyblocksduplicatenotice','admin');
+    print_simple_box_end();
+    echo '</td>';
+
+
+    if (!empty($pt)) {
+        echo '<td style="vertical-align: top; width: '.$blocks_preferred_width.'px;" id="left-column">';
+        blocks_print_group($PAGE, $blocks, BLOCK_POS_RIGHT);
+    }
+    echo '<td style="vertical-align: top;" id="left-column">';
+    echo '</td>';
+  
+    echo '</tr></table>';
+
+    print_footer();
+    
+
+?>

admin/timezone.php

@@ -1,6 +1,8 @@
 <?php   // $Id$
 
-    include("../config.php");
+    require_once('../config.php');
+
+    $zone = optional_param('zone', '', PARAM_PATH); //not a path, but it looks like it anyway
 
     require_login();
 
@@ -17,7 +19,7 @@
 
     print_heading("");
 
-    if (isset($zone) and confirm_sesskey()) {
+    if (!empty($zone) and confirm_sesskey()) {
         $db->debug = true;
         echo "<center>";
         execute_sql("UPDATE {$CFG->prefix}user SET timezone = '$zone'");
@@ -27,29 +29,12 @@
         $USER->timezone = $zone;
     }
 
-    $user = $USER;
-
-    if (abs($user->timezone) > 13) {
-        $user->timezone = 99;
-    }
-    $timenow = time();
-    $timeformat = get_string('strftimedaytime');
-
-    for ($tz = -26; $tz <= 26; $tz++) {
-        $zone = (float)$tz/2.0;
-        $usertime = $timenow + ($tz * 1800);
-        if ($tz == 0) {
-            $timezones["$zone"] = gmstrftime($timeformat, $usertime)." (GMT)";
-        } else if ($tz < 0) {
-            $timezones["$zone"] = gmstrftime($timeformat, $usertime)." (GMT$zone)";
-        } else {
-            $timezones["$zone"] = gmstrftime($timeformat, $usertime)." (GMT+$zone)";
-        }
-    }
+    require_once($CFG->dirroot.'/calendar/lib.php');
+    $timezones = get_list_of_timezones();
 
     echo '<center><form action="timezone.php" method="get">';
     echo "$strusers ($strall): ";
-    choose_from_menu ($timezones, "zone", $user->timezone, get_string("serverlocaltime"), "", "99");
+    choose_from_menu ($timezones, "zone", 99, get_string("serverlocaltime"), "", "99");
     echo "<input type=\"hidden\" name=\"sesskey\" value=\"$USER->sesskey\">";
     echo "<input type=\"submit\" value=\"$strsavechanges\">";
     echo "</form></center>";

admin/timezoneimport.php

@@ -6,7 +6,7 @@
     require_once($CFG->libdir.'/filelib.php');
     require_once($CFG->libdir.'/olson.php');
 
-    $ok = optional_param('ok');
+    $ok = optional_param('ok', 0, PARAM_BOOL);
 
     require_login();
 

admin/unchecked_vars.php

@@ -1,35 +0,0 @@
-<?php
-
-    include("../config.php");
-
-    $action = optional_param('action','LIST',PARAM_ALPHA);
-    $url    = optional_param('url');
-    $info   = optional_param('info');
-
-    if (!isadmin()) {
-        error("Only the admin can use this page");
-    }
-
-    print_header('Admin : Unchecked Vars' );
-
-    if ($action == 'DELETE') {
-        delete_records('log', 'url', $url, 'info', $info);
-    }
-
-    if ($errors = get_records_sql("SELECT DISTINCT url, info 
-                                   FROM {$CFG->prefix}log
-                                   WHERE module = 'dev' AND
-                                         action = 'unchecked vars'")) {
-        echo '<table border="1" cellpadding="5">';
-        foreach ($errors as $error) {
-            echo '<tr>';
-            echo '<td>'.$error->url.'</td>';
-            echo '<td>'.$error->info.'</td>';
-            echo '<td><a href="unchecked_vars.php?action=DELETE&amp;url='.$error->url.'&amp;info='.$error->info.'">Delete this</a></td>';
-            echo '</tr>';
-        }
-        echo '</table>';
-    } else {
-        echo "No unchecked vars were detected";
-    }
-?>

admin/upgradeforumread.php

@@ -1,9 +1,10 @@
 <?PHP  //$Id$
 
-    require("../config.php");
-    require("$CFG->dirroot/mod/forum/lib.php");
+    require_once('../config.php');
+    require_once($CFG->dirroot.'/mod/forum/lib.php');
+    require_once($CFG->libdir.'/adminlib.php');
 
-    optional_variable($confirm);
+    $confirm = optional_param('confirm', 0, PARAM_BOOL);
 
     require_login();
 
@@ -28,7 +29,7 @@
     print_header("$site->shortname: $stradministration: $strupgradingdata", "$site->fullname", 
                  "<a href=\"index.php\">$stradministration</a> -> $strupgradingdata");
 
-    if (empty($_GET['confirm'])) {
+    if (empty($confirm)) {
         notice_yesno(get_string("upgradeforumreadinfo", "admin"), 
                      "upgradeforumread.php?confirm=true&sesskey=$USER->sesskey", 
                      "index.php");
@@ -115,46 +116,4 @@
     exit;
 
 
-
-function print_progress($done, $total, $updatetime=5, $sleeptime=1) {
-    static $count;
-    static $starttime;
-    static $lasttime;
-
-    if (empty($starttime)) {
-        $starttime = $lasttime = time();
-        $lasttime = $starttime - $updatetime;
-        echo '<table width="500" cellpadding="0" cellspacing="0" align="center"><tr><td width="500">';
-        echo '<div id="bar" style="border-style:solid;border-width:1px;width:500px;height:50px;">';
-        echo '<div id="slider" style="border-style:solid;border-width:1px;height:48px;width:10px;background-color:green;"></div>';
-        echo '</div>';
-        echo '<div id="text" align="center" style="width:500px;"></div>';
-        echo '</td></tr></table>';
-        echo '</div>';
-    }
-
-    if (!isset($count)) {
-        $count = 0;
-    }
-
-    $count++;
-
-    $now = time();
-
-    if ($done && (($now - $lasttime) >= $updatetime)) {
-        $elapsedtime = $now - $starttime;
-        $projectedtime = (int)(((float)$total / (float)$done) * $elapsedtime) - $elapsedtime;
-        $percentage = format_float((float)$done / (float)$total, 2);
-        $width = (int)(500 * $percentage);
-
-        echo '<script>';
-        echo 'document.getElementById("text").innerHTML = "'.$count.' done.  Ending: '.format_time($projectedtime).'";'."\n";
-        echo 'document.getElementById("slider").style.width = \''.$width.'px\';'."\n";
-        echo '</script>';
-
-        $lasttime = $now;
-        sleep($sleeptime);
-    }
-}
-
 ?>

admin/upgradelogs.php

@@ -1,8 +1,8 @@
 <?PHP  //$Id$
 
-    require("../config.php");
+    require_once('../config.php');
 
-    optional_variable($confirm);
+    $confirm = optional_param('confirm', 0, PARAM_BOOL);
 
     require_login();
 
@@ -31,7 +31,7 @@
     print_header("$site->shortname: $stradministration: $strupgradinglogs", "$site->fullname", 
                  "<a href=\"index.php\">$stradministration</a> -> $strupgradinglogs");
 
-    if (empty($_GET['confirm'])) {
+    if (empty($confirm)) {
         notice_yesno(get_string("upgradelogsinfo", "admin"), 
                      "upgradelogs.php?confirm=true&sesskey=$USER->sesskey", 
                      "index.php");

admin/uploaduser.php

@@ -3,285 +3,402 @@
 /// Bulk user registration script from a comma separated file
 /// Returns list of users with their user ids
 
-    require_once("../config.php");
+require_once('../config.php');
+require_once($CFG->libdir.'/uploadlib.php');
 
-    $numusers = optional_param('numusers', 0, PARAM_INT);
+$createpassword = optional_param('createpassword', 0, PARAM_BOOL);
+$updateaccounts = optional_param('updateaccounts', 0, PARAM_BOOL);
+$allowrenames   = optional_param('allowrenames', 0, PARAM_BOOL);
 
-    require_login();
+require_login();
 
-    if (!isadmin()) {
-        error("You must be an administrator to edit users this way.");
-    }
-
-    if (! $site = get_site()) {
-        error("Could not find site-level course");
-    }
-
-    if (!confirm_sesskey()) {
-        error(get_string('confirmsesskeybad', 'error'));
-    }
-
-    if (!$adminuser = get_admin()) {
-        error("Could not find site admin");
-    }
-
-    $streditmyprofile = get_string("editmyprofile");
-    $stradministration = get_string("administration");
-    $strchoose = get_string("choose");
-    $struser = get_string("user");
-    $strusers = get_string("users");
-    $strusersnew = get_string("usersnew");
-    $struploadusers = get_string("uploadusers");
-    $straddnewuser = get_string("importuser");
-
-    $csv_encode = '/\&\#44/';
-    if (isset($CFG->CSV_DELIMITER)) {        
-        $csv_delimiter = '\\' . $CFG->CSV_DELIMITER;
-        $csv_delimiter2 = $CFG->CSV_DELIMITER;
-
-        if (isset($CFG->CSV_ENCODE)) {
-            $csv_encode = '/\&\#' . $CFG->CSV_ENCODE . '/';
-        }
-    } else {
-        $csv_delimiter = "\,";
-        $csv_delimiter2 = ",";
+if (!isadmin()) {
+    error("You must be an administrator to edit users this way.");
+}
+
+if (! $site = get_site()) {
+    error("Could not find site-level course");
+}
+
+if (!$adminuser = get_admin()) {
+    error("Could not find site admin");
+}
+
+$streditmyprofile = get_string("editmyprofile");
+$stradministration = get_string("administration");
+$strfile = get_string("file");
+$struser = get_string("user");
+$strusers = get_string("users");
+$strusersnew = get_string("usersnew");
+$strusersupdated = get_string("usersupdated");
+$struploadusers = get_string("uploadusers");
+$straddnewuser = get_string("importuser");
+
+$csv_encode = '/\&\#44/';
+if (isset($CFG->CSV_DELIMITER)) {
+    $csv_delimiter = '\\' . $CFG->CSV_DELIMITER;
+    $csv_delimiter2 = $CFG->CSV_DELIMITER;
+
+    if (isset($CFG->CSV_ENCODE)) {
+        $csv_encode = '/\&\#' . $CFG->CSV_ENCODE . '/';
     }
+} else {
+    $csv_delimiter = "\,";
+    $csv_delimiter2 = ",";
+}
 
 /// Print the header
 
-    print_header("$site->shortname: $struploadusers", $site->fullname, 
-                 "<a href=\"index.php\">$stradministration</a> -> 
-                  <a href=\"users.php\">$strusers</a> -> $struploadusers");
+print_header("$site->shortname: $struploadusers", $site->fullname,
+        "<a href=\"index.php\">$stradministration</a> ->
+        <a href=\"users.php\">$strusers</a> -> $struploadusers");
 
 
 /// If a file has been uploaded, then process it
 
 
-    require_once($CFG->dirroot.'/lib/uploadlib.php');
-    $um = new upload_manager('userfile',false,false,null,false,0);
-    if ($um->preprocess_files()) {
-        $filename = $um->files['userfile']['tmp_name'];
+$um = new upload_manager('userfile',false,false,null,false,0);
 
-        //Fix mac/dos newlines
-        $text = my_file_get_contents($filename);
-        $text = preg_replace('!\r\n?!',"\n",$text);
-        $fp = fopen($filename, "w");
-        fwrite($fp,$text);
-        fclose($fp);
+if ($um->preprocess_files() && confirm_sesskey()) {
+    $filename = $um->files['userfile']['tmp_name'];
 
-        $fp = fopen($filename, "r");
-
-        // make arrays of valid fields for error checking
-        $required = array("username" => 1, 
-                          "password" => 1, 
-                          "firstname" => 1, 
-                          "lastname" => 1,
-                          "email" => 1);
-        $optionalDefaults = array("institution" => 1, 
-                                  "department" => 1, 
-                                  "city" => 1, 
-                                  "country" => 1,
-                                  "lang" => 1,
-                                  "auth" => 1,
-                                  "timezone" => 1);
-        $optional = array("idnumber" => 1, 
-                          "icq" => 1, 
-                          "phone1" => 1, 
-                          "phone2" => 1,
-                          "address" => 1, 
-                          "url" => 1,
-                          "description" => 1, 
-                          "mailformat" => 1, 
-                          "maildisplay" => 1, 
-                          "htmleditor" => 1, 
-                          "autosubscribe" => 1,
-                          "idnumber" => 1, 
-                          "icq" => 1, 
-                          "course1" => 1, 
-                          "course2" => 1,
-                          "course3" => 1, 
-                          "course4" => 1, 
-                          "course5" => 1,
-                          "group1" => 1,
-                          "group2" => 1,
-                          "group3" => 1,
-                          "group4" => 1,
-                          "group5" =>1);
-
-        // --- get header (field names) ---
-        $header = split($csv_delimiter, fgets($fp,1024));
-        // check for valid field names
-        foreach ($header as $i => $h) {
-            $h = trim($h); $header[$i] = $h; // remove whitespace
-            if (!($required[$h] or $optionalDefaults[$h] or $optional[$h])) {
-                error(get_string('invalidfieldname', 'error', $h), 'uploaduser.php?sesskey='.$USER->sesskey);
-            }
-            if ($required[$h]) {
-                $required[$h] = 2;
-            }
-        }
-        // check for required fields
-        foreach ($required as $key => $value) {
-            if ($value < 2) {
-                error(get_string('fieldrequired', 'error', $key), 'uploaduser.php?sesskey='.$USER->sesskey);
-            }
-        }
-        $linenum = 2; // since header is line 1
-
-        while (!feof ($fp)) {
-            foreach ($optionalDefaults as $key => $value) {
-                $user->$key = addslashes($adminuser->$key);
-            }
-           //Note: commas within a field should be encoded as &#44 (for comma separated csv files)
-           //Note: semicolon within a field should be encoded as &#59 (for semicolon separated csv files)
-            $line = split($csv_delimiter, fgets($fp,1024));
-            foreach ($line as $key => $value) {
-                //decode encoded commas
-                $record[$header[$key]] = preg_replace($csv_encode,$csv_delimiter2,trim($value));
-            }
-            if ($record[$header[0]]) {
-                // add a new user to the database
-                $newuser = optional_param('newuser', "", PARAM_CLEAN); 
-
-                // add fields to object $user
-                foreach ($record as $name => $value) {
-                    // check for required values
-                    if ($required[$name] and !$value) {
-                        error(get_string('missingfield', 'error', $name). " ".
-                              get_string('erroronline', 'error', $linenum) .". ".
-                              get_string('processingstops', 'error'), 
-                              'uploaduser.php?sesskey='.$USER->sesskey);
-                    }
-                    // password needs to be encrypted
-                    else if ($name == "password") {
-                        $user->password = md5($value);
-                    }
-                    else if ($name == "username") {
-                        $user->username = addslashes(moodle_strtolower($value));
-                    }
-                    // normal entry
-                    else {
-                        $user->{$name} = addslashes($value);
-                    }
-                }
-                $user->confirmed = 1;
-                $user->timemodified = time();
-                $linenum++;
-                $username = $user->username;
-                $addcourse[0] = $user->course1;
-                $addcourse[1] = $user->course2;
-                $addcourse[2] = $user->course3;
-                $addcourse[3] = $user->course4;
-                $addcourse[4] = $user->course5;
-                $addgroup[0] = $user->group1;
-                $addgroup[1] = $user->group2;
-                $addgroup[2] = $user->group3;
-                $addgroup[3] = $user->group4;
-                $addgroup[4] = $user->group5;
-                $courses = get_courses("all",'c.sortorder','c.id,c.shortname,c.fullname,c.sortorder');
-                for ($i=0; $i<5; $i++) {
-                    $courseid[$i]=0;
-                }
-                foreach ($courses as $course) {
-                    for ($i=0; $i<5; $i++) {
-                        if ($course->shortname == $addcourse[$i]) {
-                            $courseid[$i] = $course->id;
-                        }
-                    }
-                }
-                if (get_record("user","username",$username) || !($user->id = insert_record("user", $user))) {
-                    if (!$user = get_record("user", "username", "changeme")) {   // half finished user from another time
-                        //Record not added - probably because user is already registered
-                        //In this case, output userid from previous registration
-                        //This can be used to obtain a list of userids for existing users
-                        if ($user = get_record("user","username",$username)) {
-                            notify("$user->id ".get_string('usernotaddedregistered', 'error', $username));
-                        } else {
-                            notify(get_string('usernotaddederror', 'error', $username));
-                        } 
-                    }
-                } else if ($user->username != "changeme") {
-                    notify("$struser: $user->id = $user->username");
-                    $numusers++;
-                }
-                for ($i=0; $i<5; $i++) {
-                    if ($addcourse[$i] && !$courseid[$i]) {
-                        notify(get_string('unknowncourse', 'error', $addcourse[$i]));
-                    }
-                }
-                for ($i=0; $i<5; $i++) {
-                  $groupid[$i] = 0;
-                  if ($addgroup[$i]) {
-                    if (!$courseid[$i]) {
-                        notify(get_string('coursegroupunknown','error',$addgroup[$i]));
-                    } else {
-                      if ($group = get_record("groups","courseid",$courseid[$i],"name",$addgroup[$i])) {
-                        $groupid[$i] = $group->id;
-                      } else {
-                        notify(get_string('groupunknown','error',$addgroup[$i]));
-                      }
-                    }
-                  }
-                }
-                for ($i=0; $i<5; $i++) {
-                    if ($courseid[$i]) {
-                        if (enrol_student($user->id, $courseid[$i])) {
-                            notify('-->'. get_string('enrolledincourse', '', $addcourse[$i]));
-                        } else {
-                            notify('-->'.get_string('enrolledincoursenot', '', $addcourse[$i]));
-                        }
-                    }
-                }
-                for ($i=0; $i<5; $i++) {
-                  if ($courseid[$i] && $groupid[$i]) {
-                    if (record_exists("user_students","userid",$user->id,"course",$courseid[$i])) {
-                      $usergroup = user_group($courseid[$i],$user->id);
-                      if ($usergroup) {
-                        notify('-->' . get_string('groupalready','error',$usergroup->name));
-                      } else {
-                        $group_member->groupid = $groupid[$i];
-                        $group_member->userid = $user->id;
-                        $group_member->timeadded = time();
-                        if (insert_record("groups_members",$group_member)) {
-                          notify('-->' . get_string('addedtogroup','',$addgroup[$i]));
-                        } else {
-                          notify('-->' . get_string('addedtogroupnot','',$addgroup[$i]));
-                        }
-                      }
-                    } else {
-                        notify('-->' . get_string('addedtogroupnotenrolled','',$addgroup[$i]));
-                    }
-                  }
-                }
-
-                unset ($user);
-            }
-        }
-        fclose($fp);
-        notify("$strusersnew: $numusers");
-
-        echo '<hr />';
+    // Large files are likely to take their time and memory. Let PHP know
+    // that we'll take longer, and that the process should be recycled soon
+    // to free up memory.
+    @set_time_limit(0);
+    @raise_memory_limit("128M");
+    if (function_exists('apache_child_terminate')) {
+        @apache_child_terminate();
     }
 
+    //Fix mac/dos newlines
+    $text = my_file_get_contents($filename);
+    $text = preg_replace('!\r\n?!',"\n",$text);
+    $fp = fopen($filename, "w");
+    fwrite($fp,$text);
+    fclose($fp);
+
+    $fp = fopen($filename, "r");
+
+    // make arrays of valid fields for error checking
+    $required = array("username" => 1,
+            "password" => !$createpassword,
+            "firstname" => 1,
+            "lastname" => 1,
+            "email" => 1);
+    $optionalDefaults = array("institution" => 1,
+            "department" => 1,
+            "city" => 1,
+            "country" => 1,
+            "lang" => 1,
+            "auth" => 1,
+            "timezone" => 1);
+    $optional = array("idnumber" => 1,
+            "icq" => 1,
+            "phone1" => 1,
+            "phone2" => 1,
+            "address" => 1,
+            "url" => 1,
+            "description" => 1,
+            "mailformat" => 1,
+            "maildisplay" => 1,
+            "htmleditor" => 1,
+            "autosubscribe" => 1,
+            "idnumber" => 1,
+            "icq" => 1,
+            "course1" => 1,
+            "course2" => 1,
+            "course3" => 1,
+            "course4" => 1,
+            "course5" => 1,
+            "group1" => 1,
+            "group2" => 1,
+            "group3" => 1,
+            "group4" => 1,
+            "group5" => 1,
+            "type1" => 1,
+            "type2" => 1,
+            "type3" => 1,
+            "type4" => 1,
+            "type5" => 1,
+            "password" => $createpassword,
+            "oldusername" => $allowrenames);
+
+            // --- get header (field names) ---
+            $header = split($csv_delimiter, fgets($fp,1024));
+            // check for valid field names
+            foreach ($header as $i => $h) {
+                $h = trim($h); $header[$i] = $h; // remove whitespace
+                if (!($required[$h] or $optionalDefaults[$h] or $optional[$h])) {
+                    error(get_string('invalidfieldname', 'error', $h), 'uploaduser.php?sesskey='.$USER->sesskey);
+                }
+                if ($required[$h]) {
+                    $required[$h] = 0;
+                }
+            }
+            // check for required fields
+            foreach ($required as $key => $value) {
+                if ($value) { //required field missing
+                    error(get_string('fieldrequired', 'error', $key), 'uploaduser.php?sesskey='.$USER->sesskey);
+                }
+            }
+            $linenum = 2; // since header is line 1
+
+            $usersnew     = 0;
+            $usersupdated = 0;
+            $userserrors  = 0;
+            $renames      = 0;
+            $renameerrors = 0;
+
+            // Will use this course array a lot
+            // so fetch it early and keep it in memory
+            $courses = get_courses('all','c.sortorder','c.id,c.shortname,c.fullname,c.sortorder,c.teacher');
+
+            while (!feof ($fp)) {
+                foreach ($optionalDefaults as $key => $value) {
+                    $user->$key = addslashes($adminuser->$key);
+                }
+                //Note: commas within a field should be encoded as &#44 (for comma separated csv files)
+                //Note: semicolon within a field should be encoded as &#59 (for semicolon separated csv files)
+                $line = split($csv_delimiter, fgets($fp,1024));
+                foreach ($line as $key => $value) {
+                    //decode encoded commas
+                    $record[$header[$key]] = preg_replace($csv_encode,$csv_delimiter2,trim($value));
+                }
+                if ($record[$header[0]]) {
+                    // add a new user to the database
+
+                    // add fields to object $user
+                    foreach ($record as $name => $value) {
+                        // check for required values
+                        if ($required[$name] and !$value) {
+                            error(get_string('missingfield', 'error', $name). " ".
+                                    get_string('erroronline', 'error', $linenum) .". ".
+                                    get_string('processingstops', 'error'),
+                                    'uploaduser.php?sesskey='.$USER->sesskey);
+                        }
+                        // password needs to be encrypted
+                        else if ($name == "password" && !empty($value)) {
+                            $user->password = hash_internal_user_password($value);
+                        }
+                        else if ($name == "username") {
+                            $user->username = addslashes(moodle_strtolower($value));
+                        }
+                        // normal entry
+                        else {
+                            $user->{$name} = addslashes($value);
+                        }
+                    }
+                    $user->confirmed = 1;
+                    $user->timemodified = time();
+                    $linenum++;
+                    $username = $user->username;
+                    $addcourse[0] = $user->course1;
+                    $addcourse[1] = $user->course2;
+                    $addcourse[2] = $user->course3;
+                    $addcourse[3] = $user->course4;
+                    $addcourse[4] = $user->course5;
+                    $addgroup[0] = $user->group1;
+                    $addgroup[1] = $user->group2;
+                    $addgroup[2] = $user->group3;
+                    $addgroup[3] = $user->group4;
+                    $addgroup[4] = $user->group5;
+                    $addtype[0] = $user->type1;
+                    $addtype[1] = $user->type2;
+                    $addtype[2] = $user->type3;
+                    $addtype[3] = $user->type4;
+                    $addtype[4] = $user->type5;
+
+                    for ($i=0; $i<5; $i++) {
+                        $course[$i]=NULL;
+                    }
+                    foreach ($courses as $eachcourse) {
+                        for ($i=0; $i<5; $i++) {
+                            if ($eachcourse->shortname == $addcourse[$i]) {
+                                $course[$i] = $eachcourse;
+                            }
+                        }
+                    }
+
+                    if ($user->username === 'changeme') {
+                        notify(get_string('invaliduserchangeme', 'admin'));
+                        $userserrors++;
+                        continue;
+                    }
+
+                    // before insert/update, check whether we should be updating
+                    // an old record instead
+                    if ($allowrenames && !empty($user->oldusername) ) {
+                        $user->oldusername = moodle_strtolower($user->oldusername);
+                        if ($olduser = get_record('user','username',$user->oldusername)) {
+                            if (set_field('user', 'username', $user->username, 'username', $user->oldusername)) {
+                                notify(get_string('userrenamed', 'admin') . " : $user->oldusername $user->username");
+                                $renames++;
+                            } else {
+                                notify(get_string('usernotrenamedexists', 'error') . " : $user->oldusername $user->username");
+                                $renameerrors++;
+                                continue;
+                            }
+                        } else {
+                            notify(get_string('usernotrenamedmissing', 'error') . " : $user->oldusername $user->username");
+                            $renameerrors++;
+                            continue;
+                        }
+                    }
+
+                    if ($olduser = get_record("user","username",$username)) {
+                        if ($updateaccounts) {
+                            // Record is being updated
+                            $user->id = $olduser->id;
+                            if (update_record('user', $user)) {
+                                notify("$user->id , $user->username ".get_string('useraccountupdated', 'admin'));
+                                $usersupdated++;
+                            } else {
+                                notify(get_string('usernotupdatederror', 'error', $username));
+                                $userserrors++;
+                                continue;
+                            }
+                        } else {
+                            //Record not added - user is already registered
+                            //In this case, output userid from previous registration
+                            //This can be used to obtain a list of userids for existing users
+                            notify("$user->id ".get_string('usernotaddedregistered', 'error', $username));
+                            $userserrors++;
+                            continue;
+                        }
+
+                    } else { // new user
+                        if ($user->id = insert_record("user", $user)) {
+                            notify("$struser: $user->id = $user->username");
+                            $usersnew++;
+                            if (empty($user->password) && $createpassword) {
+                                // passwords will be created and sent out on cron
+                                insert_record('user_preferences', array( userid => $user->id,
+                                            name   => 'create_password',
+                                            value  => 1));
+                                insert_record('user_preferences', array( userid => $user->id,
+                                            name   => 'auth_forcepasswordchange',
+                                            value  => 1));
+                            }
+                        } else {
+                            // Record not added -- possibly some other error
+                            notify(get_string('usernotaddederror', 'error', $username));
+                            $userserrors++;
+                            continue;
+                        }
+                    }
+                    for ($i=0; $i<5; $i++) {
+                        if ($addcourse[$i] && !$course[$i]) {
+                            notify(get_string('unknowncourse', 'error', $addcourse[$i]));
+                        }
+                    }
+                    for ($i=0; $i<5; $i++) {
+                        $groupid[$i] = 0;
+                        if ($addgroup[$i]) {
+                            if (!$course[$i]) {
+                                notify(get_string('coursegroupunknown','error',$addgroup[$i]));
+                            } else {
+                                if ($group = get_record("groups","courseid",$course[$i]->id,"name",$addgroup[$i])) {
+                                    $groupid[$i] = $group->id;
+                                } else {
+                                    notify(get_string('groupunknown','error',$addgroup[$i]));
+                                }
+                            }
+                        }
+                    }
+                    for ($i=0; $i<5; $i++) {   /// Enrol into courses if necessary
+                        if ($course[$i]) {
+                            if (isset($addtype[$i])) {
+                                switch ($addtype[$i]) {
+                                    case 2:   // teacher
+                                        $ret = add_teacher($user->id, $course[$i]->id, 1);
+                                        break;
+
+                                    case 3:   // non-editing teacher
+                                        $ret = add_teacher($user->id, $course[$i]->id, 0);
+                                        break;
+
+                                    default:  // student
+                                        $ret = enrol_student($user->id, $course[$i]->id);
+                                        break;
+                                }
+                            } else {
+                                $ret = enrol_student($user->id, $course[$i]->id);
+                            }
+                            if ($ret) {   // OK
+                                notify('-->'. get_string('enrolledincourse', '', $addcourse[$i]));
+                            } else {
+                                notify('-->'.get_string('enrolledincoursenot', '', $addcourse[$i]));
+                            }
+                        }
+                    }
+                    for ($i=0; $i<5; $i++) {   // Add user to groups if necessary
+                        if ($course[$i] && $groupid[$i]) {
+                            if (record_exists('user_students','userid',$user->id,'course',$course[$i]->id) ||
+                                    record_exists('user_teachers','userid',$user->id,'course',$course[$i]->id)) {
+                                if (add_user_to_group($groupid[$i], $user->id)) {
+                                    notify('-->' . get_string('addedtogroup','',$addgroup[$i]));
+                                } else {
+                                    notify('-->' . get_string('addedtogroupnot','',$addgroup[$i]));
+                                }
+                            } else {
+                                notify('-->' . get_string('addedtogroupnotenrolled','',$addgroup[$i]));
+                            }
+                        }
+                    }
+
+                    unset ($user);
+                }
+            }
+            fclose($fp);
+            notify("$strusersnew: $usersnew");
+            notify(get_string('usersupdated', 'admin') . ": $usersupdated");
+            notify(get_string('errors', 'admin') . ": $userserrors");
+            if ($allowrenames) {
+                notify(get_string('usersrenamed', 'admin') . ": $renames");
+                notify(get_string('renameerrors', 'admin') . ": $renameerrors");
+            }
+            echo '<hr />';
+}
+
 /// Print the form
-    print_heading_with_help($struploadusers, 'uploadusers');
+print_heading_with_help($struploadusers, 'uploadusers');
 
-    $maxuploadsize = get_max_upload_file_size();
-    echo '<center>';
-    echo '<form method="post" enctype="multipart/form-data" action="uploaduser.php">'.
-         $strchoose.':<input type="hidden" name="MAX_FILE_SIZE" value="'.$maxuploadsize.'">'.
-         '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'">'.
-         '<input type="file" name="userfile" size="30">'.
-         '<input type="submit" value="'.$struploadusers.'">'.
-         '</form></br>';
-    echo '</center>';
+$noyesoptions = array( get_string('no'), get_string('yes') );
 
-    print_footer($course);
+$maxuploadsize = get_max_upload_file_size();
+echo '<center>';
+echo '<form method="post" enctype="multipart/form-data" action="uploaduser.php">'.
+$strfile.'&nbsp;<input type="hidden" name="MAX_FILE_SIZE" value="'.$maxuploadsize.'">'.
+'<input type="hidden" name="sesskey" value="'.$USER->sesskey.'">'.
+'<input type="file" name="userfile" size="30">';
+print_heading(get_string('settings'));
+echo '<table>';
+echo '<tr><td>' . get_string('passwordhandling', 'auth') . '</td><td>';
+$passwordopts = array( 0 => get_string('infilefield', 'auth'),
+        1 => get_string('createpasswordifneeded', 'auth'),
+        );
+choose_from_menu($passwordopts, 'createpassword', $createpassword);
+echo '</td></tr>';
+
+echo '<tr><td>' . get_string('updateaccounts', 'admin') . '</td><td>';
+choose_from_menu($noyesoptions, 'updateaccounts', $updateaccounts);
+echo '</td></tr>';
+
+echo '<tr><td>' . get_string('allowrenames', 'admin') . '</td><td>';
+choose_from_menu($noyesoptions, 'allowrenames', $allowrenames);
+echo '</td></tr>';
+echo '</table><br />';
+echo '<input type="submit" value="'.$struploadusers.'">';
+echo '</form><br />';
+echo '</center>';
+
+print_footer($course);
 
 
 
 function my_file_get_contents($filename, $use_include_path = 0) {
-/// Returns the file as one big long string
+    /// Returns the file as one big long string
 
     $data = "";
     $file = @fopen($filename, "rb", $use_include_path);

admin/user.php

@@ -1,38 +1,35 @@
 <?php // $Id$
 
-    require_once("../config.php");
+    require_once('../config.php');
 
-    optional_variable($newuser, "");
-    optional_variable($delete, "");
-    optional_variable($confirm, "");
-    optional_variable($confirmuser, "");
-    optional_variable($sort, "name");
-    optional_variable($dir, "ASC");
-    optional_variable($page, 0);
-    optional_variable($search, "");
-    if (!empty($search)) {
-        $search=trim($search);
-    }
-    optional_variable($lastinitial, "");     // only show students with this last initial
-    optional_variable($firstinitial, "");    // only show students with this first initial
-    optional_variable($perpage, "30");       // how many per page
-
-    unset($user);
-    unset($admin);
-    unset($teacher);
+    $newuser      = optional_param('newuser', 0, PARAM_BOOL);
+    $delete       = optional_param('delete', 0, PARAM_INT);
+    $confirm      = optional_param('confirm', '', PARAM_ALPHANUM);   //md5 confirmation hash
+    $confirmuser  = optional_param('confirmuser', 0, PARAM_INT);
+    $sort         = optional_param('sort', 'name', PARAM_ALPHA);
+    $dir          = optional_param('dir', 'ASC', PARAM_ALPHA);
+    $page         = optional_param('page', 0, PARAM_INT);
+    $perpage      = optional_param('perpage', 30, PARAM_INT);        // how many per page
+    $search       = optional_param('search', '', PARAM_RAW);
+    $lastinitial  = optional_param('lastinitial', '', PARAM_CLEAN);  // only show students with this last initial
+    $firstinitial = optional_param('firstinitial', '', PARAM_CLEAN); // only show students with this first initial
 
     $search = trim($search);
 
+    $user    = new object();
+    $admin   = new object();
+    $teacher = new object();
+
     if (! record_exists("user_admins")) {   // No admin user yet
 
-        $user->firstname = get_string("admin");
-        $user->lastname  = get_string("user");
-        $user->username  = "admin";
-        $user->password  = md5("admin");
-        $user->email     = "root@localhost";
-        $user->confirmed = 1;
-        $user->lang = $CFG->lang;
-        $user->maildisplay = 1;
+        $user->firstname    = get_string("admin");
+        $user->lastname     = get_string("user");
+        $user->username     = "admin";
+        $user->password     = hash_internal_user_password("admin");
+        $user->email        = "root@localhost";
+        $user->confirmed    = 1;
+        $user->lang         = $CFG->lang;
+        $user->maildisplay  = 1;
         $user->timemodified = time();
 
         if (! $user->id = insert_record("user", $user)) {
@@ -85,14 +82,14 @@
     }
 
     if ($newuser and confirm_sesskey()) {                 // Create a new user
-        $user->auth      = "manual";
-        $user->firstname = "";
-        $user->lastname  = "";
-        $user->username  = "changeme";
-        $user->password  = "";
-        $user->email     = "";
-        $user->lang      = $CFG->lang;
-        $user->confirmed = 1;
+        $user->auth         = "manual";
+        $user->firstname    = "";
+        $user->lastname     = "";
+        $user->username     = "changeme";
+        $user->password     = "";
+        $user->email        = "";
+        $user->lang         = $CFG->lang;
+        $user->confirmed    = 1;
         $user->timemodified = time();
 
         if (! $user->id = insert_record("user", $user)) {
@@ -130,7 +127,7 @@
                 error("No such user!");
             }
 
-            unset($confirmeduser);
+            $confirmeduser = new object();
             $confirmeduser->id = $confirmuser;
             $confirmeduser->confirmed = 1;
             $confirmeduser->timemodified = time();
@@ -158,7 +155,7 @@
 
                 exit;
             } else if (!$user->deleted) {
-                unset($updateuser);
+                $updateuser = new object();
                 $updateuser->id = $user->id;
                 $updateuser->deleted = "1";
                 $updateuser->username = "$user->email.".time();  // Remember it just in case
@@ -199,7 +196,7 @@
                 $columnicon = " <img src=\"$CFG->pixpath/t/$columnicon.gif\" alt=\"\" />";
 
             }
-            $$column = "<a href=\"user.php?sort=$column&amp;dir=$columndir&amp;search=$search&amp;firstinitial=$firstinitial&amp;lastinitial=$lastinitial\">".$string[$column]."</a>$columnicon";
+            $$column = "<a href=\"user.php?sort=$column&amp;dir=$columndir&amp;search=".urlencode(stripslashes($search))."&amp;firstinitial=$firstinitial&amp;lastinitial=$lastinitial\">".$string[$column]."</a>$columnicon";
         }
 
         if ($sort == "name") {
@@ -262,15 +259,15 @@
         echo "</center>";
 
         print_paging_bar($usercount, $page, $perpage,
-                "user.php?sort=$sort&amp;dir=$dir&amp;perpage=$perpage&amp;firstinitial=$firstinitial&amp;lastinitial=$lastinitial&amp;search=$search&amp;");
+                "user.php?sort=$sort&amp;dir=$dir&amp;perpage=$perpage&amp;firstinitial=$firstinitial&amp;lastinitial=$lastinitial&amp;search=".urlencode(stripslashes($search))."&amp;");
 
         flush();
 
 
         if (!$users) {
             $match = array();
-            if ($search) {
-               $match[] = $search;
+            if ($search !== '') {
+               $match[] = s($search);
             }
             if ($firstinitial) {
                $match[] = get_string("firstname").": $firstinitial"."___";
@@ -336,7 +333,7 @@
 
         echo "<table class=\"searchbox\" align=\"center\" cellpadding=\"10\"><tr><td>";
         echo "<form action=\"user.php\" method=\"get\">";
-        echo "<input type=\"text\" name=\"search\" value=\"$search\" size=\"20\" />";
+        echo "<input type=\"text\" name=\"search\" value=\"".s($search, true)."\" size=\"20\" />";
         echo "<input type=\"submit\" value=\"$strsearch\" />";
         if ($search) {
             echo "<input type=\"button\" onclick=\"document.location='user.php';\" value=\"$strshowallusers\" />";
@@ -349,7 +346,7 @@
             print_table($table);
             print_paging_bar($usercount, $page, $perpage,
                              "user.php?sort=$sort&amp;dir=$dir&amp;perpage=$perpage".
-                             "&amp;firstinitial=$firstinitial&amp;lastinitial=$lastinitial&amp;search=$search&amp;");
+                             "&amp;firstinitial=$firstinitial&amp;lastinitial=$lastinitial&amp;search=".urlencode(stripslashes($search))."&amp;");
             print_heading("<a href=\"user.php?newuser=true&amp;sesskey=$USER->sesskey\">".get_string("addnewuser")."</a>");
         }
 

admin/users.php

@@ -1,6 +1,6 @@
 <?php // $Id$
 
-    require_once("../config.php");
+    require_once('../config.php');
 
     require_login();
 
@@ -24,27 +24,15 @@
 
     $table->data[] = array("<b><a href=\"auth.php?sesskey=$USER->sesskey\">".get_string("authentication")."</a></b>",
                            get_string("adminhelpauthentication"));
-
     $table->data[] = array("<b><a href=\"user.php\">".get_string("edituser")."</a></b>",
                            get_string("adminhelpedituser"));
     $table->data[] = array("<b><a href=\"$CFG->wwwroot/$CFG->admin/user.php?newuser=true&amp;sesskey=$USER->sesskey\">".get_string("addnewuser")."</a></b>",
                                get_string("adminhelpaddnewuser"));
     $table->data[] = array("<b><a href=\"$CFG->wwwroot/$CFG->admin/uploaduser.php?sesskey=$USER->sesskey\">".get_string("uploadusers")."</a></b>",
                                get_string("adminhelpuploadusers"));
-    $table->data[] = array('', '<hr />');
-    $table->data[] = array("<b><a href=\"enrol.php?sesskey=$USER->sesskey\">".get_string("enrolments")."</a></b>",
-                           get_string("adminhelpenrolments"));
-    $table->data[] = array("<b><a href=\"../course/index.php?edit=off&amp;sesskey=$USER->sesskey\">".get_string("assignstudents")."</a></b>",
-                           get_string("adminhelpassignstudents"));
-    $table->data[] = array("<b><a href=\"../course/index.php?edit=on&amp;sesskey=$USER->sesskey\">".get_string("assignteachers")."</a></b>",
-                           get_string("adminhelpassignteachers")." <img src=\"../pix/t/user.gif\" height=\"11\" width=\"11\" alt=\"\" />");
-    $table->data[] = array("<b><a href=\"creators.php?sesskey=$USER->sesskey\">".get_string("assigncreators")."</a></b>",
-                           get_string("adminhelpassigncreators"));
-    $table->data[] = array("<b><a href=\"admin.php?sesskey=$USER->sesskey\">".get_string("assignadmins")."</a></b>",
-                           get_string("adminhelpassignadmins"));
 
     print_table($table);
-    
+
     print_footer($site);
 
 ?>

admin/utfdbmigrate.html

@@ -0,0 +1,70 @@
+<?php
+   if (!isset($form->dbhost)) {
+       $form->dbhost = '';
+   }
+   if (!isset($form->dbname)) {
+       $form->dbname = '';
+   }
+   if (!isset($form->dbuser)) {
+       $form->dbuser = '';
+   }
+   if (!isset($form->dbpass)) {
+       $form->dbpass = '';
+   }
+   if (!isset($form->dbcluster)) {
+       $form->dbcluster = '';
+   }
+   if (!isset($form->pathtopgdump)) {
+       $form->pathtopgdump = '';
+   }
+   if (!isset($form->pathtopsql)) {
+       $form->pathtopsql = '';
+   }
+?>
+<form name="migratefrom" action="utfdbmigrate.php" method="POST">
+<input name="migrate" type="hidden" value="1" />
+<input name="sesskey" type="hidden" value="<?php echo sesskey() ?>" />
+<?php if (isset($err["dbconnect"])) formerr($err["dbconnect"]); ?>
+<?php if (isset($err["pathtopgdump"])) formerr($err["pathtopgdump"]); ?>
+<?php if (isset($err["pathtopsql"])) formerr($err["pathtopsql"]); ?>
+<table cellpadding="9" cellspacing="0" width="500">
+<tr valign="top">
+    <td align="right"><?php print_string("dbhost", "install") ?>:</td>
+    <td><input type="text" name="dbhost" value="<?php p($form->dbhost) ?>" />
+    </td>
+</tr>
+<tr valign="top">
+    <td align="right"><?php print_string("database", "install") ?>:</td>
+    <td><input type="text" name="dbname" value="<?php p($form->dbname) ?>" />
+    </td>
+</tr>
+<tr valign="top">
+    <td align="right"><?php print_string("user") ?>:</td>
+    <td><input type="text" name="dbuser" value="<?php p($form->dbuser) ?>" />
+    </td>
+</tr>
+<tr valign="top">
+    <td align="right"><?php print_string("password") ?>:</td>
+    <td><input type="text" name="dbpass" value="<?php p($form->dbpass) ?>" />
+    </td>
+</tr>
+<tr valign="top">
+    <td align="right"><?php print_string("pgcluster", "admin") ?>:</td>
+    <td><input type="text" name="dbcluster" value="<?php p($form->dbcluster) ?>" />
+    <td><?php print_string("pgclusterdescription", "admin") ?></td>
+</tr>
+<tr valign="top">
+    <td align="right" nowrap="nowrap"><?php print_string("pathtopgdump","admin") ?>:</td>
+    <td><input type="text" name="pathtopgdump" value="<?php p($form->pathtopgdump) ?>" />
+    <td><?php print_string("pathtopgdumpdesc","admin"); ?></td>
+</tr>
+<tr valign="top">
+    <td align="right" nowrap="nowrap"><?php print_string("pathtopsql","admin") ?>:</td>
+    <td><input type="text" name="pathtopsql" value="<?php p($form->pathtopsql) ?>" />
+    <td><?php print_string("pathtopsqldesc","admin"); ?></td>
+</tr>
+</table>
+<center>
+<input type="submit" value="<?php print_string('continue') ?>"/>
+&nbsp;<input type="button" value="<?php print_string('cancel') ?>" onclick="javascript:history.go(-1)" />
+</center>

auth/README

@@ -121,6 +121,14 @@ Optional:
     Userinformation in array ( name => value, .... 
     or false in case of error
 
+    auth_validate_form(&$form, &$err)
+    
+    Validate form data.
+
+    Returns:
+    Bool. Manipulates $form and $err arrays in place
+
+
 COURSE CREATING
 
     auth_iscreator($username)

auth/cas/index_form.html

@@ -1 +1,87 @@
-<table width="90%" border="0" cellspacing="10" cellpadding="5" align="center">
+<table width="90%" border="0" cellspacing="10" cellpadding="5" align="center">
+  <tr>
+<?php if ($show_instructions) { ?>
+    <td width="50%" class="headingblock">
+      <p align="center"><b><font size="3"><?php  print_string("returningtosite") ?></font></b></p>
+    </td>
+    <td width="50%" class="headingblock">
+      <p align="center"><b><font size="3"><?php  print_string("firsttime") ?></font></b></p>
+    </td>
+<?php } ?>
+  </tr>
+  <tr>
+    <td width="50%" align="center" valign="top" class="generalbox">
+      <p><?php print_string("loginusing") ?>:<br />
+        (<?php print_string("cookiesenabled");?>) 
+         <?php helpbutton("cookies", get_string("cookiesenabled"))?><br /><?php formerr($errormsg) ?>
+      </p>
+      <form action="index.php" method="post" name="login" id="login">
+        <table border="0" align="center" style="font-size: small">
+        <tr>
+          <td width="100%">
+            <input type="hidden" name="username" value="cas" />
+            <input type="hidden" name="password" value="cas" />
+            <input type="submit" value="<?php print_string("auth_cas_logincas", "auth") ?>" />
+          </td>
+        </tr>
+        </table>
+      </form>
+<?php if ($CFG->guestloginbutton) {  ?>
+      <hr width="80%" />
+      <p><?php print_string("someallowguest") ?>:</p>
+        <form action="index.php" method="post" name="guestlogin">
+          <input type="hidden" name="username" value="guest" />
+          <input type="hidden" name="password" value="guest" />
+          <input type="submit" value="<?php print_string("loginguest") ?>" />
+        </form>
+<?php } ?>
+
+<?php if (is_internal_auth() ) {
+    $changepassword = "forgot_password.php";
+    $changebuttonname = get_string("senddetails");
+?>
+      <hr width="80%" />
+      <p><?php print_string("forgotten") ?></p> 
+        <form action="<?php p($changepassword) ?>" method="get" name="changepassword">
+          <input type="submit" value="<?php p($changebuttonname) ?>" />
+        </form>
+<?php } ?>
+
+    </td>
+
+<?php if ($show_instructions) { ?>
+    <td width="50%" valign="top" class="generalbox">
+<?php     switch ($CFG->auth) {
+              case "email":
+                 print_string("loginsteps", "", "signup.php");
+?>
+                 <div align="center">
+                   <form action="signup.php" method="get" name="signup">
+                   <input type="submit" value="<?php print_string("startsignup") ?>" />
+                   </form>
+                 </div>
+<?php            break;
+               case "none":
+                 print_string("loginstepsnone");
+                 break;
+               default:
+                 echo format_text($CFG->auth_instructions);
+                 if (!function_exists('auth_user_login')) {
+                    require_once("../auth/$CFG->auth/lib.php");
+                 }
+                 if (!empty($CFG->auth_user_create) and function_exists('auth_user_create') ){
+?>
+
+                 <div align="center">
+                    <form action="signup.php" method="get" name="signup">
+                    <input type="submit" value="<?php print_string("startsignup") ?>" />
+                    </form>
+                 </div>
+
+<?php            }
+          }
+?>
+    </td></tr>
+<?php } ?>
+</table>
+

auth/cas/lib.php

@@ -98,13 +98,11 @@ function cas_ldap_auth_user_login ($username, $password) {
 function cas_authenticate_user_login ($username, $password) {
 
    global $CFG;
+   // FIX ME: $cas_validate is not global
    $cas_validate=true;
-
-   phpCAS::client($CFG->cas_version,$CFG->cas_hostname,(Integer)$CFG->cas_port,$CFG->cas_baseuri);
+   phpCAS::client($CFG->cas_version,$CFG->cas_hostname,(int)$CFG->cas_port,$CFG->cas_baseuri);
    phpCAS::setLang($CFG->cas_language);
-   if (!phpCAS::isAuthenticated()){
-      phpCAS::authenticateIfNeeded();
-   }
+   phpCAS::forceAuthentication();
    if ($CFG->cas_create_user=="0"){
       if (record_exists('user', 'username', phpCAS::getUser())) {
          $user = authenticate_user_login(phpCAS::getUser(), 'cas');
@@ -134,14 +132,16 @@ function cas_authenticate_user_login ($username, $password) {
 */
 function cas_automatic_authenticate ($user="") {
    global $CFG;
+   // FIX ME: $cas_validate is not global, but it works anyway ;-)
    if (!$cas_validate){
         $cas_validate=true;
         phpCAS::client($CFG->cas_version,$CFG->cas_hostname,(int)$CFG->cas_port,$CFG->cas_baseuri);
         phpCAS::setLang($CFG->cas_language);
-        if (!phpCAS::isAuthenticated() && !$CFG->guestloginbutton){
-           phpCAS::authenticateIfNeeded();
+        $cas_user_exist=phpCAS::checkAuthentication();
+        if (!$cas_user_exist && !$CFG->guestloginbutton){
+           $cas_user_exist=phpCAS::forceAuthentication();
         }
-        if (phpCAS::isAuthenticated()){
+        if ($cas_user_exist){
            if ($CFG->cas_create_user=="0"){
               if (record_exists('user', 'username', phpCAS::getUser())) {
                  $user = authenticate_user_login(phpCAS::getUser(), 'cas');
@@ -167,4 +167,5 @@ function cas_automatic_authenticate ($user="") {
    }
 }
 
-?>
+
+?>

auth/cas/login.php

@@ -18,7 +18,7 @@ defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
         if (empty($CFG->loginhttps)) {
             $wwwroot = $CFG->wwwroot;
         } else {
-            $wwwroot = str_replace('http','https',$CFG->wwwroot);
+            $wwwroot = str_replace('http:','https:',$CFG->wwwroot);
         }
         $langmenu = popup_form ("$wwwroot/login/index.php?lang=", $langs, "chooselang", $currlang, "", "", "", true);
     }
@@ -109,10 +109,7 @@ defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
             //Select password change url
             if (is_internal_auth() || $CFG->{'auth_'.$USER->auth.'_stdchangepassword'}){
                 $passwordchangeurl=$CFG->wwwroot.'/login/change_password.php';
-            } elseif($CFG->changepassword) {
-                $passwordchangeurl=$CFG->changepassword;
             } 
-            
 
             // check whether the user should be changing password
             if (get_user_preferences('auth_forcepasswordchange', false)){
@@ -219,10 +216,7 @@ defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
         //Select password change url
         if (is_internal_auth() || $CFG->{'auth_'.$USER->auth.'_stdchangepassword'}){
             $passwordchangeurl=$CFG->wwwroot.'/login/change_password.php';
-        } elseif($CFG->changepassword) {
-            $passwordchangeurl=$CFG->changepassword;
-        } 
-        
+        }
 
         // check whether the user should be changing password
         if (get_user_preferences('auth_forcepasswordchange', false)){
@@ -319,4 +313,4 @@ defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
 
     // No footer on this page
 
-?>
+?>

auth/cas/logout.php

@@ -1,11 +1,15 @@
-<?php 
+<?php
 // $Id$
 // logout the user from CAS server (destroy the ticket)
 defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
 
-       include_once($CFG->dirroot.'/lib/cas/CAS.php');
-       phpCAS::client($CFG->cas_version,$CFG->cas_hostname,(Integer)$CFG->cas_port,$CFG->cas_baseuri);
-       $backurl = $CFG->wwwroot;
-       phpCAS::logout($backurl);
+       global $CFG;
+       if ($CFG->cas_logout){
+         require_once($CFG->dirroot.'/config.php');
+         include_once($CFG->dirroot.'/lib/cas/CAS.php');
+         phpCAS::client($CFG->cas_version,$CFG->cas_hostname,(int)$CFG->cas_port,$CFG->cas_baseuri);
+         $backurl = $CFG->wwwroot;
+         phpCAS::logout($backurl);
+       }
 
 ?>

auth/db/auth_db_sync_users.php

@@ -0,0 +1,39 @@
+<?php
+/** auth_db_sync_users.php
+ * 
+ * This script is meant to be called from a cronjob to sync moodle with the LDAP 
+ * backend in those setups where the LDAP backend acts as 'master'.
+ * 
+ * Recommended cron entry:
+ * # 5 minutes past 4am
+ * 5 4 * * * /usr/bin/php -c /etc/php4/cli/php.ini /var/www/moodle/auth/db/auth_db_sync_users.php
+ * 
+ * Notes: 
+ *   - If you have a large number of users, you may want to raise the memory limits
+ *     by passing -d memory_limit=256M
+ *   - For debugging & better logging, you are encouraged to use in the command line:
+ *     -d log_errors=1 -d error_reporting=E_ALL -d display_errors=0 -d html_errors=0
+ *     
+ * Performance notes:
+ * + The code is simpler, but not as optimized as its LDAP counterpart. 
+ * 
+ *    
+ */
+
+
+if(!empty($_SERVER['GATEWAY_INTERFACE'])){
+    error_log("should not be called from apache!");
+    exit;
+}
+
+require_once(dirname(dirname(dirname(__FILE__))).'/config.php'); // global moodle config file.
+
+require_once($CFG->dirroot.'/course/lib.php');
+require_once($CFG->dirroot.'/lib/blocklib.php');
+require_once($CFG->dirroot.'/mod/resource/lib.php');
+require_once($CFG->dirroot.'/auth/db/lib.php');
+require_once($CFG->dirroot.'/mod/forum/lib.php');
+$CFG->debug=10;
+auth_sync_users(true  );
+
+?>

auth/db/config.html

@@ -26,7 +26,10 @@
     if (!isset($config->auth_dbpasstype)) {
         $config->auth_dbpasstype = "plaintext";
     }
+
+    $pluginconfig = get_config('auth/db');
 ?>
+
 <tr valign="top" class="required">
     <td align="right">auth_dbhost:</td>
     <td>
@@ -126,6 +129,8 @@
     <?php  
        $passtype["plaintext"] = get_string("plaintext", "auth");
        $passtype["md5"]       = get_string("md5", "auth");
+       $passtype["internal"]  = get_string("internal", "auth");
+       
        choose_from_menu($passtype, "auth_dbpasstype", $config->auth_dbpasstype, "");
     ?>
       

auth/db/lib.php

@@ -21,31 +21,59 @@ function auth_user_login ($username, $password) {
     }
 
     // Connect to the external database
-    $authdb = &ADONewConnection($CFG->auth_dbtype);         
+    $authdb = &ADONewConnection($CFG->auth_dbtype); 
     $authdb->PConnect($CFG->auth_dbhost,$CFG->auth_dbuser,$CFG->auth_dbpass,$CFG->auth_dbname); 
 
-    switch ($CFG->auth_dbpasstype) {   // Re-format password accordingly
-        case "md5":
-            $password = md5($password);
-        break;
-    }
+    if ($CFG->auth_dbpasstype === 'internal') { 
+        // lookup username externally, but resolve
+        // password locally -- to support backend that
+        // don't track passwords
+        $rs = $authdb->Execute("SELECT * FROM $CFG->auth_dbtable 
+                                 WHERE $CFG->auth_dbfielduser = '$username' ");
+        $authdb->Close();
 
-    $rs = $authdb->Execute("SELECT * FROM $CFG->auth_dbtable 
+        if (!$rs) {
+            notify("Could not connect to the specified authentication database...");
+
+            return false;
+        }
+    
+        if ( $rs->RecordCount() ) {
+            // user exists exterally
+            // check username/password internally
+            if ($user = get_record('user', 'username', $username)) {
+                return validate_internal_user_password($user, $password);
+            }
+        } else {
+            // user does not exist externally
+            return false;
+        }  
+
+    } else { 
+        // normal case: use external db for passwords
+
+        if ($CFG->auth_dbpasstype === 'md5') {   // Re-format password accordingly
+            $password = md5($password);
+        }
+
+        $rs = $authdb->Execute("SELECT * FROM $CFG->auth_dbtable 
                             WHERE $CFG->auth_dbfielduser = '$username' 
                               AND $CFG->auth_dbfieldpass = '$password' ");
-    $authdb->Close();
-
-    $CFG->prefix = $prefix;
-
-    if (!$rs) {
-        notify("Could not connect to the specified authentication database...");
-        return false;
-    }
-
-    if ( $rs->RecordCount() ) {
-        return true;
-    } else {
-        return false;
+        $authdb->Close();
+        
+        $CFG->prefix = $prefix;
+        
+        if (!$rs) {
+            notify("Could not connect to the specified authentication database...");
+            return false;
+        }
+    
+        if ( $rs->RecordCount() ) {
+            return true;
+        } else {
+            return false;
+        }        
+        
     }
 }
 
@@ -76,7 +104,11 @@ function auth_get_userinfo($username){
             if ($rs = $authdb->Execute("SELECT ".$pcfg["field_map_$field"]." FROM $CFG->auth_dbtable
                                         WHERE $CFG->auth_dbfielduser = '$username'")) {
                 if ( $rs->RecordCount() == 1 ) {
-                    $result["$field"] = addslashes(stripslashes(utf8_decode($rs->fields[0])));
+                    if (!empty($CFG->unicodedb)) {
+                        $result["$field"] = addslashes(stripslashes($rs->fields[0]));
+                    } else {
+                        $result["$field"] = addslashes(stripslashes(utf8_decode($rs->fields[0])));
+                    }
                 }
             }
         }
@@ -85,4 +117,345 @@ function auth_get_userinfo($username){
     return $result;
 }
 
-?>
+
+function auth_user_update_password($username, $newpassword) {
+    global $CFG;
+    if ($CFG->auth_dbpasstype === 'internal') {
+        return set_field('user', 'password', md5($newpassword), 'username', $username);
+    } else {
+        // we should have never been called!
+        return false;
+    }
+}
+
+/**
+ * syncronizes user fron external db to moodle user table
+ *
+ * Sync shouid be done by using idnumber attribute, not username.
+ * You need to pass firstsync parameter to function to fill in
+ * idnumbers if they dont exists in moodle user table.
+ * 
+ * Syncing users removes (disables) users that dont exists anymore in external db.
+ * Creates new users and updates coursecreator status of users. 
+ * 
+ * @param bool $do_updates  Optional: set to true to force an update of existing accounts
+ *
+ * This implementation is simpler but less scalable than the one found in the LDAP module.
+ *
+ */
+function auth_sync_users ($do_updates=0) {
+    
+    global $CFG;
+    $pcfg = get_config('auth/db');
+
+    ///
+    /// list external users
+    ///
+    $userlist = auth_get_userlist();
+    $quoteduserlist = implode("', '", $userlist);
+    $quoteduserlist = "'$quoteduserlist'";
+
+    ///
+    /// delete obsolete internal users
+    ///
+       
+    // find obsolete users
+    if (count($userlist)) {
+        $sql = 'SELECT u.id, u.username 
+                FROM ' . $CFG->prefix .'user u 
+                WHERE u.auth=\'db\' AND u.deleted=\'0\' AND u.username NOT IN (' . $quoteduserlist . ')';
+    } else {
+        $sql = 'SELECT u.id, u.username 
+                FROM ' . $CFG->prefix .'user u 
+                WHERE u.auth=\'db\' AND u.deleted=\'0\' ';
+    }
+    $remove_users = get_records_sql($sql); 
+
+    if (!empty($remove_users)){
+        print "User entries to remove: ". count($remove_users) . "\n";
+
+        begin_sql();
+        foreach ($remove_users as $user) {
+            //following is copy pasted from admin/user.php
+            //maybe this should moved to function in lib/datalib.php
+            unset($updateuser);
+            $updateuser->id = $user->id;
+            $updateuser->deleted = "1";
+            $updateuser->timemodified = time();
+            if (update_record("user", $updateuser)) {
+                unenrol_student($user->id);  // From all courses
+                remove_teacher($user->id);   // From all courses
+                remove_admin($user->id);
+                notify(get_string("deletedactivity", "", fullname($user, true)) );
+            } else {
+                notify(get_string("deletednot", "", fullname($user, true)));
+            }
+            //copy pasted part ends
+        }     
+        commit_sql();
+    } 
+    unset($remove_users); // free mem!   
+
+    if (!count($userlist)) {
+        // exit right here
+        // nothing else to do
+        return true;
+    }
+
+    ///
+    /// update existing accounts
+    ///
+    if ($do_updates) {
+        // narrow down what fields we need to update
+        $all_keys = array_keys(get_object_vars($pcfg));
+        $updatekeys = array();
+        foreach ($all_keys as $key) {
+            if (preg_match('/^field_updatelocal_(.+)$/',$key, $match)) {
+                if ($pcfg->{$match[0]}) { // if it has a true value
+                    array_push($updatekeys, $match[1]); // the actual key name
+                }
+            }
+        }
+        // print_r($all_keys); print_r($updatekeys);
+        unset($all_keys); unset($key);
+
+        // only go ahead if we actually
+        // have fields to update locally
+        if (!empty($updatekeys)) {
+            $sql = 'SELECT u.id, u.username 
+                    FROM ' . $CFG->prefix .'user u 
+                    WHERE u.auth=\'db\' AND u.deleted=\'0\' AND u.username IN (' . $quoteduserlist . ')';
+            $update_users = get_records_sql($sql);
+        
+            foreach ($update_users as $user) {
+                auth_db_update_user_record($user->username, $updatekeys);
+            }
+            unset($update_users); // free memory
+        }
+    }
+
+
+    ///
+    /// create missing accounts
+    ///
+    // NOTE: this is very memory intensive
+    // and generally inefficient
+    $sql = 'SELECT u.id, u.username 
+            FROM ' . $CFG->prefix .'user u 
+            WHERE u.auth=\'db\' AND u.deleted=\'0\'';
+
+    $users = get_records_sql($sql);
+    
+    // simplify down to usernames
+    $usernames = array();
+    foreach ($users as $user) {
+        array_push($usernames, $user->username);
+    }
+    unset($users);
+
+    $add_users = array_diff($userlist, $usernames);
+    unset($usernames);
+
+    if(!empty($add_users)){
+        print "User entries to add: ". count($add_users). "\n";
+        begin_sql();
+        foreach($add_users as $user){
+            $username = $user;
+            $user = auth_get_userinfo_asobj($user);
+            
+            // prep a few params
+            $user->username  = $username;
+            $user->modified  = time();
+            $user->confirmed = 1;
+            $user->auth      = 'db';
+            
+            // insert it
+            $old_debug=$CFG->debug; 
+            $CFG->debug=10;
+            
+            // maybe the user has been deleted before
+            if ($old_user = get_record('user', 'username', $user->username, 'deleted', 1)) {
+                $user->id = $old_user->id;
+                set_field('user', 'deleted', 0, 'username', $user->username);
+                echo "Revived user $user->username id $user->id\n";
+            } elseif ($id=insert_record ('user',$user)) { // it is truly a new user
+                echo "inserted user $user->username id $id\n";
+                $user->id = $id;
+                // if relevant, tag for password generation
+                if ($CFG->auth_dbpasstype === 'internal') {
+                    set_user_preference('auth_forcepasswordchange', 1, $id);
+                    set_user_preference('create_password',          1, $id);
+                }
+            } else {
+                echo "error inserting user $user->username \n";
+            }
+            $CFG->debug=$old_debug;                        
+        }
+        commit_sql();
+        unset($add_users); // free mem
+    }
+    return true;
+}
+
+function auth_user_exists ($username) {
+    global $CFG;
+    $authdb = &ADONewConnection($CFG->auth_dbtype); 
+    $authdb->PConnect($CFG->auth_dbhost,$CFG->auth_dbuser,$CFG->auth_dbpass,$CFG->auth_dbname); 
+
+    $rs = $authdb->Execute("SELECT * FROM $CFG->auth_dbtable 
+                                 WHERE $CFG->auth_dbfielduser = '$username' ");
+    $authdb->Close();
+
+    if (!$rs) {
+        notify("Could not connect to the specified authentication database...");
+        return false;
+    }
+    
+    if ( $rs->RecordCount() ) {
+        // user exists exterally
+        // check username/password internally
+        // ?? there is no $password variable, so why??
+        /*if ($user = get_record('user', 'username', $username)) {
+            return ($user->password == md5($password));
+        }*/
+        return $rs->RecordCount();
+    } else {
+        // user does not exist externally
+        return false;
+    }  
+}
+
+
+function auth_get_userlist() {
+
+    global $CFG;
+
+    // Connect to the external database
+    $authdb = &ADONewConnection($CFG->auth_dbtype); 
+    $authdb->PConnect($CFG->auth_dbhost,$CFG->auth_dbuser,$CFG->auth_dbpass,$CFG->auth_dbname); 
+
+    // fetch userlist
+    $rs = $authdb->Execute("SELECT $CFG->auth_dbfielduser AS username
+                            FROM   $CFG->auth_dbtable ");
+    $authdb->Close();
+
+    if (!$rs) {
+        notify("Could not connect to the specified authentication database...");
+        return false;
+    }
+    
+    if ( $rs->RecordCount() ) {
+        $userlist = array();
+        while ($rec = $rs->FetchRow()) {
+            array_push($userlist, $rec['username']);
+        }
+        return $userlist;
+    } else {
+        return array();
+    }        
+}
+
+/**
+ * reads userinformation from DB and return it in an object
+ *
+ * @param string $username username
+ * @return array
+ */
+function auth_get_userinfo_asobj($username){
+    $user_array = truncate_userinfo(auth_get_userinfo($username));
+    $user = new object;
+    foreach($user_array as $key=>$value){
+        $user->{$key} = $value;
+    }
+    return $user;
+}
+
+function auth_db_update_user_record($username, $updatekeys=false) {
+/// will update a local user record from an external source. 
+/// is a lighter version of the one in moodlelib -- won't do 
+/// expensive ops such as enrolment
+///
+/// If you don't pass $updatekeys, there is a performance hit and 
+/// values removed from DB won't be removed from moodle. 
+
+    global $CFG;
+
+    $pcfg = get_config('auth/db');
+
+    //just in case check text case
+    $username = trim(moodle_strtolower($username));
+    
+    // get the current user record
+    $user = get_record('user', 'username', $username);
+    if (empty($user)) { // trouble
+        error_log("Cannot update non-existent user: $username");
+        die;
+    }
+
+    if (function_exists('auth_get_userinfo')) {
+        if ($newinfo = auth_get_userinfo($username)) {
+            $newinfo = truncate_userinfo($newinfo);
+            
+            if (empty($updatekeys)) { // all keys? this does not support removing values
+                $updatekeys = array_keys($newinfo);
+            }
+            
+            foreach ($updatekeys as $key){
+                unset($value);
+                if (isset($newinfo[$key])) {
+                    $value = $newinfo[$key];
+                    $value = addslashes(stripslashes($value)); // Just in case
+                } else {
+                    $value = '';
+                }
+                if (!empty($pcfg->{'field_updatelocal_' . $key})) { 
+                       if ($user->{$key} != $value) { // only update if it's changed
+                           set_field('user', $key, $value, 'username', $username);
+                       }
+                }
+            }
+        }
+    }
+    return get_record_select("user", "username = '$username' AND deleted <> '1'");
+}
+
+// A chance to validate form data, and last chance to 
+// do stuff before it is inserted in config_plugin
+function auth_validate_form(&$form, &$err) {
+    
+    // compat until we rework auth a bit
+    if ($form['auth_dbpasstype'] === 'internal') {
+        $CFG->auth_db_stdchangepassword = true;
+        if ($conf = get_record('config', 'name', 'auth_db_stdchangepassword')) {
+            $conf->value = 1;
+            if (! update_record('config', $conf)) {
+                notify("Could not update $name to $value");
+            }
+        } else {
+            $conf = new StdClass;
+            $conf->name = 'auth_db_stdchangepassword';
+            $conf->value = 1;
+            if (! insert_record('config', $conf)) {
+                notify("Error: could not add new variable $name !");
+            }
+        }
+    } else {
+        $CFG->auth_db_stdchangepassword = false;
+        if ($conf = get_record('config', 'name', 'auth_db_stdchangepassword')) {
+            $conf->value = 0;
+            if (! update_record('config', $conf)) {
+                notify("Could not update $name to $value");
+            }
+        } else {
+            $conf = new StdClass;
+            $conf->name = 'auth_db_stdchangepassword';
+            $conf->value = 0;
+            if (! insert_record('config', $conf)) {
+                notify("Error: could not add new variable $name !");
+            }
+        }
+    }
+    return true;
+}
+
+?>

auth/email/lib.php

@@ -7,11 +7,11 @@ function auth_user_login ($username, $password) {
 
     global $CFG;
 
-    if (! $user = get_record('user', 'username', $username)) {
-        return false;
+    if ($user = get_record('user', 'username', $username)) {
+        return validate_internal_user_password($user, $password);
     }
-    
-    return ($user->password == md5($password));
+
+    return false;
 }
 
 

auth/ldap/config.html

@@ -1,71 +1,51 @@
 <?php
     // Initialize vars
-    if (!isset ($config->ldap_host_url)) {
-        $config->ldap_host_url = "";
-    }
-    if (!isset ($config->ldap_contexts)) {
-        $config->ldap_contexts = "";
-    }
-    if (!isset ($config->ldap_user_attribute)) {
-        $config->ldap_user_attribute = "";
-    }
-    if (!isset ($config->ldap_user_type)) {
-        $config->ldap_user_type = "";
-    }
-    if (!isset ($config->ldap_search_sub)) {
-        $config->ldap_search_sub = "";
-    }
-    if (!isset ($config->ldap_opt_deref)) {
-        $config->ldap_opt_deref = "";
-    }
-    if (!isset ($config->ldap_preventpassindb)) {
-        $config->ldap_preventpassindb = 0;
-    }
-    if (!isset ($config->ldap_bind_dn)) {
-        $config->ldap_bind_dn = "";
-    }
-    if (!isset ($config->ldap_bind_pw)) {
-        $config->ldap_bind_pw = "";
-    }
-    if (!isset ($config->ldap_version)) {
-        $config->ldap_version = "2";
-    }
-    if (!isset ($config->ldap_objectclass)) {
-        $config->ldap_objectclass = "";
-    }
-    if (!isset ($config->ldap_memberattribute)) {
-        $config->ldap_memberattribute = "";
-    }
-    if (!isset ($config->ldap_creators)) {
-        $config->ldap_creators = "";
-    }
-    if (!isset ($config->ldap_create_context)) {
-        $config->ldap_create_context = "";
-    }
-    if (!isset ($config->ldap_expiration)) {
-        $config->ldap_expiration = "";
-    }
-    if (!isset ($config->ldap_expiration_warning)) {
-        $config->ldap_expiration_warning = "10";
-    }
-    if (!isset ($config->ldap_expireattr)) {
-        $config->ldap_expireattr = "";
-    }
-    if (!isset ($config->ldap_gracelogins)) {
-        $config->ldap_gracelogins = "";
-    }
-    if (!isset ($config->ldap_graceattr)) {
-        $config->ldap_graceattr = "";
-    }
-    if (!isset ($config->auth_user_create)) {
-        $config->auth_user_create = "";
-    }
-    if (!isset ($config->auth_ldap_forcechangepassword)) {
-        $config->auth_ldap_forcechangepassword = "";
-    }
-    if (!isset ($config->auth_ldap_stdchangepassword)) {
-        $config->auth_ldap_stdchangepassword = false;
-    }
+    if (!isset($config->ldap_host_url)) 
+        { $config->ldap_host_url = ''; }
+    if (!isset($config->ldap_contexts)) 
+        { $config->ldap_contexts = ''; }
+    if (!isset($config->ldap_user_type)) 
+        { $config->ldap_user_type = ''; }
+    if (!isset($config->ldap_user_attribute)) 
+        { $config->ldap_user_attribute = ''; }
+    if (!isset($config->ldap_search_sub)) 
+        { $config->ldap_search_sub = ''; }
+    if (!isset($config->ldap_opt_deref)) 
+        { $config->ldap_opt_deref = ''; }
+    if (!isset($config->ldap_preventpassindb)) 
+        { $config->ldap_preventpassindb = 0; } 
+    if (!isset($config->ldap_bind_dn)) 
+        {$config->ldap_bind_dn = ''; }
+    if (!isset($config->ldap_bind_pw)) 
+        {$config->ldap_bind_pw = ''; }
+    if (!isset($config->ldap_version)) 
+        {$config->ldap_version = '2'; }
+    if (!isset($config->ldap_objectclass)) 
+        {$config->ldap_objectclass = ''; }
+    if (!isset($config->ldap_memberattribute)) 
+        {$config->ldap_memberattribute = ''; }
+    if (!isset($config->ldap_creators)) 
+        {$config->ldap_creators = ''; }
+    if (!isset($config->ldap_create_context)) 
+        {$config->ldap_create_context = ''; }
+    if (!isset($config->ldap_expiration)) 
+        {$config->ldap_expiration = ''; }
+    if (!isset($config->ldap_expiration_warning)) 
+        {$config->ldap_expiration_warning = '10'; }
+    if (!isset($config->ldap_expireattr)) 
+        {$config->ldap_expireattr = ''; }
+    if (!isset($config->ldap_gracelogins)) 
+        {$config->ldap_gracelogins = ''; }
+    if (!isset($config->ldap_graceattr)) 
+        {$config->ldap_graceattr = ''; }
+    if (!isset($config->auth_user_create)) 
+        {$config->auth_user_create = ''; }
+    if (!isset($config->auth_ldap_forcechangepassword)) 
+        {$config->auth_ldap_forcechangepassword = false; }
+    if (!isset($config->auth_ldap_stdchangepassword))
+        {$config->auth_ldap_stdchangepassword = false; }
+
+    $yesno = array( get_string('no'), get_string('yes') );
     
 if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
     print '<tr><td><p align="center"><font color="red"><strong>Warning:
@@ -80,10 +60,10 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
    </td>
 </tr>
 
-                <tr valign="top" class="required">
+<tr valign="top" class="required">
     <td align="right">ldap_host_url:</td>
     <td>
-        <input name="ldap_host_url" type="text" size="30" value="<?php echo $config->ldap_host_url?>">
+        <input name="ldap_host_url" type="text" size="30" value="<?php echo $config->ldap_host_url?>" />
     <?php  if (isset($err["ldap_host_url"])) formerr($err["ldap_host_url"]); ?>
     </td>
     <td>
@@ -129,7 +109,7 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
 <tr valign="top" class="required">
     <td align="right">ldap_bind_dn:</td>
     <td>
-    <input name="ldap_bind_dn" type="text" size="30" value="<?php echo $config->ldap_bind_dn?>">
+    <input name="ldap_bind_dn" type="text" size="30" value="<?php echo $config->ldap_bind_dn?>" />
     <?php  if (isset($err["ldap_bind_dn"])) formerr($err["ldap_bind_dn"]); ?>
     </td><td>
     <?php  print_string("auth_ldap_bind_dn","auth") ?>
@@ -139,7 +119,7 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
 <tr valign="top" class="required">
     <td align="right">ldap_bind_pw:</td>
     <td>
-    <input name="ldap_bind_pw" type="password" size="30" value="<?php echo $config->ldap_bind_pw?>">
+    <input name="ldap_bind_pw" type="password" size="30" value="<?php echo $config->ldap_bind_pw?>" />
     <?php  if (isset($err["ldap_bind_pw"])) formerr($err["ldap_bind_pw"]); ?>
     </td><td>
     <?php  print_string("auth_ldap_bind_pw","auth") ?>
@@ -166,7 +146,7 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
 <tr valign="top" class="required">
     <td align="right">ldap_contexts:</td>
     <td>
-    <input name="ldap_contexts" type="text" size="30" value="<?php echo $config->ldap_contexts?>">
+    <input name="ldap_contexts" type="text" size="30" value="<?php echo $config->ldap_contexts?>" />
     <?php  if (isset($err["ldap_contexts"])) formerr($err["ldap_contexts"]); ?>
     </td>
     <td>
@@ -209,7 +189,7 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
 <tr valign="top" class="required">
     <td align="right">ldap_user_attribute:</td>
     <td>
-    <input name="ldap_user_attribute" type="text" size="30" value="<?php echo $config->ldap_user_attribute?>">
+    <input name="ldap_user_attribute" type="text" size="30" value="<?php echo $config->ldap_user_attribute?>" />
     <?php  if (isset($err["ldap_user_attribute"])) formerr($err["ldap_user_attribute"]); ?>
     </td>
     <td>
@@ -220,7 +200,7 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
 <tr valign="top" class="required">
         <td align="right">ldap_memberattribute:</td>
         <td>
-    <input name="ldap_memberattribute" type="text" size="30" value="<?php echo $config->ldap_memberattribute?>">
+    <input name="ldap_memberattribute" type="text" size="30" value="<?php echo $config->ldap_memberattribute?>" />
     <?php  if (isset($err["ldap_memberattribute"])) formerr($err["ldap_memberattribute"]); ?>
     </td><td>
     <?php  print_string("auth_ldap_memberattribute","auth") ?>
@@ -230,7 +210,7 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
 <tr valign="top" class="required">
     <td align="right">ldap_objectclass:</td>
     <td>
-    <input name="ldap_objectclass" type="text" size="30" value="<?php echo $config->ldap_objectclass?>">
+    <input name="ldap_objectclass" type="text" size="30" value="<?php echo $config->ldap_objectclass?>" />
     <?php  if (isset($err["ldap_objectclass"])) formerr($err["ldap_objectclass"]); ?>
     </td>
     <td>
@@ -253,7 +233,7 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
             <?php  print_string("no")  ?></option>
         <option value="1" <?php echo ($config->auth_ldap_forcechangepassword ? 'selected="yes"' : '') ?> >
             <?php  print_string("yes") ?></option>
-    </select><br>
+    </select><br />
  
     </td>
     <td align="left" valign="top">
@@ -270,7 +250,7 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
             <?php  print_string("no")  ?></option>
         <option value="1" <?php echo ($config->auth_ldap_stdchangepassword ? 'selected="yes"' : '') ?> >
             <?php  print_string("yes") ?></option>
-    </select><br>
+    </select><br />
 
     </td>
     <td align="left" valign="top">
@@ -304,7 +284,7 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
 <tr valign="top" class="required">
     <td align="right">ldap_expiration_warning:</td>
     <td>
-    <input name="ldap_expiration_warning" type="text" size="2" value="<?php echo $config->ldap_expiration_warning?>">
+    <input name="ldap_expiration_warning" type="text" size="2" value="<?php echo $config->ldap_expiration_warning?>" />
     <?php   if (isset($err["ldap_expiration_warning"])) formerr($err["ldap_expiration_warning"]); 
     ?>
     </td>
@@ -316,7 +296,7 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
 <tr valign="top" class="required">
     <td align="right">ldap_exprireattr:</td>
     <td>
-    <input name="ldap_expireattr" type="text" size="30" value="<?php echo $config->ldap_expireattr?>">
+    <input name="ldap_expireattr" type="text" size="30" value="<?php echo $config->ldap_expireattr?>" />
     <?php  if (isset($err["ldap_expireattr"])) formerr($err["ldap_expireattr"]); 
     ?>
     </td>
@@ -343,7 +323,7 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
 <tr valign="top" class="required">
     <td align="right">ldap_graceattr:</td>
     <td>
-    <input name="ldap_graceattr" type="text" size="30" value="<?php echo $config->ldap_graceattr?>">
+    <input name="ldap_graceattr" type="text" size="30" value="<?php echo $config->ldap_graceattr?>" />
     <?php   if (isset($err["ldap_graceattr"])) formerr($err["ldap_graceattr"]); 
     ?>
     </td>
@@ -364,7 +344,7 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
 <tr valign="top" class="required">
     <td align="right">ldap_create_context:</td>
     <td>
-    <input name="ldap_create_context" type="text" size="30" value="<?php echo $config->ldap_create_context?>">
+    <input name="ldap_create_context" type="text" size="30" value="<?php echo $config->ldap_create_context?>" />
     <?php  if (isset($err["ldap_create_context"])) formerr($err["ldap_create_context"]); ?>
     </td><td>
     <?php  print_string("auth_ldap_create_context","auth") ?>
@@ -381,7 +361,7 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
 <tr valign="top" class="required">
         <td align="right">ldap_creators:</td>
         <td>
-    <input name="ldap_creators" type="text" size="30" value="<?php echo $config->ldap_creators?>">
+    <input name="ldap_creators" type="text" size="30" value="<?php echo $config->ldap_creators?>" />
     <?php  if (isset($err["ldap_creators"])) formerr($err["ldap_creators"]); ?>
     </td><td>
     <?php  print_string("auth_ldap_creators","auth") ?>

auth/ldap/lib.php

@@ -127,16 +127,26 @@ function auth_get_userinfo($username){
             $ldapval = NULL;
             foreach ($values as $value) {
                 if(is_array($user_entry[0][strtolower($value)])) {
-                    $newval = addslashes(stripslashes(utf8_decode($user_entry[0][strtolower($value)][0])));
+                    if (!empty($CFG->unicodedb)) {
+                        $newval = addslashes(stripslashes($user_entry[0][strtolower($value)][0]));
+                    } else {
+                        $newval = addslashes(stripslashes(utf8_decode($user_entry[0][strtolower($value)][0])));
+                    }
                 }
                 else {
-                    $newval = addslashes(stripslashes(utf8_decode($user_entry[0][strtolower($value)])));
+                    if (!empty($CFG->unicodedb)) {
+                        $newval = addslashes(stripslashes($user_entry[0][strtolower($value)]));
+                    } else {
+                        $newval = addslashes(stripslashes(utf8_decode($user_entry[0][strtolower($value)])));
+                    }
                 }
                 if (!empty($newval)) { // favour ldap entries that are set
                     $ldapval = $newval;
                 } 
             }
-            $result[$key] = $ldapval;
+            if (!is_null($ldapval)) {
+                $result[$key] = $ldapval;
+            }
         }
     }
 
@@ -206,7 +216,11 @@ function auth_user_create ($userobject,$plainpass) {
         }
         foreach ($values as $value) {
             if(!empty($userobject->$key) ){
-                $newuser[$value]=utf8_encode($userobject->$key);
+                if (!empty($CFG->unicodedb)) {
+                    $newuser[$value]= $userobject->$key;
+                } else {
+                    $newuser[$value]=utf8_encode($userobject->$key);
+                }
             }
         }
     }
@@ -826,7 +840,7 @@ function auth_user_update($olduser, $newuser) {
     if ($user_info_result){
 
         $user_entry = auth_ldap_get_entries($ldapconnection, $user_info_result);
-        if (count($user_entry)) {
+        if (count($user_entry) > 1) {
             trigger_error("ldap: Strange! More than one user record found in ldap. Only using the first one.");
         }
         $user_entry = $user_entry[0];

auth/manual/lib.php

@@ -6,7 +6,7 @@ function auth_user_login ($username, $password) {
 // Returns true if the username and password work
 
     if ($user = get_record('user', 'username', $username)) {
-        return ($user->password == md5($password));
+        return validate_internal_user_password($user, $password);
     }
 
     return false;

auth/none/lib.php

@@ -6,7 +6,7 @@ function auth_user_login ($username, $password) {
 // Returns true if the username and password work
 
     if ($user = get_record('user', 'username', $username)) {
-        return ($user->password == md5($password));
+        return validate_internal_user_password($user, $password);
     }
 
     return true;

auth/radius/config.html

@@ -0,0 +1,61 @@
+<?PHP  // $Id: config.html
+
+if ((!include_once('Auth/RADIUS.php')) or (!class_exists(Auth_RADIUS_PAP))) { // Is Auth/RADIUS really there?
+    print '<p align="center"><font color="red"><strong>Warning: The Auth_RADIUS module does not seem to be present. Please ensure it is installed and enabled.</strong></font></p>';
+} 
+   if (!isset($config->auth_radiushost)) {
+        $config->auth_radiushost = "127.0.0.1";
+    }
+    if (!isset($config->auth_radiusnasport)) {
+        $config->auth_radiusport = "0";
+    }
+    if (!isset($config->auth_radiussecret)) {
+        $config->auth_radiussecret = "";
+    }
+?>
+<tr valign="top" >
+        <td align="right"><P>auth_radiushost:</td>
+        <td>
+        <input name="auth_radiushost" type="text" size="30" value="<?php echo $config->auth_radiushost?>">
+        <?php  if (isset($err["auth_radiushost"]))
+        formerr($err["auth_radiushost"]); ?>
+        </td>
+    <td>
+    <?php  print_string("auth_radiushost","auth") ?>
+     </td>
+</TR>
+
+<TR valign="top" >
+        <td align="right"><P>auth_radiusnasport:</td>
+        <td>
+    <input name="auth_radiusport" type="text" size="6" value="<?php echo $config->auth_radiusport ?>">
+    <?php  if (isset($err["auth_radiusnasport"])) formerr($err["auth_radiusnasport"]); ?>
+    </td>
+    <td>
+    <?php  print_string("auth_radiusnasport","auth") ?>
+    </td>
+</TR>
+
+<TR valign="top" >
+        <td align="right"><P>auth_radiussecret:</td>
+        <td>
+    <input name="auth_radiussecret" type="text" size="6" value="<?php echo $config->auth_radiussecret ?>">
+    <?php  if (isset($err["auth_radiussecret"])) formerr($err["auth_radiussecret"]); ?>     </td>
+    <td>
+    <?php  print_string("auth_radiussecret","auth") ?>
+    </td>
+</TR>
+
+<TR valign="top">
+        <td align="right"><P><?php  print_string("instructions", "auth")
+?>:</td>
+        <td>
+    <textarea name="auth_instructions" cols="30" rows="10" wrap="virtual"><?php
+p($config->auth_instructions) ?></textarea>
+    </td>
+    <td>
+    <?php  print_string("authinstructions","auth") ?>
+    <?php  helpbutton("text", get_string("helptext")) ?>
+    </td>
+</TR>
+

auth/radius/lib.php

@@ -0,0 +1,50 @@
+<?PHP  // $Id$
+       // Authentication by looking up a RADIUS server
+       // Contributed by Clive Gould <clive@ce.bromley.ac.uk>
+
+function auth_user_login ($username, $password) {
+    // Returns true if the username and password work
+    // and false if they are wrong or don't exist.
+    
+    require_once 'Auth/RADIUS.php';
+    
+    global $CFG;
+    
+    // Added by Clive on 7th May for test purposes
+    // printf("Username: $username <br>");
+    // printf("Password: $password <br>");
+    // printf("auth_radiushost: $CFG->auth_radiushost <br>");
+    // printf("auth_radiusnasport: $CFG->auth_radiusnasport <br>");
+    // printf("auth_radiussecret: $CFG->auth_radiussecret <br>");
+    
+    $rauth = new Auth_RADIUS_PAP($username, $password);
+    $rauth->addServer($CFG->auth_radiushost, $CFG->auth_radiusnasport, $CFG->auth_radiussecret);
+    
+    if (!$rauth->start()) {
+        printf("Radius start: %s<br>\n", $rauth->getError());
+        exit;
+    }
+    
+    $result = $rauth->send();
+    if (PEAR::isError($result)) {
+        printf("Radius send failed: %s<br>\n", $result->getMessage());
+        exit;
+    } else if ($result === true) {
+        // printf("Radius Auth succeeded<br>\n");
+        return true;
+    } else {
+        // printf("Radius Auth rejected<br>\n");
+        return false;
+    }
+    
+    // get attributes, even if auth failed
+    if (!$rauth->getAttributes()) {
+        printf("Radius getAttributes: %s<br>\n", $rauth->getError());
+    } else {
+        $rauth->dumpAttributes();
+    }
+    
+    $rauth->close();
+}
+?>
+

auth/shibboleth/.htaccess

@@ -1,7 +0,0 @@
-# Requires a Shibboleth session
-# Be sure to read moodle/auth/shibboleth/README.txt for instructions
-# on how to configure Moodle for Shibboleth authentication
-AuthType shibboleth
-ShibRequireSession Off
-require shibboleth
-

auth/shibboleth/README.txt

@@ -2,7 +2,6 @@ Shibboleth Authentication for Moodle
 -------------------------------------------------------------------------------
 
 Requirements:
-- Moodle 1.5 or later
 - Shibboleth target 1.1 or later. See documentation for your Shibboleth 
   federation on how to set up Shibboleth.
 
@@ -12,21 +11,20 @@ Changes:
 - 05. 2005: Various extensions and fixes by Lukas Haemmerle
 - 06. 2005: Adaptions to new field locks and plugin config structures by Marting
             Langhoff and Lukas Haemmerle
+- 10. 2005: Added better error messages and moved text to language directories
+- 02. 2006: Simplified authentication so that authorization works properly
+            Added instructions for IIS
+            
+
 
 Moodle Configuration with Dual login
 -------------------------------------------------------------------------------
-1. Ensure that the .htaccess file in moodle/auth/shibboleth/ is active
-   It may be possible that you have to change the configuration of your web 
-   server to allow .htaccess files to override certain settings. Alternatively,
-   you also could define the rules from the .htaccess file in the web server
-   configuration file.
-
-2. Protect the file moodle/auth/shibboleth/shib-protected.php with Shibboleth.
-   This page just needs to redirect the users to moodle/auth/shibboleth/ 
-   For Apache you have to define a rule like the following:
+1. Protect the directory moodle/auth/shibboleth/ with Shibboleth.
+   The page index.php in that directory actually logs in a Shibboleth user. 
+   For Apache you have to define a rule like the following in the Apache config:
 
 --
-<Location ~  "/auth/shibboleth/shib-protected.php">
+<Location ~  "/auth/shibboleth">
         AuthType shibboleth
         ShibRequireSession On
         require valid-user
@@ -36,10 +34,14 @@ Moodle Configuration with Dual login
    To restrict access to Moodle, replace the access rule 'require valid-user' 
    with something that fits your needs, e.g. 'require affiliation student'.
 
-3. As Moodle admin, go to the 'Administrations >> Users >> Authentication 
+   For IIS you have protect the auth/shibboleth directory directly in the 
+   RequestMap of the Shibboleth configuration file (shibboleth.xml). See
+   https://authdev.it.ohio-state.edu/twiki/bin/view/Shibboleth/xmlaccesscontrol?topic=XMLAccessControl
+
+2. As Moodle admin, go to the 'Administrations >> Users >> Authentication 
    Options' and select the 'Shibboleth' authentication method from the pop-up.
    
-4. Fill in the fields of the form. The fields 'Username', 'First name', 
+3. Fill in the fields of the form. The fields 'Username', 'First name', 
    'Surname', etc should contain the name of the environment variables of the 
    Shibboleth attributes that you want to map onto the corresponding Moodle 
    variable (e.g. 'HTTP_SHIB_PERSON_SURNAME' for the person's last name, refer 
@@ -58,47 +60,45 @@ Moodle Configuration with Dual login
    lengths for each field in the user profile.
    #############################################################################
 
-5. The large text field 'Instructions' must contain a link to the 
-   moodle/auth/shibboleth/shib-protected.php file which is protected by 
-   Shibboleth (see step 2) and causes the Shibboleth login procedure to start. 
-   You also coudl use HTML code in that field, e.g. to create your own 
+4. The large text field 'Instructions' must contain a link to the 
+   moodle/auth/shibboleth/index.php file which is protected by 
+   Shibboleth (see step 1) and causes the Shibboleth login procedure to start. 
+   You could also use HTML code in that field, e.g. to create your own 
    Shibboleth login button.
 
-6. Save the changes for the Shibboleth authentication method.
+5. Save the changes for the Shibboleth authentication method.
 
 Moodle Configuration with Shibboleth only login
 -------------------------------------------------------------------------------
 If you want Shibboleth as your only authentication method, configure Moodle as
 described in the dual login section above and do the following steps:
 
-5.a  On the Moodle Shibboleth settings page, set the 'Alternate Login URL' to 
-     the URL of the file 'moodle/auth/shibboleth/shib-protected.php'
+4.a  On the Moodle Shibboleth settings page, set the 'Alternate Login URL' to 
+     the URL of the file 'moodle/auth/shibboleth/index.php'
      This will enforce Shibboleth login.
 
 How the Shibboleth authentication works
 --------------------------------------------------------------------------------
-For a user to get Shibboleth authenticated in Moodle he first must go to the 
-Shibboleth-protected page shib-protected.php. If Shibboleth authentication is
-enabled this happens automatically when a user wants to login.
-Otherwise the user has to click on the link on the login page you provided in 
-step 5.
+To get Shibboleth authenticated in Moodle a user basically must access the 
+Shibboleth-protected page /auth/shibboleth/index.php. If Shibboleth is the only 
+authentication method (see 4.a), this happens automatically when a user wants to 
+login in Moodle. Otherwise, the user has to click on the link on the login page 
+you provided in step 4.
 
-If the user is successfully Shibboleth authenticated he is redirected to
-moodle/auth/shibboleth where he also gets authenticated in Moodle. 
 Moodle basically checks whether the Shibboleth attribute that you mapped
-as the username is present. This attribute is only present if a user is 
+as the username is present. This attribute should only be present if a user is 
 Shibboleth authenticated.
 
 If the user's Moodle account has not existed yet, it gets automatically created.
-Unless the user's firstname, last name and email address is provided, the user 
-is automatically redirected to the edit profile page by Moodle.
 
 To prevent that every Shibboleth user can access your Moodle site you have to
-adapt the 'require valid-user' line in your webserver's config  (see step 2) to 
-allow only specific users. 
+adapt the 'require valid-user' line in your webserver's config  (see step 1) to 
+allow only specific users. If you defined some authorization rules in step 1,
+these are checked by Shibboleth itself. Only users who met these rules 
+actually can access /auth/shibboleth/index.php and get logged in.
 
 You can use Shibboleth AND another authentication method (it was tested with 
-manual login only). So if there are a few users that don't have a Shibboleth 
+manual login). So, if there are a few users that don't have a Shibboleth 
 login, you could create manual accounts for them and they could use the manual 
 login. For other authentication methods you first have to configure them and 
 then set Shibboleth as your authentication method. Users can log in only via one 
@@ -107,18 +107,17 @@ authentication method unless they have two accounts in Moodle.
 Shibboleth dual login with custom login page
 --------------------------------------------------------------------------------
 Of course you can create a dual login page that better fits your needs. For this 
-to work you have to set up the two authentication methods (e.g. 'Manual' and 
-'Shibboleth', Shibboleth has to be the current authentication method) and 
-specify an alternate login link to your own dual login page. On that page you 
-basically need a link to the Shibboleth-protected page
-('moodle/auth/shibboleth/shib-protected.php') for the Shibboleth login and a 
+to work, you have to set up the two authentication methods (e.g. 'Manual' and 
+'Shibboleth') and specify an alternate login link to your own dual login page. 
+On that page you basically need a link to the Shibboleth-protected page
+('/auth/shibboleth/index.php') for the Shibboleth login and a 
 form that sends 'username' and 'password' to moodle/login/index.php.
 Consult the Moodle documentation for further instructions and requirements.
 
-How to customize the way the Shibboleth user data is used in ILIAS
+How to customize the way the Shibboleth user data is used in Moodle
 --------------------------------------------------------------------------------
 Among the Shibboleth settings in Moodle there is a field that should contain a
-path to a php file that can be used as data manipulation API.
+path to a php file that can be used as data manipulation hook.
 You can use this if you want to further process the way your Shibboleth
 attributes are used in Moodle. 
 
@@ -131,11 +130,11 @@ Example 2: The country, city and street are provided in one Shibboleth attribute
            and you want these values to be used in the Moodle user profile. So
            You have to parse the corresponding attribute to fill the user fields.
 
-If you want to use this API you have to be a skilled PHP programmer. It is 
+If you want to use this hook you have to be a skilled PHP programmer. It is 
 strongly recommended that you take a look at the file 
 moodle/auth/shibboleth/lib.php, especially the function 'auth_get_userinfo' 
-where this API file is included. 
-The context of the API file is the same as within this login function. So you
+where this file is included. 
+The context of the file is the same as within this login function. So you
 can directly edit the object $result.
 
 Example file:
@@ -151,7 +150,6 @@ Example file:
         // institution, street, zipcode, city and country
         $address = $_SERVER[$pluginconfig->field_map_address];
         list($institution, $street, $zip_city) = split('\$', $address);
-        
         ereg(' (.+)',$zip_city, $regs);
         $city = $regs[1];
         
@@ -168,8 +166,7 @@ Example file:
 
 Bugs
 --------------------------------------------------------------------------------
-The current implementation has not yet been extensively tested. So there may be
-bugs. Please send bug reports concerning the Shibboleth part to 
+Please send bug reports concerning the Shibboleth part to 
 Lukas Haemmerle <haemmerle@switch.ch>
 
 --------------------------------------------------------------------------------

auth/shibboleth/config.html

@@ -3,7 +3,7 @@
     $pluginconfig   = get_config('auth/shibboleth');
 
     if (!isset($config->auth_instructions) or empty($pluginconfig->shib_user_attribute)) {
-        $config->auth_instructions = get_string('auth_shib_instructions', 'auth', $CFG->wwwroot.'/auth/shibboleth/shib-protected.php');
+        $config->auth_instructions = get_string('auth_shib_instructions', 'auth', $CFG->wwwroot.'/auth/shibboleth/index.php');
     }
 
     if (!isset ($pluginconfig->user_attribute)) {
@@ -37,7 +37,7 @@
     <textarea name="auth_instructions" cols="30" rows="10" wrap="virtual"><?php  p($config->auth_instructions) ?></textarea> 
     </td>
     <td>
-    <?php  print_string("auth_shib_instructions_help","auth", htmlspecialchars($CFG->wwwroot.'/auth/shibboleth')) ?>
+    <?php  print_string("auth_shib_instructions_help","auth", htmlspecialchars($CFG->wwwroot.'/auth/shibboleth/index.php')) ?>
     <?php  helpbutton("text", get_string("helptext")) ?>
     </td>
 </tr>

auth/shibboleth/index.php

@@ -4,16 +4,25 @@
     require('../../config.php');
     require('lib.php');
 
-    if (isloggedin()) {      // Nothing to do
-        redirect($CFG->wwwroot.'/index.php');
+    if (isloggedin() && $USER->username != 'guest') {      // Nothing to do
+        if (isset($SESSION->wantsurl) and (strpos($SESSION->wantsurl, $CFG->wwwroot) === 0)){
+            $urltogo = $SESSION->wantsurl;    /// Because it's an address in this site
+            unset($SESSION->wantsurl);
+
+        } else {
+            $urltogo = $CFG->wwwroot.'/';      /// Go to the standard home page
+            unset($SESSION->wantsurl);         /// Just in case
+        }
+        
+        redirect($urltogo);
     }
 
     $pluginconfig   = get_config('auth/shibboleth');
 
     // Check whether Shibboleth is configured properly
     if (empty($pluginconfig->shib_user_attribute)) {
-        error('Shibboleth authentication (\'shib_user_attribute\') is not set up correctly. You probably haven\'t yet configured the Shibboleth authentication. Please consult the README in moodle/auth/shibboleth for further instructions on how to set up Shibboleth authentication.');
-    }
+        error(get_string( 'shib_not_set_up_error', 'auth'));
+     }
 
 /// If we can find the Shibboleth attribute, save it in session and return to main login page
     if (!empty($_SERVER[$pluginconfig->shib_user_attribute])) {    // Shibboleth auto-login
@@ -51,9 +60,13 @@
             redirect($urltogo);
         }
     }
-
-    $SESSION->shibboleth_checked = true;   // This will stop us bouncing back here
-
-    redirect($CFG->wwwroot.'/login/index.php');
+    
+    // If we can find any (user independent) Shibboleth attributes but no user 
+    // attributes we probably didn't receive any user attributes
+    elseif (!empty($_SERVER['HTTP_SHIB_APPLICATION_ID'])){
+        error(get_string( 'shib_no_attributes_error', 'auth' , '\''.$pluginconfig->shib_user_attribute.'\', \''.$pluginconfig->field_map_firstname.'\', \''.$pluginconfig->field_map_lastname.'\' and \''.$pluginconfig->field_map_email.'\''));
+    } else {
+         error(get_string( 'shib_not_set_up_error', 'auth'));
+    }
 
 ?>

auth/shibboleth/lib.php

@@ -1,6 +1,7 @@
 <?PHP  // $Id$
 //CHANGELOG:
 //28.10.2004 SHIBBOLETH Authentication functions v.0.1
+//2005-2006 Various extensions and fixes by Lukas Haemmerle
 //Distributed under GPL (c)Markus Hagman 2004-
 
 function auth_user_login($username, $password) {
@@ -8,18 +9,14 @@ function auth_user_login($username, $password) {
 
     $pluginconfig   = get_config('auth/shibboleth');
     
-/// If we are in the shibboleth directory then we trust the server var
+    // If we are in the shibboleth directory then we trust the server var
     if (!empty($_SERVER[$pluginconfig->shib_user_attribute])) {
         return ($_SERVER[$pluginconfig->shib_user_attribute] == $username);
-    }    
-
-/// If we are not, then the server is probably set to not be Shibboleth-only
-/// and the user has used the normal login screen, so we redirect to the shibboleth
-/// directory for a proper check
-    redirect($CFG->wwwroot.'/auth/shibboleth/index.php');
-
-/// There's no point doing anything further here
-    exit;
+    } else {
+    // If we are not, the user has used the manual login and the login name is
+    // unknown, so we return false.
+        return false;
+    }
 }
 
 function auth_get_userinfo($username) {
@@ -35,7 +32,7 @@ function auth_get_userinfo($username) {
         || empty($_SERVER[$pluginconfig->field_map_lastname])
         || empty($_SERVER[$pluginconfig->field_map_email])
         ) {
-        error("Moodle needs certain Shibboleth attributes which are not present in your case. The attributes are: '".$pluginconfig->shib_user_attribute."' ('".$_SERVER[$pluginconfig->shib_user_attribute]."'), '".$pluginconfig->field_map_firstname."' ('".$_SERVER[$pluginconfig->field_map_firstname]."'), '".$pluginconfig->field_map_lastname."' ('".$_SERVER[$pluginconfig->field_map_lastname]."') and '".$pluginconfig->field_map_email."' ('".$_SERVER[$pluginconfig->field_map_email]."')<br>Please contact your Identity Service Provider.");
+        error(get_string( 'shib_not_all_attributes_error', 'auth' , "'".$pluginconfig->shib_user_attribute."' ('".$_SERVER[$pluginconfig->shib_user_attribute]."'), '".$pluginconfig->field_map_firstname."' ('".$_SERVER[$pluginconfig->field_map_firstname]."'), '".$pluginconfig->field_map_lastname."' ('".$_SERVER[$pluginconfig->field_map_lastname]."') and '".$pluginconfig->field_map_email."' ('".$_SERVER[$pluginconfig->field_map_email]."')"));
     }
 
     $attrmap = auth_shib_attributes();
@@ -44,10 +41,14 @@ function auth_get_userinfo($username) {
     $search_attribs = array();
   
     foreach ($attrmap as $key=>$value) {
-        $result[$key]=utf8_decode($_SERVER[$value]);
+        if (!empty($CFG->unicodedb)) {
+            $result[$key]=get_first_string($_SERVER[$value]);
+        } else {
+            $result[$key]=utf8_decode(get_first_string($_SERVER[$value]));
+        }
     }
 
-    // Provide an API to modify the information to fit the Moodle internal
+     // Provide an API to modify the information to fit the Moodle internal
     // data representation
     if (   
           $pluginconfig->convert_data 
@@ -59,15 +60,14 @@ function auth_get_userinfo($username) {
         // modify the variable $moodleattributes
         include($pluginconfig->convert_data);
     }
-
+    
     return $result;
 }
 
 function auth_shib_attributes(){
 //returns array containg attribute mappings between Moodle and shibboleth
-	global $CFG;
+    global $CFG;
 
-    $config = (array)$CFG;
     $pluginconfig   = get_config('auth/shibboleth');
     $pluginconfig   = (array) $pluginconfig;
 
@@ -81,8 +81,19 @@ function auth_shib_attributes(){
             $moodleattributes[$field] = $pluginconfig["field_map_$field"];
         }
     }
-    $moodleattributes['username']=$config["shib_user_attribute"];
+    $moodleattributes['username']=$pluginconfig["shib_user_attribute"];
 
-	return $moodleattributes;
+    return $moodleattributes;
 }
+
+
+function get_first_string($string){
+// Cleans and returns first of potential many values (multi-valued attributes)
+
+    $list = split( ';', $string);
+    $clean_string = rtrim($list[0]);
+
+    return $clean_string;
+}
+
 ?>

auth/shibboleth/shib-protected.php

@@ -1,7 +0,0 @@
-<?php
-// This file must be Shibboleth protected
-// Consult the README for further instructions
-
-require_once("../../config.php");
-header("Location: ".$CFG->wwwroot."/auth/shibboleth/");
-?>

backup/backup.php

@@ -17,13 +17,7 @@
 
     if (!empty($id)) {
         if (!isteacheredit($id)) {
-            if (empty($to)) {
-                error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
-            } else {
-                if (!isteacheredit($to)) {
-                    error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
-                }
-            }
+            error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
         }
     } else {
         if (!isadmin()) {
@@ -31,6 +25,12 @@
         }
     }
 
+    if (!empty($to)) {
+        if (!isteacheredit($to)) {
+            error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
+        }
+    }
+
     //Check site
     if (!$site = get_site()) {
         error("Site not found!");
@@ -116,6 +116,10 @@
 
     //Call the form, depending the step we are
     if (!$launch) {
+        // if we're at the start, clear the cache of prefs
+        if (isset($SESSION->backupprefs[$course->id])) {
+            unset($SESSION->backupprefs[$course->id]);
+        }
         include_once("backup_form.html");
     } else if ($launch == "check") {
         include_once("backup_check.html");
@@ -124,7 +128,7 @@
     }
     print_simple_box_end();
 
-    //Print footer  
+    //Print footer
     print_footer();
 
 ?>

backup/backup_check.html

@@ -20,47 +20,16 @@
         }
     }
 
+    
+
+    $backupprefs = new StdClass;
+    $count = 0;
+    backup_fetch_prefs_from_request($backupprefs,$count,$course);
 
     //Check site
     if (!$site = get_site()) {
         error("Site not found!");
     }
-
-   //Checks for the required files/functions to backup every mod
-    //And check if there is data about it
-    $count = 0;
-    if ($allmods = get_records("modules") ) {
-        foreach ($allmods as $mod) {
-            $modname = $mod->name;
-            $modfile = "$CFG->dirroot/mod/$modname/backuplib.php";
-            $modbackup = $modname."_backup_mods";
-            $modcheckbackup = $modname."_check_backup_mods";
-            if (file_exists($modfile)) {
-               include_once($modfile);
-               if (function_exists($modbackup) and function_exists($modcheckbackup)) {
-                   $var = "exists_".$modname;
-                   $$var = true;
-                   $count++;
-               }
-            }
-            //Check data
-            //Check module info
-            $var = "backup_".$modname;
-            $$var = optional_param( $var,0);
-            //Check include user info
-            $var = "backup_user_info_".$modname;
-            $$var = optional_param( $var,0);
-        }
-    }
-
-    //Check other parameters
-    $backup_metacourse = optional_param('backup_metacourse',1);
-    $backup_users = optional_param('backup_users',1);
-    $backup_logs = optional_param('backup_logs',0);
-    $backup_user_files = optional_param('backup_user_files',1);
-    $backup_course_files = optional_param('backup_course_files',1);
-    $backup_messages = optional_param('backup_messages',1);
-
     if ($count == 0) {
         notice("No backupable modules are installed!");
     }
@@ -70,46 +39,6 @@
 <table cellpadding="5">
 <?php
 
-    //Calculate the backup string
-
-    //Calculate the backup word
-    //Take off some characters in the filename !!
-    $takeoff = array(" ", ":", "/", "\\", "|");
-    $backup_word = str_replace($takeoff,"_",strtolower(get_string("backupfilename")));
-    //If non-translated, use "backup"
-    if (substr($backup_word,0,1) == "[") {
-        $backup_word= "backup";
-    }
-
-    //Calculate the date format string
-    $backup_date_format = str_replace(" ","_",get_string("backupnameformat"));
-    //If non-translated, use "%Y%m%d-%H%M"
-    if (substr($backup_date_format,0,1) == "[") {
-        $backup_date_format = "%%Y%%m%%d-%%H%%M";
-    }
-
-    //Calculate the shortname
-    $backup_shortname = clean_filename($course->shortname);
-    if (empty($backup_shortname) or $backup_shortname == '_' ) {
-        $backup_shortname = $course->id;
-    }
-
-    //Calculate the final backup filename
-    //The backup word
-    $backup_name = $backup_word."-";
-    //The shortname
-    $backup_name .= strtolower($backup_shortname)."-";
-    //The date format
-    $backup_name .= userdate(time(),$backup_date_format,99,false);
-    //The extension
-    $backup_name .= ".zip";
-    //And finally, clean everything
-    $backup_name = clean_filename($backup_name);
-
-    //Calculate the backup unique code to allow simultaneus backups (to define
-    //the temp-directory name and records in backup temp tables
-    $backup_unique_code = time();
-
     if (empty($to)) {
         //Now print the Backup Name tr
         echo "<tr>";
@@ -117,7 +46,7 @@
         echo get_string("name").":";
         echo "</b></td><td>";
         //Add as text field
-        echo "<input type=\"text\" name=\"backup_name\" size=\"40\" value=\"".$backup_name."\" />";
+        echo "<input type=\"text\" name=\"backup_name\" size=\"40\" value=\"".$backupprefs->backup_name."\" />";
         echo "</td></tr>";
     
         //Line
@@ -127,32 +56,30 @@
         echo "<tr>";    
         echo "<td colspan=\"2\" align=\"center\"><b>";
 
-    } else {
-        echo '<input type="hidden" name="backup_name" value="'.$backup_name.'" /></b>';
     }
 
 
     //Here we check if backup_users = None. Then, we switch off every module
     //user info, user_files, logs and exercises, workshop and messages backups. A Warning is showed to
     //inform the user.
-    if ($backup_users == 2) {
+    if ($backupprefs->backup_users == 2) {
         if ($allmods = get_records("modules") ) {
             foreach ($allmods as $mod) {
                 $modname = $mod->name;
                 $var = "backup_user_info_".$modname;
-                if (isset($$var)) {
-                    $$var = 0;
+                if (isset($backupprefs->$var)) {
+                    $backupprefs->$var = 0;
                 }
                 $var = "backup_".$modname;
-                if (isset($$var)) {
+                if (isset($backupprefs->$var)) {
                     if ($modname == "exercise" || $modname == "workshop") {
-                        $$var = 0;
+                        $backupprefs->$var = 0;
                     }
                 }
             }
-        $backup_user_files = 0;
-        $backup_logs = 0;
-        $backup_messages = 0;
+        $backupprefs->backup_user_files = 0;
+        $backupprefs->backup_logs = 0;
+        $backupprefs->backup_messages = 0;
         }
         print_simple_box("<font color=\"red\">".get_string("backupnoneusersinfo")."</font>","center", "70%", '', "20", "noticebox");
         echo "<hr />";
@@ -169,21 +96,24 @@
     if ($allmods = get_records("modules") ) {
         foreach ($allmods as $mod) {
             $modname = $mod->name;
+            $modfile = $CFG->dirroot.'/mod/'.$modname.'/backuplib.php';
+            if (!file_exists($modfile)) {
+                continue;
+            }
+            require_once($modfile);
             $modbackup = $modname."_backup_mods";
             //If exists the lib & function
             $var = "exists_".$modname;
-            if (isset($$var) && $$var) {
+            if (isset($backupprefs->$var) && $backupprefs->$var) {
                 $var = "backup_".$modname;
                 //Only if selected
-                if ($$var == 1) {
+                if (!empty($backupprefs->$var) and ($backupprefs->$var == 1)) {
                     //Print the full tr
                     echo "<tr>";
                     echo "<td colspan=\"2\">";
                     //Add hidden fields
                     $var = "backup_".$modname;
-                    echo "<input type=\"hidden\" name=\"".$var."\" value=\"".$$var."\" />";
                     $var = "backup_user_info_".$modname;
-                    echo "<input type=\"hidden\" name=\"".$var."\" value=\"".$$var."\" />";
                     //Print the mod name
                     echo "<b>".get_string("include")." ".get_string("modulenameplural",$modname)." ";
                     //Now look for user-data status
@@ -191,10 +121,29 @@
                     $backup_user_options[1] = get_string("withuserdata");
                     $var = "backup_user_info_".$modname;
                     //Print the user info
-                    echo $backup_user_options[$$var]."</b>";
+                    echo $backup_user_options[$backupprefs->$var]."</b>";
                     //Call the check function to show more info
                     $modcheckbackup = $modname."_check_backup_mods";
-                    $table->data = $modcheckbackup($id,$$var,$backup_unique_code);
+                    $var = $modname.'_instances';
+                    $instancestopass = array();
+                    if (!empty($backupprefs->$var) && is_array($backupprefs->$var) && count($backupprefs->$var)) {
+                        $table->data = array();
+                        $countinstances = 0;
+                        foreach ($backupprefs->$var as $instance) {
+                            $var1 = 'backup_'.$modname.'_instance_'.$instance->id;
+                            $var2 = 'backup_user_info_'.$modname.'_instance_'.$instance->id;
+                            if (!empty($backupprefs->$var1)) {
+                                $obj = new StdClass;
+                                $obj->name = $instance->name;
+                                $obj->userdata = $backupprefs->$var2;
+                                $obj->id = $instance->id;
+                                $instancestopass[$instance->id]= $obj;
+                                $countinstances++;
+                                
+                            }
+                        }
+                    } 
+                    $table->data = $modcheckbackup($id,$backupprefs->$var,$backupprefs->backup_unique_code,$instancestopass);
                     print_table($table); 
                     echo "</td></tr>";
                 }
@@ -212,16 +161,16 @@
             $user_options[0] = get_string("includeallusers");
             $user_options[1] = get_string("includecourseusers");
             $user_options[2] = get_string("includenoneusers");
-            echo $user_options[$backup_users].'</b>';
+            echo $user_options[$backupprefs->backup_users].'</b>';
             //Print info
-            $table->data = user_check_backup($id,$backup_unique_code,$backup_users,$backup_messages);  
+            $table->data = user_check_backup($id,$backupprefs->backup_unique_code,$backupprefs->backup_users,$backupprefs->backup_messages);  
             print_table($table); 
             echo "</td></tr>";
             
         }
         
         //Now print the Logs tr conditionally
-        if ($backup_logs && empty($to)) {
+        if ($backupprefs->backup_logs && empty($to)) {
             echo "<tr>";
             echo "<td colspan=\"2\"><b>";
             echo get_string("includelogentries").'</b>';
@@ -232,38 +181,35 @@
         }
 
         //Now print the User Files tr conditionally
-        if ($backup_user_files) {
+        if ($backupprefs->backup_user_files) {
             echo "<tr>";
             echo "<td colspan=\"2\"><b>";
             echo get_string("includeuserfiles").'</b>';
             //Print info
-            $table->data = user_files_check_backup($id,$backup_unique_code);
+            $table->data = user_files_check_backup($id,$backupprefs->backup_unique_code);
             print_table($table);
             echo "</td></tr>";
         }
 
         //Now print the Course Files tr conditionally
-       if ($backup_course_files) {
+       if ($backupprefs->backup_course_files) {
             echo "<tr>";
             echo "<td colspan=\"2\"><b>";
             echo get_string("includecoursefiles").'</b>';
             //Print info
-            $table->data = course_files_check_backup($id,$backup_unique_code);
+            $table->data = course_files_check_backup($id,$backupprefs->backup_unique_code);
             print_table($table);
             echo "</td></tr>";
         }
     }
+
+    // now keep it for next time.
+    $SESSION->backupprefs[$course->id] = $backupprefs;
+
 ?>
 </table>
 <br />
 <center>
-<input type="hidden" name="backup_unique_code" value="<?php p($backup_unique_code) ?>" />
-<input type="hidden" name="backup_metacourse" value="<?php p($backup_metacourse) ?>" />
-<input type="hidden" name="backup_users" value="<?php p($backup_users) ?>" />
-<input type="hidden" name="backup_logs" value="<?php p($backup_logs) ?>" />
-<input type="hidden" name="backup_user_files" value="<?php p($backup_user_files) ?>" />
-<input type="hidden" name="backup_course_files" value="<?php p($backup_course_files) ?>" />
-<input type="hidden" name="backup_messages" value="<?php p($backup_messages) ?>" />
 <input type="hidden" name="to"     value="<?php p($to) ?>" />
 <input type="hidden" name="id"     value="<?php  p($id) ?>" />
 <input type="hidden" name="launch" value="execute" />

backup/backup_execute.html

@@ -26,71 +26,8 @@
         error("Site not found!");
     }
 
-   //Checks for the required files/functions to backup every mod
-    //And check if there is data about it
-    $count = 0;
-    if ($allmods = get_records("modules") ) {
-        foreach ($allmods as $mod) {
-            $modname = $mod->name;
-            $modfile = "$CFG->dirroot/mod/$modname/backuplib.php";
-            $modbackup = $modname."_backup_mods";
-            $modcheckbackup = $modname."_check_backup_mods";
-            if (file_exists($modfile)) {
-               include_once($modfile);
-               if (function_exists($modbackup) and function_exists($modcheckbackup)) {
-                   $var = "exists_".$modname;
-                   $$var = true;
-                   $count++;
-               }
-            }
-
-            //Check data
-            //Check module info
-            $var = "backup_".$modname;
-            $$var = optional_param( $var,0,PARAM_INT );
-
-            //Now stores all the mods preferences into an array into preferences
-            $preferences->mods[$modname]->backup = $$var;
-
-            //Check include user info
-            $var = "backup_user_info_".$modname;
-            $$var = optional_param( $var,0,PARAM_INT );
-
-            //Now stores all the mods preferences into an array into preferences
-            $preferences->mods[$modname]->userinfo = $$var; 
-            //And the name of the mod
-            $preferences->mods[$modname]->name = $modname;
-        }
-    }
-
-    //Check other parameters
-    $backup_metacourse = optional_param( 'backup_metacourse',1,PARAM_INT );
-    $preferences->backup_metacourse = $backup_metacourse;
-  
-    $backup_users = optional_param( 'backup_users',1,PARAM_INT ); 
-    $preferences->backup_users = $backup_users;
-   
-    $backup_logs = optional_param( 'backup_logs',0,PARAM_INT );    
-    $preferences->backup_logs = $backup_logs;
-
-    $backup_user_files = optional_param( 'backup_user_files',1,PARAM_INT );
-    $preferences->backup_user_files = $backup_user_files;
-
-    $backup_course_files = optional_param( 'backup_course_files',2,PARAM_INT );
-    $preferences->backup_course_files = $backup_course_files;
-
-    $backup_messages = optional_param( 'backup_messages',1,PARAM_INT );
-    $preferences->backup_messages = $backup_messages;
-
-    $id = required_param('id');
-    $preferences->backup_course = $id;
-
-    $backup_name = required_param('backup_name',PARAM_FILE );
-    $preferences->backup_name = $backup_name;
-
-    $backup_unique_code = required_param('backup_unique_code');
-    $preferences->backup_unique_code = $backup_unique_code;
-
+    $preferences = new StdClass;
+    backup_fetch_prefs_from_request($preferences,$count,$course);
     //Another Info
     $preferences->moodle_version = $CFG->version;
     $preferences->moodle_release = $CFG->release;
@@ -124,10 +61,10 @@
     //Check for temp and backup and backup_unique_code directory
     //Create them as needed
     echo "<li>".get_string("creatingtemporarystructures").'</li>';
-    $status = check_and_create_backup_dir($backup_unique_code);
+    $status = check_and_create_backup_dir($preferences->backup_unique_code);
     //Empty dir
     if ($status) {
-        $status = clear_backup_dir($backup_unique_code);
+        $status = clear_backup_dir($preferences->backup_unique_code);
     }
 
     //Delete old_entries from backup tables
@@ -144,7 +81,7 @@
         echo "<ul>";
         echo "<li>".get_string("writingheader").'</li>';
         //Obtain the xml file (create and open) and print prolog information
-        $backup_file = backup_open_xml($backup_unique_code);
+        $backup_file = backup_open_xml($preferences->backup_unique_code);
         echo "<li>".get_string("writinggeneralinfo").'</li>';
         //Prints general info about backup to file
         if ($backup_file) {
@@ -208,9 +145,10 @@
 
         //If we have selected to backup quizzes, backup categories and
         //questions structure (step 1). See notes on mod/quiz/backuplib.php
-        if ($status and $preferences->mods['quiz']->backup) {
+        if ($status and !empty($preferences->mods['quiz']->backup)) {
             echo "<li>".get_string("writingcategoriesandquestions").'</li>';
-            if (!$status = quiz_backup_question_categories($backup_file,$preferences)) {
+            require_once($CFG->dirroot.'/mod/quiz/backuplib.php');
+            if (!$status = backup_question_categories($backup_file,$preferences)) {
                 notify("An error occurred while backing up quiz categories");
             }
         }
@@ -380,6 +318,8 @@
         }
         error_log($filename);
         $SESSION->import_preferences = $preferences;
-        print_continue($CFG->wwwroot.'/course/import.php?id='.$to.'&fromcourse='.$id.'&filename='.$filename);
+        print_continue($CFG->wwwroot.'/course/import/activities/index.php?id='.$to.'&fromcourse='.$id.'&filename='.$filename);
     }
+
+    $SESSION->backupprefs[$course->id] = null; // unset it so we're clear next time.
 ?>

backup/backup_form.html

@@ -33,6 +33,7 @@
             $modname = $mod->name;
             $modfile = "$CFG->dirroot/mod/$modname/backuplib.php";
             $modbackup = $modname."_backup_mods";
+            $modbackupone = $modname.'_backup_one_mod';
             $modcheckbackup = $modname."_check_backup_mods";
             if (file_exists($modfile)) {
                include_once($modfile);
@@ -40,6 +41,11 @@
                    $var = "exists_".$modname;
                    $$var = true;
                    $count++;
+                   // check that there are instances and we can back them up individually
+                   if (count_records('course_modules','course',$course->id,'module',$mod->id) && function_exists($modbackupone)) {
+                       $var = 'exists_one_'.$modname;
+                       $$var = true;
+                   }
                }
             }
             //Check data
@@ -94,7 +100,7 @@ function selectItemInRadioByName(formId, radioName, selectIndex ) {
 }
 
 function selectItemInCheckboxByName(formId, checkName, checked ) {
-    myForm = document.getElementById(formId)
+    myForm = document.getElementById(formId);
     for (i=0,n=myForm.elements.length;i<n;i++) {
         myLen = checkName.length;
         myName = myForm.elements[i].name;
@@ -144,19 +150,42 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
                 $var = "backup_".$modname;
                 //choose_from_menu($backup_options, $var, $$var, "");
                 //Print the checkbox
-                print_checkbox($var, $$var, $$var, get_string("modulenameplural",$modname));
-                $var = "backup_user_info_".$modname;
+                print_checkbox($var, $$var, $$var, get_string("modulenameplural",$modname),'','selectItemInCheckboxByName(\'form1\',\'backup_'.$modname.'\',this.checked)');
                 echo "</td><td align=\"right\">&nbsp;";
                 echo "</td><td>";
+                $var = "backup_user_info_".$modname;
                 if (empty($to)) {
                     $backup_user_options[0] = get_string("withoutuserdata"); 
                     $backup_user_options[1] = get_string("withuserdata");
                     //choose_from_menu($backup_user_options, $var, $$var, "");
-                    print_checkbox($var, $$var, $$var, get_string("userdata"));
+                    print_checkbox($var, $$var, $$var, get_string("userdata"),'','selectItemInCheckboxByName(\'form1\',\'backup_user_info_'.$modname.'\',this.checked)');
                 } else {
                     echo '<input type="hidden" name="'.$var.'" value="0" />';
                 }
                 echo "</td></tr>\n"; 
+                // if we have the backup_one_mod function, loop here.
+                $var = 'exists_one_'.$modname;
+                if (!empty($$var)) {
+                    echo '<tr><td></td><td colspan="3"><table class="backup-form-instances">';
+                    $instances = get_all_instances_in_course($modname,$course);
+                    foreach ($instances as $instance) {
+                        echo '<tr><td>';
+                        $var = 'backup_'.$modname.'_instance_'.$instance->id;
+                        $$var = optional_param($var,1);
+                        print_checkbox($var,$$var,$$var,$instance->name,$instance->name,'this.form.elements[\'backup_'.$modname.'\'].checked=1;');
+                        echo '</td><td align="right">&nbsp;';
+                        $var = 'backup_user_info_'.$modname.'_instance_'.$instance->id;
+                        $$var = optional_param($var,1);
+                        if (empty($to)) {
+                            print_checkbox($var,$$var,$$var,get_string('userdata'),'','this.form.elements[\'backup_user_info_'.$modname.'\'].checked=1;');
+                        } else {
+                            echo '<input type="hidden" name="'.$var.'" value="0" />';
+                        }
+                        echo '</td></tr>';
+                    }
+                    echo '</table></td></tr>';
+                }
+              
             }
         }
         //Line
@@ -247,12 +276,55 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
             echo '<input type="hidden" name="backup_messages" value="0" />';
         }
     }
+
+    $backup_unique_code = time();
+
+    //Calculate the backup string
+
+    //Calculate the backup word
+    //Take off some characters in the filename !!
+    $takeoff = array(" ", ":", "/", "\\", "|");
+    $backup_word = str_replace($takeoff,"_",strtolower(get_string("backupfilename")));
+    //If non-translated, use "backup"
+    if (substr($backup_word,0,1) == "[") {
+        $backup_word= "backup";
+    }
+
+    //Calculate the date format string
+    $backup_date_format = str_replace(" ","_",get_string("backupnameformat"));
+    //If non-translated, use "%Y%m%d-%H%M"
+    if (substr($backup_date_format,0,1) == "[") {
+        $backup_date_format = "%%Y%%m%%d-%%H%%M";
+    }
+
+    //Calculate the shortname
+    $backup_shortname = clean_filename($course->shortname);
+    if (empty($backup_shortname) or $backup_shortname == '_' ) {
+        $backup_shortname = $course->id;
+    }
+
+    //Calculate the final backup filename
+    //The backup word
+    $backup_name = $backup_word."-";
+    //The shortname
+    $backup_name .= strtolower($backup_shortname)."-";
+    //The date format
+    $backup_name .= userdate(time(),$backup_date_format,99,false);
+    //The extension
+    $backup_name .= ".zip";
+    //And finally, clean everything
+    $backup_name = clean_filename($backup_name);
+
+    //Calculate the backup unique code to allow simultaneus backups (to define
+    //the temp-directory name and records in backup temp tables
 ?>
 </table>
 <br />
 <center>
 <input type="hidden" name="id"     value="<?php  p($id) ?>" />
 <input type="hidden" name="to"     value="<?php p($to) ?>" />
+<input type="hidden" name="backup_unique_code" value="<?php p($backup_unique_code); ?>" />
+<input type="hidden" name="backup_name" value="<?php p($backup_name); ?>" />
 <input type="hidden" name="launch" value="check" />
 <input type="submit" value="<?php  print_string("continue") ?>" />
 <input type="submit" name="cancel" value="<?php  print_string("cancel") ?>" />

backup/backup_scheduled.php

@@ -98,9 +98,17 @@ function schedule_backup_cron() {
                 if (!$backup_course) {
                     mtrace("            ERROR (in backup_courses detection)");
                     $status = false;
+                    continue;
                 }
-                //Now we backup every course with nextstarttime < now
-                if ($backup_course->nextstarttime > 0 && $backup_course->nextstarttime < $now) {
+                // Skip backup of unavailable courses that have remained unmodified in a month
+                $skipped = false;
+                if (!$course->visible && ($now - $course->timemodified) > 31*24*60*60) {  //Hidden + unmodified last month
+                    mtrace("            SKIPPING - hidden+unmodified");
+                    set_field("backup_courses","laststatus","3","courseid",$backup_course->courseid);
+                    $skipped = true;
+                } 
+                //Now we backup every non skipped course with nextstarttime < now
+                if (!$skipped  && $backup_course->nextstarttime > 0 && $backup_course->nextstarttime < $now) {
                     //We have to send a email because we have included at least one backup
                     $emailpending = true;
                     //Only make the backup if laststatus isn't 2-UNFINISHED (uncontrolled error)
@@ -154,6 +162,7 @@ function schedule_backup_cron() {
         $count_ok = count_records('backup_courses','laststatus','1');
         $count_error = count_records('backup_courses','laststatus','0');
         $count_unfinished = count_records('backup_courses','laststatus','2');
+        $count_skipped = count_records('backup_courses','laststatus','3');
 
         //Build the message text
         //Summary
@@ -161,6 +170,7 @@ function schedule_backup_cron() {
         $message .= "==================================================\n";
         $message .= "  ".get_string('courses').": ".$count_all."\n";
         $message .= "  ".get_string('ok').": ".$count_ok."\n";
+        $message .= "  ".get_string('skipped').": ".$count_skipped."\n";
         $message .= "  ".get_string('error').": ".$count_error."\n";
         $message .= "  ".get_string('unfinished').": ".$count_unfinished."\n\n";
 
@@ -325,7 +335,7 @@ function schedule_backup_course_configure($course,$starttime = 0) {
             $backup_config->backup_sche_coursefiles = 1;
         }
         if (!isset($backup_config->backup_sche_messages)) {
-            $backup_config->backup_sche_messages = 1;
+            $backup_config->backup_sche_messages = 0;
         }
         if (!isset($backup_config->backup_sche_active)) {
             $backup_config->backup_sche_active = 0;
@@ -363,26 +373,46 @@ function schedule_backup_course_configure($course,$starttime = 0) {
                        $var = "exists_".$modname;
                        $$var = true;
                        $count++;
+                       
+                       // PENNY NOTES: I have moved from here to the closing brace inside 
+                       // by two sets of ifs()
+                       // to avoid the backup failing on a non existant backup.
+                       // If the file/function/whatever doesn't exist, we don't want to set this
+                       // this module in backup preferences at all.
+                       //Check data
+                       //Check module info
+                       $var = "backup_".$modname;
+                       if (!isset($$var)) {
+                           $$var = $backup_config->backup_sche_modules;
+                       }
+                       //Now stores all the mods preferences into an array into preferences
+                       $preferences->mods[$modname]->backup = $$var;
+                       
+                       //Check include user info
+                       $var = "backup_user_info_".$modname;
+                       if (!isset($$var)) {
+                           $$var = $backup_config->backup_sche_withuserdata;
+                       }
+                       //Now stores all the mods preferences into an array into preferences
+                       $preferences->mods[$modname]->userinfo = $$var;
+                       //And the name of the mod
+                       $preferences->mods[$modname]->name = $modname;
                    }
                 }
-                //Check data
-                //Check module info
-                $var = "backup_".$modname;
-                if (!isset($$var)) {
-                    $$var = $backup_config->backup_sche_modules;
+            }
+        }
+        // now set instances
+        if ($coursemods = get_course_mods($course->id)) {
+            foreach ($coursemods as $mod) {
+                if (array_key_exists($mod->modname,$preferences->mods)) { // we are to backup this module
+                    if (empty($preferences->mods[$mod->modname]->instances)) {
+                        $preferences->mods[$mod->modname]->instances = array(); // avoid warnings
+                    }
+                    $preferences->mods[$mod->modname]->instances[$mod->instance]->backup = $preferences->mods[$mod->modname]->backup;
+                    $preferences->mods[$mod->modname]->instances[$mod->instance]->userinfo = $preferences->mods[$mod->modname]->userinfo;
+                    // there isn't really a nice way to do this...
+                    $preferences->mods[$mod->modname]->instances[$mod->instance]->name = get_field($mod->modname,'name','id',$mod->instance);
                 }
-                //Now stores all the mods preferences into an array into preferences
-                $preferences->mods[$modname]->backup = $$var;
-
-                //Check include user info
-                $var = "backup_user_info_".$modname;
-                if (!isset($$var)) {
-                    $$var = $backup_config->backup_sche_withuserdata;
-                }
-                //Now stores all the mods preferences into an array into preferences
-                $preferences->mods[$modname]->userinfo = $$var;
-                //And the name of the mod
-                $preferences->mods[$modname]->name = $modname;
             }
         }
     }
@@ -484,7 +514,13 @@ function schedule_backup_course_configure($course,$starttime = 0) {
     //Now calculate the users
     if ($status) {
         schedule_backup_log($starttime,$course->id,"    calculating users");
-        user_check_backup($course->id,$backup_unique_code,$preferences->backup_users,$preferences->backup_messages);  
+        //Decide about include users with messages, based on SITEID
+        if ($preferences->backup_messages && $preferences->backup_course == SITEID) {
+            $include_message_users = true;
+        } else {
+            $include_message_users = false;
+        }
+        user_check_backup($course->id,$backup_unique_code,$preferences->backup_users,$include_message_users);  
     }
 
     //Now calculate the logs
@@ -605,7 +641,7 @@ function schedule_backup_course_execute($preferences,$starttime = 0) {
         //questions structure (step 1). See notes on mod/quiz/backuplib.php
         if ($status and $preferences->mods['quiz']->backup) {
             schedule_backup_log($starttime,$preferences->backup_course,"      categories & questions");
-            $status = quiz_backup_question_categories($backup_file,$preferences);
+            $status = backup_question_categories($backup_file,$preferences);
         }
         
         //Print logs if selected
@@ -736,7 +772,9 @@ function schedule_backup_course_delete_old_files($preferences,$starttime=0) {
         $dirtocheck = $CFG->dataroot."/".$preferences->backup_course."/backupdata";
     }
     schedule_backup_log($starttime,$preferences->backup_course,"    checking $dirtocheck");
-    mtrace("            Keeping backup files in $dirtocheck");
+    if ($CFG->debug > 7) {
+        mtrace("            Keeping backup files in $dirtocheck");
+    }
 
     //Get all the files in $dirtocheck
     $files = get_directory_list($dirtocheck,"",false);

backup/backuplib.php

@@ -78,7 +78,7 @@
         
                     //Insert the record id. backup_users decide it.
                     //When all users
-                    $status = insert_record("backup_ids",$backupids_rec,false,"backup_code");
+                    $status = insert_record('backup_ids', $backupids_rec, false);
                     $count_users++;
                 }
                 //Do some output     
@@ -414,13 +414,20 @@
     }
 
     //Return the xml start tag 
-    function start_tag($tag,$level=0,$endline=false) {
+    function start_tag($tag,$level=0,$endline=false,$attributes=null) {
         if ($endline) {
            $endchar = "\n";
         } else {
            $endchar = "";
         }
-        return str_repeat(" ",$level*2)."<".strtoupper($tag).">".$endchar;
+        $attrstring = '';
+        if (!empty($attributes) && is_array($attributes)) {
+            foreach ($attributes as $key => $value) {
+                $attrstring .= " ".xml_tag_safe_content($key)."=\"".
+                    xml_tag_safe_content($value)."\"";
+            }
+        }
+        return str_repeat(" ",$level*2)."<".strtoupper($tag).$attrstring.">".$endchar;
     }
     
     //Return the xml end tag 
@@ -434,30 +441,38 @@
     }
     
     //Return the start tag, the contents and the end tag
-    function full_tag($tag,$level=0,$endline=true,$content,$to_utf=true) {
+    function full_tag($tag,$level=0,$endline=true,$content,$attributes=null) {
 
         global $CFG;
 
         //Here we encode absolute links
         $content = backup_encode_absolute_links($content);
 
-        //If enabled, we strip all the control chars from the text but tabs, newlines and returns
+        $st = start_tag($tag,$level,$endline,$attributes);
+
+        $co = xml_tag_safe_content($content);
+
+        $et = end_tag($tag,0,true);
+
+        return $st.$co.$et;
+    }
+
+
+    function xml_tag_safe_content($content) {
+        global $CFG;
+        //If enabled, we strip all the control chars (\x0-\x1f) from the text but tabs (\x9), 
+        //newlines (\xa) and returns (\xd). The delete control char (\x7f) is also included.
         //because they are forbiden in XML 1.0 specs. The expression below seems to be
         //UTF-8 safe too because it simply ignores the rest of characters.
-        if (!empty($CFG->backup_strip_controlchars)) {
-            $content = preg_replace("/(?(?=[[:cntrl:]])[^\n\r\t])/is","",$content);
-        }
-
-        //Start to build the tag
-        $st = start_tag($tag,$level,$endline);
-        $co="";
-        if ($to_utf) {
-            $co = preg_replace("/\r\n|\r/", "\n", utf8_encode(htmlspecialchars($content)));
+        $content = preg_replace("/[\x-\x8\xb-\xc\xe-\x1f\x7f]/is","",$content);
+        if (!empty($CFG->unicodedb)) {
+            // Don't perform the conversion. Contents are Unicode.
+            $content = preg_replace("/\r\n|\r/", "\n", htmlspecialchars($content));
         } else {
-            $co = preg_replace("/\r\n|\r/", "\n", htmlspecialchars($content));
-        }
-        $et = end_tag($tag,0,true);
-        return $st.$co.$et;
+            // Perform the conversion. Contents aren't Unicode.
+            $content = preg_replace("/\r\n|\r/", "\n", utf8_encode(htmlspecialchars($content)));
+        } 
+        return $content; 
     }
 
     //Prints General info about the course
@@ -498,13 +513,40 @@
                 $included = "true";
                 if ($element->userinfo) {
                     $userinfo = "true";
-                }
+                } 
             }
             //Prints the mod start
             fwrite ($bf,start_tag("MOD",3,true));
             fwrite ($bf,full_tag("NAME",4,false,$element->name));
             fwrite ($bf,full_tag("INCLUDED",4,false,$included));
             fwrite ($bf,full_tag("USERINFO",4,false,$userinfo));
+
+            if (isset($preferences->mods[$element->name]->instances)
+                && is_array($preferences->mods[$element->name]->instances)
+                && count($preferences->mods[$element->name]->instances)) {
+                fwrite ($bf, start_tag("INSTANCES",4,true));
+                foreach ($preferences->mods[$element->name]->instances as $id => $object) {
+                    if (!empty($object->backup)) {
+                        //Calculate info
+                        $included = "false";
+                        $userinfo = "false";
+                        if ($object->backup) {
+                            $included = "true";
+                            if ($object->userinfo) {
+                                $userinfo = "true";
+                            }
+                        }
+                        fwrite ($bf, start_tag("INSTANCE",5,true));
+                        fwrite ($bf, full_tag("ID",5,false,$id));
+                        fwrite ($bf, full_tag("NAME",5,false,$object->name));
+                        fwrite ($bf, full_tag("INCLUDED",5,false,$included)) ;
+                        fwrite ($bf, full_tag("USERINFO",5,false,$userinfo));
+                        fwrite ($bf, end_tag("INSTANCE",5,true));
+                    }
+                }
+                fwrite ($bf, end_tag("INSTANCES",4,true));
+            }
+                
                  
             //Print the end
             fwrite ($bf,end_tag("MOD",3,true));
@@ -609,6 +651,7 @@
             fwrite ($bf,full_tag("LANG",3,false,$course->lang));
             fwrite ($bf,full_tag("THEME",3,false,$course->theme));
             fwrite ($bf,full_tag("COST",3,false,$course->cost));
+            fwrite ($bf,full_tag("CURRENCY",3,false,$course->currency));
             fwrite ($bf,full_tag("MARKER",3,false,$course->marker));
             fwrite ($bf,full_tag("VISIBLE",3,false,$course->visible));
             fwrite ($bf,full_tag("HIDDENSECTIONS",3,false,$course->hiddensections));
@@ -945,6 +988,14 @@
                    fwrite ($bf,start_tag("MODS",4,true));
                    $first_record = false;
                }
+               // if we're doing selected instances, check that too.
+               if (is_array($preferences->mods[$moduletype]->instances) 
+                   && count($preferences->mods[$moduletype]->instances)
+                   && (!array_key_exists($course_module[$tok]->instance,$preferences->mods[$moduletype]->instances)
+                       || empty($preferences->mods[$moduletype]->instances[$course_module[$tok]->instance]->backup))) {
+                   $tok = strtok(",");
+                   continue;
+               }
                //Print mod info from course_modules
                fwrite ($bf,start_tag("MOD",5,true));
                //Save neccesary info to backup_ids
@@ -952,7 +1003,6 @@
                fwrite ($bf,full_tag("TYPE",6,false,$moduletype));
                fwrite ($bf,full_tag("INSTANCE",6,false,$course_module[$tok]->instance));
                fwrite ($bf,full_tag("ADDED",6,false,$course_module[$tok]->added));
-               fwrite ($bf,full_tag("DELETED",6,false,$course_module[$tok]->deleted));
                fwrite ($bf,full_tag("SCORE",6,false,$course_module[$tok]->score));
                fwrite ($bf,full_tag("INDENT",6,false,$course_module[$tok]->indent));
                fwrite ($bf,full_tag("VISIBLE",6,false,$course_module[$tok]->visible));
@@ -999,7 +1049,6 @@
                 //Output all user data
                 fwrite ($bf,full_tag("ID",4,false,$user_data->id));
                 fwrite ($bf,full_tag("AUTH",4,false,$user_data->auth));
-                fwrite ($bf,full_tag("GUID",4,false,$user_data->guid));
                 fwrite ($bf,full_tag("CONFIRMED",4,false,$user_data->confirmed));
                 fwrite ($bf,full_tag("POLICYAGREED",4,false,$user_data->policyagreed));
                 fwrite ($bf,full_tag("DELETED",4,false,$user_data->deleted));
@@ -1029,7 +1078,7 @@
                 fwrite ($bf,full_tag("LASTACCESS",4,false,$user_data->lastaccess));
                 fwrite ($bf,full_tag("LASTLOGIN",4,false,$user_data->lastlogin));
                 fwrite ($bf,full_tag("CURRENTLOGIN",4,false,$user_data->currentlogin));
-                fwrite ($bf,full_tag("LASTIP",4,false,$user_data->lastIP));
+                fwrite ($bf,full_tag("LASTIP",4,false,$user_data->lastip));
                 fwrite ($bf,full_tag("SECRET",4,false,$user_data->secret));
                 fwrite ($bf,full_tag("PICTURE",4,false,$user_data->picture));
                 fwrite ($bf,full_tag("URL",4,false,$user_data->url));
@@ -1191,7 +1240,8 @@
                     //See if it is a valid module to backup
                     if ($log->module == "course" or 
                         $log->module == "user" or
-                        $preferences->mods[$log->module]->backup == 1) {
+                        (array_key_exists($log->module, $preferences->mods) and $preferences->mods[$log->module]->backup == 1)) {
+                        // logs with 'upload' in module field are ignored, there is no restore code anyway 
                         //Begin log tag
                          fwrite ($bf,start_tag("LOG",3,true));
     
@@ -1611,14 +1661,30 @@
 
         $status = true;
 
-        //First, re-check if necessary functions exists
-        $modbackup = $module."_backup_mods";
-        if (function_exists($modbackup)) {
-            //Call the function
-            $status = $modbackup($bf,$preferences);
-        } else {
-            //Something was wrong. Function should exist.
-            $status = false;
+        require_once($CFG->dirroot.'/mod/'.$module.'/backuplib.php');
+
+        if (isset($preferences->mods[$module]->instances)
+            && is_array($preferences->mods[$module]->instances)) {
+            $onemodbackup = $module.'_backup_one_mod';
+            if (function_exists($onemodbackup)) {
+                foreach ($preferences->mods[$module]->instances as $instance => $object) {
+                    if (!empty($object->backup)) {
+                        $status = $onemodbackup($bf,$preferences,$instance);
+                    }
+                }
+            }  else {
+                $status = false;
+            }
+        } else { // whole module.
+            //First, re-check if necessary functions exists
+            $modbackup = $module."_backup_mods";
+            if (function_exists($modbackup)) {
+                //Call the function
+                $status = $modbackup($bf,$preferences);
+            } else {
+                //Something was wrong. Function should exist.
+                $status = false;
+            }
         }
    
         return $status; 
@@ -1655,6 +1721,7 @@
 
         foreach ($mypreferences->mods as $name => $info) {
             //Check if the xxxx_encode_content_links exists
+            include_once("$CFG->dirroot/mod/$name/backuplib.php");
             $function_name = $name."_encode_content_links";
             if (function_exists($function_name)) {
                 $result = $function_name($result,$mypreferences);
@@ -1662,7 +1729,7 @@
         }
 
         if ($result != $content && $CFG->debug>7) {                                  //Debug
-            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';        //Debug
+            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';        //Debug
         }                                                                            //Debug
 
         return $result;
@@ -1856,4 +1923,120 @@
 
         return $status;
     }
+
+    /** 
+     * compatibility function
+     * with new granular backup
+     * we need to know 
+     */
+    function backup_userdata_selected($preferences,$modname,$modid) {
+        return ((empty($preferences->mods[$modname]->instances)
+                 && !empty($preferences->mods[$modname]->userinfo)) 
+                || (is_array($preferences->mods[$modname]->instances) 
+                    && array_key_exists($modid,$preferences->mods[$modname]->instances)
+                    && !empty($preferences->mods[$modname]->instances[$modid]->userinfo)));
+    }
+
+
+    function backup_mod_selected($preferences,$modname,$modid) {
+        return ((empty($preferences->mods[$modname]->instances)
+                 && !empty($preferences->mods[$modname]->backup)) 
+                || (is_array($preferences->mods[$modname]->instances) 
+                    && array_key_exists($modid,$preferences->mods[$modname]->instances)
+                    && !empty($preferences->mods[$modname]->instances[$modid]->backup)));
+    }
+
+    /* 
+     * Checks for the required files/functions to backup every mod
+     * And check if there is data about it
+     */
+    function backup_fetch_prefs_from_request(&$preferences,&$count,$course) {
+        global $CFG,$SESSION;
+        
+        // check to see if it's in the session already
+        if (!empty($SESSION->backupprefs)  && array_key_exists($course->id,$SESSION->backupprefs) && !empty($SESSION->backupprefs[$course->id])) {
+            $sprefs = $SESSION->backupprefs[$course->id];
+            $preferences = $sprefs;
+            // refetch backup_name just in case.
+            $bn = optional_param('backup_name','',PARAM_FILE);
+            if (!empty($bn)) {
+                $preferences->backup_name = $bn;
+            }
+            $count = 1;
+            return true;
+        }
+            
+        if ($allmods = get_records("modules") ) {
+            foreach ($allmods as $mod) {
+                $modname = $mod->name;
+                $modfile = "$CFG->dirroot/mod/$modname/backuplib.php";
+                $modbackup = $modname."_backup_mods";
+                $modbackupone = $modname."_backup_one_mod";
+                $modcheckbackup = $modname."_check_backup_mods";
+                if (!file_exists($modfile)) {
+                    continue;
+                }
+                include_once($modfile);
+                if (!function_exists($modbackup) || !function_exists($modcheckbackup)) {
+                    continue;
+                }
+                $var = "exists_".$modname;
+                $preferences->$var = true;
+                $count++;
+                // check that there are instances and we can back them up individually
+                if (!count_records('course_modules','course',$course->id,'module',$mod->id) || !function_exists($modbackupone)) {
+                    continue;
+                }
+                $var = 'exists_one_'.$modname;
+                $preferences->$var = true;
+                $varname = $modname.'_instances';
+                $preferences->$varname = get_all_instances_in_course($modname,$course);
+                foreach ($preferences->$varname as $instance) {
+                    $preferences->mods[$modname]->instances[$instance->id]->name = $instance->name;
+                    $var = 'backup_'.$modname.'_instance_'.$instance->id;
+                    $$var = optional_param($var,0);
+                    $preferences->$var = $$var;
+                    $preferences->mods[$modname]->instances[$instance->id]->backup = $$var;
+                    $var = 'backup_user_info_'.$modname.'_instance_'.$instance->id;
+                    $$var = optional_param($var,0);
+                    $preferences->$var = $$var;
+                    $preferences->mods[$modname]->instances[$instance->id]->userinfo = $$var;
+                    $var = 'backup_'.$modname.'_instances';
+                    $preferences->$var = 1; // we need this later to determine what to display in modcheckbackup.
+                }
+
+                //Check data
+                //Check module info
+                $preferences->mods[$modname]->name = $modname;
+
+                $var = "backup_".$modname;
+                $$var = optional_param( $var,0);
+                $preferences->$var = $$var;
+                $preferences->mods[$modname]->backup = $$var;
+
+                //Check include user info
+                $var = "backup_user_info_".$modname;
+                $$var = optional_param( $var,0);       
+                $preferences->$var = $$var;
+                $preferences->mods[$modname]->userinfo = $$var;
+
+            }
+        }
+        
+        //Check other parameters
+        $preferences->backup_metacourse = optional_param('backup_metacourse',1,PARAM_INT);
+        $preferences->backup_users = optional_param('backup_users',1,PARAM_INT);
+        $preferences->backup_logs = optional_param('backup_logs',0,PARAM_INT);
+        $preferences->backup_user_files = optional_param('backup_user_files',1,PARAM_INT);
+        $preferences->backup_course_files = optional_param('backup_course_files',1,PARAM_INT);
+        $preferences->backup_messages = optional_param('backup_messages',1,PARAM_INT);
+        $preferences->backup_course = $course->id;
+        $preferences->backup_name = required_param('backup_name',PARAM_FILE );
+        $preferences->backup_unique_code =  required_param('backup_unique_code');
+
+        // put it (back) in the session
+       $SESSION->backupprefs[$course->id] = $preferences;
+    }
+
+
 ?>

backup/bb/README.txt

@@ -1,10 +1,9 @@
-Ziba Scott <ziba@linuxbox.com> 11/19/04
+Ziba Scott <ziba@linuxbox.com> 06/23/05
 
-This is a beta demonstration of a utility to convert Blackboard
-Course export zip files into Moodle course export zip files. It
-has been successfully tested with Blackboard 5.5 and
-Moodle 1.4.1 and Moodle CVS. There is minimal Blackboard 6 support.
-It will convert:
+This is a utility to convert Blackboard Course export zip files into
+Moodle course export zip files. It has been successfully tested with
+Blackboard 5.5 and Moodle 1.4.1 and Moodle CVS. There is minimal 
+Blackboard 6 support.  It will convert:
 
     * Course Name/Title
     * Forum Topics
@@ -12,17 +11,14 @@ It will convert:
     * Assignments 
     * External Links 
 
-The current status of this project is
-exploration/proof-of-concept. We have successfully converted
-basic Blackboard course information as well as course documents
-and forum topics using the XSLT methods described above. 
 
 AUTOMATED OPERATION:
   
   REQUIREMENTS FOR WEB INTERFACE:
     *Moodle 1.4.1 or greater
-    *PHP compiled with --enable-xslt  --with-xslt-sablot options
+    *PHP 4.3 compiled with --enable-xslt  --with-xslt-sablot options
     (Check php.net for instructions on enabling xslt for your platform)
+    *Alternatively, PHP 5 compiled with xml and xsl support (-with-xsl)
   
   INSTALLATION:
     *Unpack this file into the "backup" directory
@@ -36,10 +32,11 @@ MANUAL OPERATION:
     *An XSLT 1.0 processor (like Sablotron)
     *A zipping utility
 
-  REQUIREMENTS FOR WEB INTERFACE:
+  REQUIREMENTS FOR COMMAND LINE INTERFACE:
 
     *Linux/Unix
-    *PHP compiled with --enable-xslt  --with-xslt-sablot options.
+    *PHP 4 compiled with --enable-xslt  --with-xslt-sablot options.
+    *PHP 5 compiled with -with-xsl and the default xml support left in.
     *Apache with write access to /tmp
     *A commandline zipping utility
     

backup/bb/restore_bb.php

@@ -36,7 +36,7 @@ function blackboard_convert($dir){
 
 
     // Check for a Blackboard manifest file
-    if (is_readable($dir.'/imsmanifest.xml')){
+    if (is_readable($dir.'/imsmanifest.xml') && !is_readable($dir.'/moodle.xml')){
 
         if (!function_exists('xslt_create')) {  // XSLT MUST be installed for this to work
             notify('You need the XSLT library installed in PHP to open this Blackboard file');

backup/db/migrate2utf8.php

@@ -0,0 +1,41 @@
+<?php // $Id$
+
+function migrate2utf8_backup_ids_info($recordid){
+    global $CFG, $globallang;
+
+/// Some trivial checks
+    if (empty($recordid)) {
+        log_the_problem_somewhere();
+        return false;
+    }
+
+    if (!$backupids= get_record('backup_ids', 'id', $recordid)) {
+        log_the_problem_somewhere();
+        return false;
+    }
+
+    if ($globallang) {
+        $fromenc = $globallang;
+    } else {
+        $sitelang   = $CFG->lang;
+        $courselang = null;
+        $userlang   = null; //N.E.!!
+
+        $fromenc = get_original_encoding($sitelang, $courselang, $userlang);
+    }
+
+/// We are going to use textlib facilities
+    
+/// Convert the text
+    if (($fromenc != 'utf-8') && ($fromenc != 'UTF-8')) {
+        $result = utfconvert($backupids->info, $fromenc);
+
+        $newbackupids = new object;
+        $newbackupids->id = $recordid;
+        $newbackupids->info = $result;
+        migrate2utf8_update_record('backup_ids',$newbackupids);
+    }
+/// And finally, just return the converted field
+    return $result;
+}
+?>

backup/db/migrate2utf8.xml

@@ -0,0 +1,36 @@
+<DBMIGRATION type="backup" VERSION="2005120100">
+  <TABLES>
+    <TABLE name="backup_config">
+      <FIELDS>
+        <FIELD name="name" method="NO_CONV" type="varchar" length="255" dropindex="name" adduniqueindex="name (name(255))"/>
+        <FIELD name="value" method="NO_CONV" type="varchar" length="255" />
+      </FIELDS>
+    </TABLE>
+    <TABLE name="backup_courses">
+      <FIELDS>
+        <FIELD name="laststatus" method="NO_CONV" type="char" length="1" />
+      </FIELDS>
+    </TABLE>
+    <TABLE name="backup_files">
+      <FIELDS>
+        <FIELD name="file_type" method="NO_CONV" type="varchar" length="10" dropindex="backup_files_uk" />
+        <FIELD name="path" method="NO_CONV" type="varchar" length="255" adduniqueindex="backup_files_uk (backup_code, file_type(10), path(255))"/>
+      </FIELDS>
+    </TABLE>
+    <TABLE name="backup_ids">
+      <FIELDS>
+        <FIELD name="table_name" method="NO_CONV" type="varchar" length="30" dropindex="backup_ids_uk" adduniqueindex=" backup_ids_uk(backup_code, table_name(30), old_id)"/>
+        <FIELD name="info" method="PHP_FUNCTION" type="mediumtext" length="0">
+          <PHP_FUNCTION>
+            migrate2utf8_backup_ids_info(RECORDID)
+          </PHP_FUNCTION>
+        </FIELD>
+      </FIELDS>
+    </TABLE>
+    <TABLE name="backup_log">
+      <FIELDS>
+        <FIELD name="info" method="NO_CONV" type="varchar" length="255" />
+      </FIELDS>
+    </TABLE>
+  </TABLES>
+</DBMIGRATION>

backup/db/mysql.php

@@ -1,4 +1,4 @@
-<?PHP  //$Id$
+<?php  //$Id$
 //
 // This file keeps track of upgrades to Moodle's
 // backup/restore utility.
@@ -104,6 +104,67 @@ function backup_upgrade($oldversion=0) {
         }
     }
 
+    if ($oldversion < 2006011600 and $result) {
+        $result = execute_sql("DROP TABLE {$CFG->prefix}backup_files");
+        if ($result) {
+            $result = execute_sql("CREATE TABLE `{$CFG->prefix}backup_files` (
+                          `id` int(10) unsigned NOT NULL auto_increment,
+                          `backup_code` int(10) unsigned NOT NULL default '0',
+                          `file_type` varchar(10) NOT NULL default '',
+                          `path` varchar(255) NOT NULL default '',
+                          `old_id` int(10) unsigned NOT NULL default '0',
+                          `new_id` int(10) unsigned NOT NULL default '0',
+                          PRIMARY KEY  (`id`),
+                          UNIQUE KEY `{$CFG->prefix}backup_files_uk` (`backup_code`,`file_type`,`path`)
+                      ) TYPE=MyISAM COMMENT='To store and recode ids to user and course files.'");
+        }
+        if ($result) {
+            $result = execute_sql("DROP TABLE {$CFG->prefix}backup_ids");
+        }
+        if ($result) {
+            $result = execute_sql("CREATE TABLE `{$CFG->prefix}backup_ids` (
+                          `id` int(10) unsigned NOT NULL auto_increment,
+                          `backup_code` int(12) unsigned NOT NULL default '0',
+                          `table_name` varchar(30) NOT NULL default '',
+                          `old_id` int(10) unsigned NOT NULL default '0',
+                          `new_id` int(10) unsigned NOT NULL default '0',
+                          `info` mediumtext,
+                          PRIMARY KEY  (`id`),
+                          UNIQUE KEY `{$CFG->prefix}backup_ids_uk` (`backup_code` ,`table_name`,`old_id`)
+                      ) TYPE=MyISAM COMMENT='To store and convert ids in backup/restore'");
+        }
+    }
+
+
+    // code to drop the prefix in tables
+    if ($oldversion < 2006042100) {
+        // see bug 5205, silent drops, so should not panic anyone
+        $result = execute_sql("ALTER TABLE {$CFG->prefix}backup_files DROP INDEX backup_files_uk", false);
+        $result = execute_sql("ALTER TABLE {$CFG->prefix}backup_files DROP INDEX {$CFG->prefix}backup_files_uk", false);
+        $result = execute_sql("ALTER TABLE {$CFG->prefix}backup_ids DROP INDEX backup_ids_uk", false);
+        $result = execute_sql("ALTER TABLE {$CFG->prefix}backup_ids DROP INDEX {$CFG->prefix}backup_ids_uk", false);
+        $result = execute_sql("ALTER TABLE {$CFG->prefix}backup_files ADD UNIQUE INDEX backup_files_uk(backup_code,file_type(10),path(255))");
+        $result = execute_sql("ALTER TABLE {$CFG->prefix}backup_ids ADD UNIQUE INDEX backup_ids_uk(backup_code,table_name(30),old_id)");
+    }
+
+    // chaing default nulls to not null default 0
+    
+    if ($oldversion < 2006042800) {
+
+        execute_sql("UPDATE {$CFG->prefix}backup_files SET old_id='0' WHERE old_id IS NULL");
+        table_column('backup_files','old_id','old_id','int','10','unsigned','0','not null');
+
+        execute_sql("UPDATE {$CFG->prefix}backup_files SET new_id='0' WHERE new_id IS NULL");
+        table_column('backup_files','new_id','new_id','int','10','unsigned','0','not null');
+
+        execute_sql("UPDATE {$CFG->prefix}backup_ids SET new_id='0' WHERE new_id IS NULL");
+        table_column('backup_ids','new_id','new_id','int','10','unsigned','0','not null');
+
+        execute_sql("UPDATE {$CFG->prefix}backup_ids SET info='' WHERE info IS NULL");
+        table_column('backup_ids','info','info','mediumtext','','','','not null');
+    }
+
+
     //Finally, return result
     return $result;
 

backup/db/mysql.sql

@@ -3,12 +3,14 @@
 #
 
 CREATE TABLE `prefix_backup_files` (
+  `id` int(10) unsigned NOT NULL auto_increment,
   `backup_code` int(10) unsigned NOT NULL default '0',
   `file_type` varchar(10) NOT NULL default '',
   `path` varchar(255) NOT NULL default '',
-  `old_id` int(10) unsigned default NULL,
-  `new_id` int(10) unsigned default NULL,
-  PRIMARY KEY  (`backup_code`,`file_type`,`path`)
+  `old_id` int(10) unsigned NOT NULL default '0',
+  `new_id` int(10) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `backup_files_uk` (`backup_code`,`file_type`,`path`)
 ) TYPE=MyISAM COMMENT='To store and recode ids to user and course files.';
 # --------------------------------------------------------
 
@@ -17,12 +19,14 @@ CREATE TABLE `prefix_backup_files` (
 #
 
 CREATE TABLE `prefix_backup_ids` (
+  `id` int(10) unsigned NOT NULL auto_increment,
   `backup_code` int(12) unsigned NOT NULL default '0',
   `table_name` varchar(30) NOT NULL default '',
   `old_id` int(10) unsigned NOT NULL default '0',
-  `new_id` int(10) unsigned default NULL,
-  `info` mediumtext,
-  PRIMARY KEY  (`backup_code`,`table_name`,`old_id`)
+  `new_id` int(10) unsigned NOT NULL default '0',
+  `info` mediumtext NOT NULL default '',
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `backup_ids_uk` (`backup_code` ,`table_name`,`old_id`)
 ) TYPE=MyISAM COMMENT='To store and convert ids in backup/restore';
 # --------------------------------------------------------
 

backup/db/oci8po.sql

@@ -47,9 +47,9 @@ rem
 drop TABLE prefix_backup_config;
 
 CREATE TABLE prefix_backup_config (
-  id number(10) not null,
-  name varchar2(255) not null,
-  value varchar2(255) not null,
+  id number(10) default '0' not null,
+  name varchar2(255) default '' not null,
+  value varchar2(255) default '' not null,
   constraint pk_baco primary key (id),
   constraint uk_baco_name unique (name)
 );

backup/db/postgres7.php

@@ -1,4 +1,4 @@
-<?PHP  //$Id$
+<?php  //$Id$
 //
 // This file keeps track of upgrades to Moodle's
 // backup/restore utility.
@@ -23,10 +23,45 @@ function backup_upgrade($oldversion=0) {
 
     $result = true;
 
+    if ($oldversion < 2006011600 and $result) {
+        $result = execute_sql("DROP TABLE {$CFG->prefix}backup_files");
+        if ($result) {
+            $result = execute_sql("CREATE TABLE {$CFG->prefix}backup_files (
+                          id SERIAL PRIMARY KEY,
+                          backup_code integer NOT NULL default '0',
+                          file_type varchar(10) NOT NULL default '',
+                          path varchar(255) NOT NULL default '',
+                          old_id integer default NULL,
+                          new_id integer default NULL,
+                          CONSTRAINT {$CFG->prefix}backup_files_uk UNIQUE (backup_code, file_type, path))");
+        }
+        if ($result) {
+            $result = execute_sql("DROP TABLE {$CFG->prefix}backup_ids");
+        }
+        if ($result) {
+            $result = execute_sql("CREATE TABLE {$CFG->prefix}backup_ids (
+                          id SERIAL PRIMARY KEY,
+                          backup_code integer NOT NULL default '0',
+                          table_name varchar(30) NOT NULL default '',
+                          old_id integer NOT NULL default '0',
+                          new_id integer default NULL,
+                          info text,
+                          CONSTRAINT {$CFG->prefix}backup_ids_uk UNIQUE (backup_code, table_name, old_id))");
+        }
+    }
 
+    if ($oldversion < 2006042801) {
+        table_column('backup_log', 'time', 'time', 'integer', '', '', '0');
+        table_column('backup_log', 'laststarttime', 'laststarttime', 'integer', '', '', '0');
+        table_column('backup_log', 'courseid', 'courseid', 'integer', '', '', '0');
 
+        table_column('backup_courses', 'lastendtime', 'lastendtime', 'integer', '', '', '0');
+        table_column('backup_courses', 'laststarttime', 'laststarttime', 'integer', '', '', '0');
+        table_column('backup_courses', 'courseid', 'courseid', 'integer', '', '', '0');
+        table_column('backup_courses', 'nextstarttime', 'nextstarttime', 'integer', '', '', '0');
+    }
 
-
+    //Finally, return result
     return $result;
 
 }

backup/db/postgres7.sql

@@ -1,35 +1,32 @@
-# THIS FILE IS UNTESTED!!!  
-# PLEASE HELP TEST/FIX IT AND CONTACT MARTIN OR ELOY!
-
 #
 # Table structure for table prefix_backup_files
 #
 
 CREATE TABLE prefix_backup_files (
+  id SERIAL PRIMARY KEY,
   backup_code integer NOT NULL default '0',
   file_type varchar(10) NOT NULL default '',
   path varchar(255) NOT NULL default '',
   old_id integer default NULL,
-  new_id integer default NULL
+  new_id integer default NULL,
+  CONSTRAINT prefix_backup_files_uk UNIQUE (backup_code, file_type, path)
 );
 
-# --------------------------------------------------------
-
-CREATE INDEX prefix_backup_codetypepath_idx ON prefix_backup_files (backup_code,file_type,path);
 
 #
 # Table structure for table prefix_backup_ids
 #
 
 CREATE TABLE prefix_backup_ids (
-  backup_code int8 NOT NULL default '0',
+  id SERIAL PRIMARY KEY,
+  backup_code integer NOT NULL default '0',
   table_name varchar(30) NOT NULL default '',
-  old_id int8 NOT NULL default '0',
-  new_id int8 default NULL,
-  info text
+  old_id integer NOT NULL default '0',
+  new_id integer default NULL,
+  info text,
+  CONSTRAINT prefix_backup_ids_uk UNIQUE (backup_code, table_name, old_id)
 );
 
-CREATE INDEX prefix_backup_codenameid_idx ON prefix_backup_ids (backup_code,table_name,old_id);
 
 #
 # Table structure for table prefix_backup_config
@@ -41,27 +38,30 @@ CREATE TABLE prefix_backup_config (
    value varchar(255) NOT NULL default ''
 );
 
+
 #
 # Table structure for table prefix_backup_courses
 #
 
 CREATE TABLE prefix_backup_courses (
     id SERIAL PRIMARY KEY,
-    courseid int8 UNIQUE NOT NULL default '0',
-    laststarttime int8 NOT NULL default '0',
-    lastendtime int8 NOT NULL default '0',
+    courseid integer UNIQUE NOT NULL default '0',
+    laststarttime integer NOT NULL default '0',
+    lastendtime integer NOT NULL default '0',
     laststatus varchar(1) NOT NULL default '0',
-    nextstarttime int8 NOT NULL default '0'
+    nextstarttime integer NOT NULL default '0'
 );
 
+
+
 #
 # Table structure for table prefix_backup_log
 #
 
 CREATE TABLE prefix_backup_log (
     id SERIAL PRIMARY KEY,
-    courseid int8 NOT NULL default '0',
-    time int8 NOT NULL default '0',
-    laststarttime int8 NOT NULL default '0',
+    courseid integer NOT NULL default '0',
+    time integer NOT NULL default '0',
+    laststarttime integer NOT NULL default '0',
     info varchar(255) NOT NULL default ''
 );

backup/lib.php

@@ -1,4 +1,4 @@
-<?PHP //$Id$
+<?php //$Id$
     //This file contains all the general function needed (file manipulation...)
     //not directly part of the backup/restore utility
 
@@ -293,6 +293,8 @@
 
         global $CFG;
 
+        $status = true; // Initialize this, next code will change its value if needed
+
         if (!is_dir($to_file)) {
             //echo "<br />Creating ".$to_file;                                //Debug
             umask(0000);
@@ -409,10 +411,12 @@
             $rec->backup_code = $backup_unique_code;
             $rec->table_name = $table;
             $rec->old_id = $old_id;
-            $rec->new_id =$new_id;
+            $rec->new_id = ($new_id === null? 0 : $new_id);
             $rec->info = $info_to_save;
-            
-            $status = insert_record ("backup_ids", $rec, false,"backup_code");
+
+            if (!insert_record('backup_ids', $rec, false)) {
+                $status = false;
+            }
         }
         return $status;
     }
@@ -470,26 +474,40 @@
         return $status;
     }
 
-    //This function is used to add slashes and decode from UTF-8
+    //This function is used to add slashes (and decode from UTF-8 if needed)
     //It's used intensivelly when restoring modules and saving them in db
     function backup_todb ($data) {
-        return restore_decode_absolute_links(addslashes(utf8_decode($data)));
+        global $CFG;
+
+        if (empty($CFG->unicodedb)) {
+            return restore_decode_absolute_links(addslashes(utf8_decode($data)));
+        } else {
+            return restore_decode_absolute_links(addslashes($data));
+        }
     }
 
     //This function is used to check that every necessary function to 
     //backup/restore exists in the current php installation. Thanks to
     //gregb@crowncollege.edu by the idea.
-    function backup_required_functions() {
+    function backup_required_functions($justcheck=false) {
 
         if(!function_exists('utf8_encode')) {
-            error('You need to add XML support to your PHP installation');  
+            if (empty($justcheck)) {
+                error('You need to add XML support to your PHP installation');  
+            } else {
+                return false;
+            }
         }
 
+        return true;
     }
 
     //This function send n white characters to the browser and flush the
     //output buffer. Used to avoid browser timeouts and to show the progress.
     function backup_flush($n=0,$time=false) {
+        if (defined('RESTORE_SILENTLY_NOFLUSH')) {
+            return;
+        }
         if ($time) {
             $ti = strftime("%X",time());
         } else {
@@ -525,4 +543,108 @@
 
         return ($status && $status2);
     }
+
+    /** this function will restore an entire backup.zip into the specified course
+     * using standard moodle backup/restore functions, but silently.
+     * @param string $pathtofile the absolute path to the backup file.
+     * @param int $destinationcourse the course id to restore to.
+     * @param boolean $emptyfirst whether to delete all coursedata first.
+     * @param boolean $userdata whether to include any userdata that may be in the backup file.
+     */
+    function import_backup_file_silently($pathtofile,$destinationcourse,$emptyfirst=false,$userdata=false) {
+        global $CFG,$SESSION,$USER; // is there such a thing on cron? I guess so..
+
+        if (empty($USER)) {
+            $USER = get_admin();
+            $USER->admin = 1; // not sure why, but this doesn't get set
+        }
+
+        define('RESTORE_SILENTLY',true); // don't output all the stuff to us.
+        
+        $debuginfo = 'import_backup_file_silently: ';
+        $cleanupafter = false;
+        $errorstr = ''; // passed by reference to restore_precheck to get errors from.
+
+        if (!$course = get_record('course','id',$destinationcourse)) {
+            mtrace($debuginfo.'Course with id $destinationcourse was not a valid course!');
+            return false;
+        }
+
+        // first check we have a valid file.
+        if (!file_exists($pathtofile) || !is_readable($pathtofile)) {
+            mtrace($debuginfo.'File '.$pathtofile.' either didn\'t exist or wasn\'t readable');
+            return false;
+        }
+
+        // now make sure it's a zip file
+        require_once($CFG->dirroot.'/lib/filelib.php');
+        $filename = substr($pathtofile,strrpos($pathtofile,'/')+1);
+        $mimetype = mimeinfo("type", $filename);
+        if ($mimetype != 'application/zip') {
+            mtrace($debuginfo.'File '.$pathtofile.' was of wrong mimetype ('.$mimetype.')' );
+            return false;
+        }
+
+        // restore_precheck wants this within dataroot, so lets put it there if it's not already..
+        if (strstr($pathtofile,$CFG->dataroot) === false) {
+            // first try and actually move it..
+            if (!check_dir_exists($CFG->dataroot.'/temp/backup/',true)) {
+                mtrace($debuginfo.'File '.$pathtofile.' outside of dataroot and couldn\'t move it! ');
+                return false;
+            }
+            if (!copy($pathtofile,$CFG->dataroot.'/temp/backup/'.$filename)) {
+                mtrace($debuginfo.'File '.$pathtofile.' outside of dataroot and couldn\'t move it! ');
+                return false;
+            } else {
+                $pathtofile = 'temp/backup/'.$filename;
+                $cleanupafter = true;
+            }
+        } else {
+            // it is within dataroot, so take it off the path for restore_precheck.
+            $pathtofile = substr($pathtofile,strlen($CFG->dataroot.'/'));
+        }
+
+        if (!backup_required_functions()) {
+            mtrace($debuginfo.'Required function check failed (see backup_required_functions)');
+            return false;
+        }
+        
+        @ini_set("max_execution_time","3000");
+        raise_memory_limit("128M");
+            
+        if (!$backup_unique_code = restore_precheck($destinationcourse,$pathtofile,$errorstr,true)) {
+            mtrace($debuginfo.'Failed restore_precheck (error was '.$errorstr.')');
+            return false;
+        }
+        
+        restore_setup_for_check($SESSION->restore,$backup_unique_code);
+
+        // add on some extra stuff we need...
+        $SESSION->restore->restoreto = 1;
+        $SESSION->restore->course_id = $destinationcourse; 
+        $SESSION->restore->deleting  = $emptyfirst;
+
+        // maybe we need users (defaults to 2 in restore_setup_for_check)
+        if (!empty($userdata)) {
+            $SESSION->restore->users = 1;
+        }
+
+        // we also need modules...
+        if ($allmods = get_records("modules")) {
+            foreach ($allmods as $mod) {
+                $modname = $mod->name;
+                //Now check that we have that module info in the backup file
+                if (isset($SESSION->info->mods[$modname]) && $SESSION->info->mods[$modname]->backup == "true") {
+                    $SESSION->restore->mods[$modname]->restore = true;
+                    $SESSION->restore->mods[$modname]->userinfo = $userdata;
+                }
+            }
+        }
+        if (!restore_execute($SESSION->restore,$SESSION->info,$SESSION->course_header,$errorstr)) {
+            mtrace($debuginfo.'Failed restore_execute (error was '.$errorstr.')');
+            return false;
+        }
+        return true;
+    }
+
 ?>

backup/log.php

@@ -4,7 +4,7 @@
     require_once("../config.php");
     require_once("../backup/lib.php");
 
-    optional_variable($courseid);
+    $courseid = optional_param('courseid',0,PARAM_INT);
 
     require_login();
 
@@ -29,6 +29,7 @@
     $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");
@@ -71,6 +72,8 @@
                         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>";
                     }

backup/restore.php

@@ -15,14 +15,35 @@
 
     //Optional
     $id = optional_param( 'id' );
-    $file = optional_param( 'file' );;
+    $file = optional_param( 'file' );
     $cancel = optional_param( 'cancel' );
     $launch = optional_param( 'launch' );
     $to = optional_param( 'to' );
+    $method = optional_param( 'method' );
+    $backup_unique_code = optional_param('backup_unique_code',0,PARAM_INT);
 
     //Check login       
     require_login();
 
+/// With method=manual, we come from the FileManager so we delete all the backup/restore/import session structures
+    if ($method == 'manual') {
+        if (isset($SESSION->course_header)) {
+            unset ($SESSION->course_header);
+        }
+        if (isset($SESSION->info)) {
+            unset ($SESSION->info);
+        }
+        if (isset($SESSION->backupprefs)) {
+            unset ($SESSION->backupprefs);
+        }
+        if (isset($SESSION->restore)) {
+            unset ($SESSION->restore);
+        }
+        if (isset($SESSION->import_preferences)) {
+            unset ($SESSION->import_preferences);
+        }
+    }
+
     if (!$to && isset($SESSION->restore->restoreto) && isset($SESSION->restore->importing) && isset($SESSION->restore->course_id)) {
         $to = $SESSION->restore->course_id;
     }
@@ -116,11 +137,10 @@
 
     //Call the form, depending the step we are
 
-
     if (!$launch) {
         include_once("restore_precheck.html");
     } else if ($launch == "form") {
-        if ($SESSION->restore->importing) {
+        if (!empty($SESSION->restore->importing)) {
             // set up all the config stuff and skip asking the user about it.
             restore_setup_for_check($SESSION->restore,$backup_unique_code);
             include_once("restore_execute.html");

backup/restore_check.html

@@ -14,9 +14,12 @@
         }
     }
 
-    //If restore session info exists, but we are posting parameters
-    //manually, this has prioriry
-    if (isset($restore) and isset($restore_restoreto)) {
+    //Detect if we are coming from the restore form
+    $fromform = optional_param ('fromform', 0, PARAM_INT);
+
+    //If restore session info exists, but we are coming from the form
+    //it has prioriry
+    if (isset($restore) and !empty($fromform)) {
         unset($restore);
     }
 
@@ -42,6 +45,16 @@
                 $$var = optional_param( $var,0); 
                 $var = "restore_user_info_".$modname;
                 $$var = optional_param( $var,0);
+                $instances = !empty($info->mods[$mod->name]->instances) ? $info->mods[$mod->name]->instances : NULL;
+                if ($instances === NULL) {
+                    continue;
+                }
+                foreach ($instances as $instance) {
+                    $var = 'restore_'.$modname.'_instance_'.$instance->id;
+                    $$var = optional_param($var,0);
+                    $var = 'restore_user_info_'.$modname.'_instance_'.$instance->id;
+                    $$var = optional_param($var,0);
+                }
             }
         }
         //restoreto
@@ -59,10 +72,8 @@
         //restore_messages
         $restore_messages = required_param('restore_messages');
 
-        //Check we've selected a course
-        if (!isset($course_id)) {
-            $course_id = 0;
-        }
+        //Check we've selected a course to restore to
+        $course_id = optional_param('course_id', 0, PARAM_INT);
  
         //We are here, having all we need !!
         //Create the restore object and put it in the session
@@ -75,6 +86,16 @@
                 $restore->mods[$modname]->restore=$$var;
                 $var = "restore_user_info_".$modname;
                 $restore->mods[$modname]->userinfo=$$var;
+                $instances = !empty($info->mods[$mod->name]->instances) ? $info->mods[$mod->name]->instances : NULL;
+                if ($instances === NULL) {
+                    continue;
+                }
+                foreach ($instances as $instance) {
+                    $var = 'restore_'.$modname.'_instance_'.$instance->id;
+                    $restore->mods[$modname]->instances[$instance->id]->restore = $$var;
+                    $var = 'restore_user_info_'.$modname.'_instance_'.$instance->id;
+                    $restore->mods[$modname]->instances[$instance->id]->userinfo = $$var;
+                }
             }
         }
         $restore->restoreto=$restore_restoreto;
@@ -88,6 +109,7 @@
     } else {
         //We have the object, so check if we have a new course_id
         //passed as parammeter
+        $course_id = optional_param('course_id', 0, PARAM_INT);
         if ($course_id) {
             $restore->course_id=$course_id;
         }

backup/restore_execute.html

@@ -41,357 +41,14 @@
     if (!$site = get_site()) {
         error("Site not found!");
     }
-
-    //Checks for the required files/functions to restore every module
-    //and include them
-    if ($allmods = get_records("modules") ) {
-        foreach ($allmods as $mod) {
-            $modname = $mod->name;
-            $modfile = "$CFG->dirroot/mod/$modname/restorelib.php";
-            //If file exists and we have selected to restore that type of module
-            if ((file_exists($modfile)) and ($restore->mods[$modname]->restore)) {
-               include_once($modfile);
-            }
-        }
-    }
-
-    //Start the main table
-    echo "<table cellpadding=\"5\">";
-    echo "<tr><td>";
-
-    //Start the main ul
-    echo "<ul>";
-
-    //Init status
-    $status = true;
-
-    //Localtion of the xml file
-    $xml_file  = $CFG->dataroot."/temp/backup/".$restore->backup_unique_code."/moodle.xml";
-
-    //If we've selected to restore into new course
-    //create it (course)
-    //Saving conversion id variables into backup_tables
-    if ($restore->restoreto == 2) {
-        echo "<li>".get_string("creatingnewcourse");
-        $oldidnumber = $course_header->course_idnumber;
-        if (!$status = restore_create_new_course($restore,$course_header)) {
-            notify("Error while creating the new empty course.");
-        }
-        //Print course fullname and shortname and category
-        if ($status) {
-            echo "<ul>";
-            echo "<li>".$course_header->course_fullname." (".$course_header->course_shortname.")".'</li>';
-            echo "<li>".get_string("category").": ".$course_header->category->name.'</li>';
-            if (!empty($oldidnumber)) {
-                echo "<li>".get_string("nomoreidnumber","moodle",$oldidnumber)."</li>";
-            }
-            echo "</ul></li>";
-            //Put the destination course_id
-            $restore->course_id = $course_header->course_id;
-        }
-    } else {
-        $course = get_record("course","id",$restore->course_id);
-        if ($course) {
-            echo "<li>".get_string("usingexistingcourse"); 
-            echo "<ul>";
-            echo "<li>".get_string("from").": ".$course_header->course_fullname." (".$course_header->course_shortname.")".'</li>';
-            echo "<li>".get_string("to").": ".$course->fullname." (".$course->shortname.")".'</li>';
-            if (($restore->deleting)) {
-                echo "<li>".get_string("deletingexistingcoursedata").'</li>';
-            } else {
-                echo "<li>".get_string("addingdatatoexisting").'</li>';
-            }
-            echo "</ul></li>";
-            //If we have selected to restore deleting, we do it now.
-            if ($restore->deleting) {
-                echo "<li>".get_string("deletingolddata").'</li>';
-                $status = remove_course_contents($restore->course_id,false) and 
-                          delete_dir_contents($CFG->dataroot."/".$restore->course_id,"backupdata");
-                if ($status) {
-                    //Now , this situation is equivalent to the "restore to new course" one (we
-                    //have a course record and nothing more), so define it as "to new course"
-                    $restore->restoreto = 2;
-                } else {
-                    notify("An error occurred while deleting some of the course contents.");
-                }
-            }
-        } else {
-            notify("Error opening existing course.");
-            $status = false;
-        }
-    }
-
-    //Now create the course_sections and their associated course_modules
-    if ($status) {
-        //Into new course
-        if ($restore->restoreto == 2) {
-            echo "<li>".get_string("creatingsections").'</li>';
-            if (!$status = restore_create_sections($restore,$xml_file)) {
-                notify("Error creating sections in the existing course.");
-            }
-        //Into existing course
-        } else if ($restore->restoreto == 0 or $restore->restoreto == 1) {
-            echo "<li>".get_string("checkingsections").'</li>';
-            if (!$status = restore_create_sections($restore,$xml_file)) {
-                notify("Error creating sections in the existing course.");
-            }
-        //Error
-        } else {
-            notify("Neither a new course or an existing one was specified.");
-            $status = false;
-        }
-    }
-
-    //Now create users as needed 
-    if ($status and ($restore->users == 0 or $restore->users == 1)) {
-        echo "<li>".get_string("creatingusers")."<br />";
-        if (!$status = restore_create_users($restore,$xml_file)) {
-            notify("Could not restore users.");
-        }
-        //Now print info about the work done
-        if ($status) {
-            $recs = get_records_sql("select old_id, new_id from {$CFG->prefix}backup_ids
-                                     where backup_code = '$restore->backup_unique_code' and
-                                     table_name = 'user'");
-            //We've records
-            if ($recs) {
-                $new_count = 0;
-                $exists_count = 0;
-                $student_count = 0;
-                $teacher_count = 0;
-                $counter = 0;
-                //Iterate, filling counters
-                foreach ($recs as $rec) {
-                    //Get full record, using backup_getids
-                    $record = backup_getid($restore->backup_unique_code,"user",$rec->old_id);
-                    if (strpos($record->info,"new") !== false) {
-                        $new_count++;
-                    } 
-                    if (strpos($record->info,"exists") !== false) {
-                        $exists_count++;
-                    }
-                    if (strpos($record->info,"student") !== false) {
-                        $student_count++;
-                    } else if (strpos($record->info,"teacher") !== false) {
-                        $teacher_count++;
-                    }
-                    //Do some output
-                    $counter++;
-                    if ($counter % 10 == 0) {
-                        echo ".";
-                        if ($counter % 200 == 0) {
-                            echo "<br />";
-                        }
-                        backup_flush(300);
-                    }
-                }
-                //Now print information gathered
-                echo " (".get_string("new").": ".$new_count.", ".get_string("existing").": ".$exists_count.")";
-                echo "<ul>";
-                echo "<li>".get_string("students").": ".$student_count.'</li>';
-                echo "<li>".get_string("teachers").": ".$teacher_count.'</li>';
-                echo "</ul>";
-            } else {
-                notify("No users were found!");
-            }
-        }
-    }
-
-    //Now create metacourse info
-    if ($status and $restore->metacourse) {
-        //Only to new courses!
-        if ($restore->restoreto == 2) {
-            echo "</li><li>".get_string("creatingmetacoursedata");
-            if (!$status = restore_create_metacourse($restore,$xml_file)) {
-                notify("Error creating metacourse in the course.");
-            }
-        }
-    }
-
-
-    //Now create categories and questions as needed (STEP1)
-    if ($status and ($restore->mods['quiz']->restore)) {
-        echo "</li><li>".get_string("creatingcategoriesandquestions");
-        echo "<ul>";
-        if (!$status = restore_create_questions($restore,$xml_file)) {
-            notify("Could not restore categories and questions!");
-        }
-        echo "</ul></li>";
-    }
-
-    //Now create user_files as needed
-    if ($status and ($restore->user_files)) {
-        echo "<li>".get_string("copyinguserfiles");
-        if (!$status = restore_user_files($restore)) {
-            notify("Could not restore user files!");
-        }
-        //If all is ok (and we have a counter)
-        if ($status and ($status !== true)) {
-            //Inform about user dirs created from backup
-            echo "<ul>";
-            echo "<li>".get_string("userzones").": ".$status;
-            echo "</li></ul>";
-        }
-    }
-
-    //Now create course files as needed
-    if ($status and ($restore->course_files)) {
-        echo "</li><li>".get_string("copyingcoursefiles")."</li>";
-        if (!$status = restore_course_files($restore)) {
-            notify("Could not restore course files!");
-        }
-        //If all is ok (and we have a counter)
-        if ($status and ($status !== true)) {
-            //Inform about user dirs created from backup
-            echo "<ul>";
-            echo "<li>".get_string("filesfolders").": ".$status;
-            echo "</ul>";
-        }       
-    }
-
-    //Now create messages as needed
-    if ($status and ($restore->messages)) {
-        echo "<li>".get_string("creatingmessagesinfo");
-        if (!$status = restore_create_messages($restore,$xml_file)) {
-            notify("Could not restore messages!");
-        }
-        echo "</li>";
-    }
-
-    //Now create scales as needed
-    if ($status) {
-        echo "<li>".get_string("creatingscales").'</li>';
-        if (!$status = restore_create_scales($restore,$xml_file)) {
-            notify("Could not restore custom scales!");
-        }
-    }
-
-    //Now create groups as needed
-    if ($status) {
-        echo "<li>".get_string("creatinggroups").'</li>';
-        if (!$status = restore_create_groups($restore,$xml_file)) {
-            notify("Could not restore groups!");
-        }
-    }
-
-    //Now create events as needed
-    if ($status) {
-        echo "<li>".get_string("creatingevents").'</li>';
-        if (!$status = restore_create_events($restore,$xml_file)) {
-            notify("Could not restore course events!");
-        }
-    }
-
-    //Now create course modules as needed
-    if ($status) {
-        echo "<li>".get_string("creatingcoursemodules");
-        if (!$status = restore_create_modules($restore,$xml_file)) {
-            notify("Could not restore modules!");
-        }
-    }
-
-    //Now create gradebook as needed -- AFTER modules!!!
-    if ($status) {
-        echo "<li>".get_string("creatinggradebook");
-        if (!$status = restore_create_gradebook($restore,$xml_file)) {
-            notify("Could not restore gradebook!");
-        }
-    }
-
-    //Bring back the course blocks -- do it AFTER the modules!!!
-    if($status) {
-        //If we are deleting and bringing into a course or making a new course, same situation
-        if($restore->restoreto == 0 || $restore->restoreto == 2) {
-            echo '<li>'.get_string('creatingblocks').'</li>';
-            if (!$status = restore_create_blocks($restore, $info->backup_block_format, $course_header->blockinfo, $xml_file)) {
-                notify('Error while creating the course blocks');
-            }
-        }
-    }
-
-    //Now create log entries as needed
-    if ($status and ($restore->logs)) {
-        echo "</li><li>".get_string("creatinglogentries");
-        if (!$status = restore_create_logs($restore,$xml_file)) {
-            notify("Could not restore logs!");
-        }
-    }    
-
-    //Now, if all is OK, adjust the instance field in course_modules !!
-    if ($status) {
-        echo "</li><li>".get_string("checkinginstances").'</li>';
-        if (!$status = restore_check_instances($restore)) {
-            notify("Could not adjust instances in course_modules!");
-        }
-    }
-
-    //Now, if all is OK, adjust activity events
-    if ($status) {
-        echo "<li>".get_string("refreshingevents").'</li>';
-        if (!$status = restore_refresh_events($restore)) {
-            notify("Could not refresh events for activities!");
-        }
-    }
-
-    //Now, if all is OK, adjust inter-activity links
-    if ($status) {
-        echo "<li>".get_string("decodinginternallinks");
-        if (!$status = restore_decode_content_links($restore)) {
-            notify("Could not refresh events for activities!");
-        }
-    }
-
-    //Now, with backup files prior to version 2005041100,
-    //convert all the wiki texts in the course to markdown
-    if ($status && $restore->backup_version < 2005041100) {
-        echo "<li>".get_string("convertingwikitomarkdown");
-        if (!$status = restore_convert_wiki2markdown($restore)) {
-            notify("Could not convert wiki texts to markdown!");
-        }
-    }
-
-    //Now if all is OK, update:
-    //   - course modinfo field 
-    //   - categories table
-    //   - add user as teacher
-    if ($status) {
-        echo "</li><li>".get_string("checkingcourse").'</li>';
-        //modinfo field
-        rebuild_course_cache($restore->course_id);
-        //categories table
-        $course = get_record("course","id",$restore->course_id); 
-        fix_course_sortorder();
-        //Make the user a teacher if the course hasn't teachers (bug 2381)
-        if (!isadmin()) {
-            if (!$checktea = get_records('user_teachers','course', $restore->course_id)) {
-                //Add the teacher to the course
-                $status = add_teacher($USER->id, $restore->course_id);
-            }
-        }
-    }
-
-    //Cleanup temps (files and db)
-    if ($status) {
-        echo "<li>".get_string("cleaningtempdata").'</li>';
-        if (!$status = clean_temp_data ($restore)) {
-            notify("Could not clean up temporary data from files and database");
-        }
-    }
-
-    //End the main ul
-    echo "</ul>";
-
-
-    //End the main table     
-    echo "</td></tr>";
-    echo "</table>";
+    $errorstr = '';
+    $status = restore_execute($restore,$info,$course_header,$errorstr);
 
     if (!$status) {
         error ("An error has occurred and the restore could not be completed!");
     }
 
-    if (!$restore->importing) {
-        echo $output;
+    if (empty($restore->importing)) {
         //Print final message
         print_simple_box(get_string("restorefinished"),"center");
     } else {