Updated version for release 1.5

lazy to scroll!

admin/admin.html

@@ -5,11 +5,19 @@
   <table align="center" border="0" cellpadding="5" cellspacing="0">
     <tr>
       <td valign="top">
-          <?php echo count($admins) . " ". $strexistingadmins ?>
+          <?php
+              $a->count = count($admins);
+              $a->items = $strexistingadmins;
+              print_string('counteditems', '', $a);
+          ?>
       </td>
       <td></td>
       <td valign="top">
-          <?php echo $usercount . " " . $strpotentialadmins ?>
+          <?php
+              $a->count = $usercount;
+              $a->items = $strpotentialadmins;
+              print_string('counteditems', '', $a);
+          ?>
       </td>
     </tr>
     <tr>

admin/admin.php

@@ -1,7 +1,7 @@
 <?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);
 
@@ -48,7 +48,7 @@
         $$strstringtoload = get_string($stringtoload);
     }
 
-	print_header("$site->shortname: $strassignadmins", 
+    print_header("$site->shortname: $strassignadmins", 
                  "$site->fullname", 
                  "<a href=\"index.php\">$stradministration</a> -> <a href=\"users.php\">$strusers</a> -> $strassignadmins", "adminform.searchtext");
 

admin/auth.php

@@ -23,11 +23,27 @@
         $config = (array)$config;
         validate_form($config, $err);
 
+        // extract and sanitize the auth key explicitly
+        $modules = get_list_of_plugins("auth");
+        if (in_array($config['auth'], $modules)) {
+            $auth = $config['auth'];            
+        } else {
+            notify("Error defining the authentication method");
+        }
+
         if (count($err) == 0) {
             print_header();
             foreach ($config as $name => $value) {
-                if (! set_config($name, $value)) {
-                    notify("Problem saving config $name as $value");
+                if (preg_match('/^pluginconfig_(.+?)$/', $name, $matches)) {
+                    $plugin = "auth/$auth";
+                    $name   = $matches[1];
+                    if (! set_config($name, $value, $plugin)) {                        
+                        notify("Problem saving config $name as $value for plugin $plugin");
+                    }
+                } else { // normal handling for 
+                    if (! set_config($name, $value)) {
+                        notify("Problem saving config $name as $value");
+                    }
                 }
             }
             redirect("auth.php?sesskey=$USER->sesskey", get_string("changessaved"), 1);
@@ -51,7 +67,7 @@
         $options[$module] = get_string("auth_$module"."title", "auth");
     }
     asort($options);
-    if (isset($_GET['auth'])) {
+    if (isset($_GET['auth']) && in_array($_GET['auth'], $modules)) {
         $auth = $_GET['auth'];
     } else {
         $auth = $config->auth;
@@ -72,13 +88,6 @@
     }
     $user_fields = array("firstname", "lastname", "email", "phone1", "phone2", "department", "address", "city", "country", "description", "idnumber", "lang");
 
-    foreach ($user_fields as $user_field) {
-        $user_field = "auth_user_$user_field";
-        if (! isset($config->$user_field)) {
-            $config->$user_field = "";
-        }
-    }
-
     if (empty($focus)) {
         $focus = "";
     }
@@ -198,5 +207,87 @@ function validate_form(&$form, &$err) {
     return;
 }
 
+//
+// Good enough for most auth plugins
+// but some may want a custom one if they are offering
+// other options
+// Note: pluginconfig_ fields have special handling. 
+function print_auth_lock_options ($auth, $user_fields, $helptext, $retrieveopts, $updateopts) {
+
+    echo '<tr><td colspan="3">';
+    if ($retrieveopts) {
+        print_heading(get_string('auth_data_mapping', 'auth'));
+    } else {
+        print_heading(get_string('auth_fieldlocks', 'auth'));
+    }
+    echo '<td/></tr>';
+
+    $lockoptions = array ('unlocked'        => get_string('unlocked', 'auth'),
+                          'unlockedifempty' => get_string('unlockedifempty', 'auth'),
+                          'locked'          => get_string('locked', 'auth'));
+    $updatelocaloptions = array('oncreate'  => get_string('update_oncreate', 'auth'),
+                                'onlogin'   => get_string('update_onlogin', 'auth'));
+    $updateextoptions = array('0'  => get_string('update_never', 'auth'),
+                              '1'   => get_string('update_onupdate', 'auth'));
+    
+    $pluginconfig = get_config("auth/$auth");
+    
+    // helptext is on a field with rowspan
+    if (empty($helptext)) {
+                $helptext = '&nbsp;';
+    }
+
+    foreach ($user_fields as $field) {
+
+        // Define some vars we'll work with
+        optional_variable($pluginconfig->{"field_map_$field"}, '');
+        optional_variable($pluginconfig->{"field_updatelocal_$field"}, '');
+        optional_variable($pluginconfig->{"field_updateremote_$field"}, '');
+        optional_variable($pluginconfig->{"field_lock_$field"}, '');
+
+        // define the fieldname we display to the  user
+        $fieldname = $field;
+        if ($fieldname === 'lang') {
+            $fieldname = get_string('language');
+        } elseif (preg_match('/^(.+?)(\d+)$/', $fieldname, $matches)) {
+            $fieldname =  get_string($matches[1]) . ' ' . $matches[2];
+        } else {
+            $fieldname = get_string($fieldname);
+        }
+
+        echo '<tr valign="top"><td align="right">';
+        echo $fieldname;
+        echo '</td><td>';
+
+        if ($retrieveopts) {
+            $varname = 'field_map_' . $field;
+
+            echo "<input name=\"pluginconfig_{$varname}\" type=\"text\" size=\"30\" value=\"{$pluginconfig->$varname}\">";
+            echo '<div align="right">';
+            echo  get_string('auth_updatelocal', 'auth') . '&nbsp;&nbsp;';
+            choose_from_menu($updatelocaloptions, "pluginconfig_field_updatelocal_{$field}", $pluginconfig->{"field_updatelocal_$field"}, "");
+            echo '<br />';
+            if ($updateopts) {
+                echo  get_string('auth_updateremote', 'auth') . '&nbsp;&nbsp;';
+                 '&nbsp;&nbsp;';
+                choose_from_menu($updateextoptions, "pluginconfig_field_updateremote_{$field}", $pluginconfig->{"field_updateremote_$field"}, "");
+                echo '<br />';
+
+
+            }
+            echo  get_string('auth_fieldlock', 'auth') . '&nbsp;&nbsp;';
+            choose_from_menu($lockoptions, "pluginconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, "");
+            echo '</div>';
+        } else {
+            choose_from_menu($lockoptions, "pluginconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, "");
+        }
+        echo '</td>';
+        if (!empty($helptext)) {
+            echo '<td rowspan="' . count($user_fields) . '">' . $helptext . '</td>';
+            $helptext = '';
+        }
+        echo '</tr>';
+    }
+}
 
 ?>

admin/blocks.php

@@ -4,8 +4,9 @@
 
     require_once('../config.php');
     require_once($CFG->libdir.'/blocklib.php');
+    require_once($CFG->libdir.'/tablelib.php');
 
-    optional_variable($_GET['confirm'], 0);
+    $confirm  = optional_param('confirm', 0, PARAM_INT);
     $hide     = optional_param('hide', 0, PARAM_INT);
     $show     = optional_param('show', 0, PARAM_INT);
     $delete   = optional_param('delete', 0, PARAM_INT);
@@ -42,7 +43,6 @@
 
     print_heading($strmanageblocks);
 
-
 /// If data submitted, then process and store.
 
     if (!empty($hide) && confirm_sesskey()) {
@@ -73,12 +73,17 @@
             error("Block doesn't exist!");
         }
 
-        $blockobject = block_instance($block->name);
-        $strblockname = $blockobject->get_title();
+        if (!block_is_compatible($block->name)) {
+            $strblockname = $block->name;
+        }
+        else {
+            $blockobject = block_instance($block->name);
+            $strblockname = $blockobject->get_title();
+        }
 
-        if (!$_GET['confirm']) {
+        if (!$confirm) {
             notice_yesno(get_string('blockdeleteconfirm', '', $strblockname),
-                         'blocks.php?delete='.$block->id.'&confirm=1&sesskey='.$USER->sesskey,
+                         'blocks.php?delete='.$block->id.'&confirm=1&sesskey='.$USER->sesskey,
                          'blocks.php');
             print_footer();
             exit;
@@ -123,7 +128,14 @@
         error('No blocks found!');  // Should never happen
     }
 
+    $incompatible = array();
+
     foreach ($blocks as $block) {
+        if(!block_is_compatible($block->name)) {
+            notify('Block '. $block->name .' is not compatible with the current version of Mooodle and needs to be updated by a programmer.');
+            $incompatible[] = $block;
+            continue;
+        }
         if(($blockobject = block_instance($block->name)) === false) {
             // Failed to load
             continue;
@@ -140,17 +152,23 @@
 
 /// Print the table of all blocks
 
-    $table->head  = array ($strname, $strcourses, $strversion, $strhide.'/'.$strshow, $strmultiple, $strdelete, $strsettings);
-    $table->align = array ('left', 'right', 'left', 'center', 'center', 'center', 'center');
-    $table->wrap = array ('nowrap', '', '', '', '', '', '');
-    $table->size = array ('100%', '10', '10', '10', '10','12');
-    $table->width = '100';
+    $table = new flexible_table('admin-blocks-compatible');
+
+    $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'multiple', 'delete', 'settings'));
+    $table->define_headers(array($strname, $strcourses, $strversion, $strhide.'/'.$strshow, $strmultiple, $strdelete, $strsettings));
+    $table->define_baseurl($CFG->wwwroot.'/admin/blocks.php');
+
+    $table->set_attribute('cellspacing', '0');
+    $table->set_attribute('id', 'blocks');
+    $table->set_attribute('class', 'generaltable generalbox');
+
+    $table->setup();
 
     foreach ($blockbyname as $blockname => $blockid) {
 
         $blockobject = $blockobjects[$blockid];
 
-        $delete = '<a href="blocks.php?delete='.$blockid.'&sesskey='.$USER->sesskey.'">'.$strdelete.'</a>';
+        $delete = '<a href="blocks.php?delete='.$blockid.'&amp;sesskey='.$USER->sesskey.'">'.$strdelete.'</a>';
 
         $settings = ''; // By default, no configuration
         if($blockobject->has_config()) {
@@ -161,26 +179,26 @@
         $class = ''; // Nothing fancy, by default
 
         if ($blocks[$blockid]->visible) {
-            $visible = '<a href="blocks.php?hide='.$blockid.'&sesskey='.$USER->sesskey.'" title="'.$strhide.'">'.
+            $visible = '<a href="blocks.php?hide='.$blockid.'&amp;sesskey='.$USER->sesskey.'" title="'.$strhide.'">'.
                        '<img src="'.$CFG->pixpath.'/i/hide.gif" height="16" width="16" alt="" /></a>';
         } else {
-            $visible = '<a href="blocks.php?show='.$blockid.'&sesskey='.$USER->sesskey.'" title="'.$strshow.'">'.
+            $visible = '<a href="blocks.php?show='.$blockid.'&amp;sesskey='.$USER->sesskey.'" title="'.$strshow.'">'.
                        '<img src="'.$CFG->pixpath.'/i/show.gif" height="16" width="16" alt="" /></a>';
             $class = ' class="dimmed_text"'; // Leading space required!
         }
         if ($blockobject->instance_allow_multiple()) {
             if($blocks[$blockid]->multiple) {
-                $multiple = '<nobr>'.get_string('yes').' (<a href="blocks.php?multiple='.$blockid.'&sesskey='.$USER->sesskey.'">'.get_string('change', 'admin').'</a>)</nobr>';
+                $multiple = '<span style="white-space: nowrap;">'.get_string('yes').' (<a href="blocks.php?multiple='.$blockid.'&amp;sesskey='.$USER->sesskey.'">'.get_string('change', 'admin').'</a>)</span>';
             }
             else {
-                $multiple = '<nobr>'.get_string('no').' (<a href="blocks.php?multiple='.$blockid.'&sesskey='.$USER->sesskey.'">'.get_string('change', 'admin').'</a>)</nobr>';
+                $multiple = '<span style="white-space: nowrap;">'.get_string('no').' (<a href="blocks.php?multiple='.$blockid.'&amp;sesskey='.$USER->sesskey.'">'.get_string('change', 'admin').'</a>)</span>';
             }
         }
         else {
             $multiple = '';
         }
 
-        $table->data[] = array(
+        $table->add_data(array(
             '<span'.$class.'>'.$blockobject->get_title().'</span>',
             $count,
             $blockobject->get_version(),
@@ -188,10 +206,34 @@
             $multiple,
             $delete,
             $settings
-        );
+        ));
     }
 
-    print_table($table);
+    $table->print_html();
+
+    if(!empty($incompatible)) {
+        print_heading(get_string('incompatibleblocks', 'admin'));
+
+        $table = new flexible_table('admin-blocks-incompatible');
+        
+        $table->define_columns(array('block', 'delete'));
+        $table->define_headers(array($strname, $strdelete));
+        $table->define_baseurl($CFG->wwwroot.'/admin/blocks.php');
+    
+        $table->set_attribute('cellspacing', '0');
+        $table->set_attribute('id', 'incompatible');
+        $table->set_attribute('class', 'generaltable generalbox');
+    
+        $table->setup();
+
+        foreach ($incompatible as $block) {
+            $table->add_data(array(
+                $block->name,
+                '<a href="blocks.php?delete='.$block->id.'&amp;sesskey='.$USER->sesskey.'">'.$strdelete.'</a>',
+            ));
+        }
+        $table->print_html();
+    }
 
     print_footer();
 

admin/calendar.html

@@ -26,13 +26,14 @@
       <td>
         <div><?php print_string('helpweekenddays', 'admin'); ?></div>
         <p>
-        <input type="checkbox" name="weekend[]" value="1" id="weekend1" <?php if(CALENDAR_WEEKEND &  2) echo 'checked="checked"'; ?> /> <label for="weekend1"><?php print_string('monday', 'calendar'); ?></label>
-        <input type="checkbox" name="weekend[]" value="2" id="weekend2" <?php if(CALENDAR_WEEKEND &  4) echo 'checked="checked"'; ?> /> <label for="weekend2"><?php print_string('tuesday', 'calendar'); ?></label>
-        <input type="checkbox" name="weekend[]" value="3" id="weekend3" <?php if(CALENDAR_WEEKEND &  8) echo 'checked="checked"'; ?> /> <label for="weekend3"><?php print_string('wednesday', 'calendar'); ?></label>
-        <input type="checkbox" name="weekend[]" value="4" id="weekend4" <?php if(CALENDAR_WEEKEND & 16) echo 'checked="checked"'; ?> /> <label for="weekend4"><?php print_string('thursday', 'calendar'); ?></label>
-        <input type="checkbox" name="weekend[]" value="5" id="weekend5" <?php if(CALENDAR_WEEKEND & 32) echo 'checked="checked"'; ?> /> <label for="weekend5"><?php print_string('friday', 'calendar'); ?></label>
-        <input type="checkbox" name="weekend[]" value="6" id="weekend6" <?php if(CALENDAR_WEEKEND & 64) echo 'checked="checked"'; ?> /> <label for="weekend6"><?php print_string('saturday', 'calendar'); ?></label>
-        <input type="checkbox" name="weekend[]" value="0" id="weekend0" <?php if(CALENDAR_WEEKEND &  1) echo 'checked="checked"'; ?> /> <label for="weekend0"><?php print_string('sunday', 'calendar'); ?></label>
+        <span style="white-space: nowrap;"><input type="checkbox" name="weekend[]" value="1" id="weekend1" <?php if(CALENDAR_WEEKEND &  2) echo 'checked="checked"'; ?> /> <label for="weekend1"><?php print_string('monday', 'calendar'); ?></label></span>
+        <span style="white-space: nowrap;"><input type="checkbox" name="weekend[]" value="2" id="weekend2" <?php if(CALENDAR_WEEKEND &  4) echo 'checked="checked"'; ?> /> <label for="weekend2"><?php print_string('tuesday', 'calendar'); ?></label></span>
+        <span style="white-space: nowrap;"><input type="checkbox" name="weekend[]" value="3" id="weekend3" <?php if(CALENDAR_WEEKEND &  8) echo 'checked="checked"'; ?> /> <label for="weekend3"><?php print_string('wednesday', 'calendar'); ?></label></span>
+        <span style="white-space: nowrap;"><input type="checkbox" name="weekend[]" value="4" id="weekend4" <?php if(CALENDAR_WEEKEND & 16) echo 'checked="checked"'; ?> /> <label for="weekend4"><?php print_string('thursday', 'calendar'); ?></label></span>
+        <span style="white-space: nowrap;"><input type="checkbox" name="weekend[]" value="5" id="weekend5" <?php if(CALENDAR_WEEKEND & 32) echo 'checked="checked"'; ?> /> <label for="weekend5"><?php print_string('friday', 'calendar'); ?></label></span>
+        <br />
+        <span style="white-space: nowrap;"><input type="checkbox" name="weekend[]" value="6" id="weekend6" <?php if(CALENDAR_WEEKEND & 64) echo 'checked="checked"'; ?> /> <label for="weekend6"><?php print_string('saturday', 'calendar'); ?></label></span>
+        <span style="white-space: nowrap;"><input type="checkbox" name="weekend[]" value="0" id="weekend0" <?php if(CALENDAR_WEEKEND &  1) echo 'checked="checked"'; ?> /> <label for="weekend0"><?php print_string('sunday', 'calendar'); ?></label></span>
         </p>
       </td>
     </tr>

admin/config.php

@@ -109,6 +109,7 @@
     print_simple_box_start('center');
     
     echo '<form method="post" action="config.php" name="form">';
+    echo '<center><input type="submit" value="'.get_string('savechanges').'" /></center>';
 
 /// Cycle through each section of the configuration
     foreach ($configvars as $sectionname=>$section) {

admin/configvars.php

@@ -201,6 +201,10 @@ class configvarrss extends configvar {
     $permissions['messaging'] = new configvar (get_string('configmessaging', 'admin'),
         choose_from_menu ($noyesoptions, 'messaging', $config->messaging, '', '', '', true) );
 
+/// allowobjectembed
+    $permissions['allowobjectembed'] = new configvar (get_string('configallowobjectembed', 'admin'),
+        choose_from_menu ($noyesoptions, 'allowobjectembed', $config->allowobjectembed, '', '', '', true) );
+
 
 
 ////////////////////////////////////////////////////////////////////
@@ -220,6 +224,9 @@ class configvarrss extends configvar {
     $interface['langlist'] = new configvar ( get_string('configlanglist', 'admin'),
         '<input name="langlist" type="text" size="60" value="'.s($config->langlist).'" alt="langlist" />' );
 
+/// language menu
+    $interface['langcache'] = new configvar ( get_string('configlangcache', 'admin'),
+        choose_from_menu($noyesoptions, 'langcache', $config->langcache, '', '', '', true) );
 /// locale
     $interface['locale'] = new configvar ( get_string('configlocale', 'admin'),
         '<input name="locale" type="text" size="10" value="'.s($config->locale).'" alt="locale" />' );

admin/creators.html

@@ -5,11 +5,19 @@
   <table align="center" border="0" cellpadding="5" cellspacing="0">
     <tr>
       <td valign="top">
-          <?php echo count($creators) . " ". $strexistingcreators ?>
+          <?php
+              $a->count = count($creators);
+              $a->items = $strexistingcreators;
+              print_string('counteditems', '', $a);
+          ?>
       </td>
       <td></td>
       <td valign="top">
-          <?php echo $usercount . " " . $strpotentialcreators ?>
+          <?php
+              $a->count = $usercount;
+              $a->items = $strpotentialcreators;
+              print_string('counteditems', '', $a);
+          ?>
       </td>
     </tr>
     <tr>

admin/creators.php

@@ -1,7 +1,7 @@
 <?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);
 
@@ -42,7 +42,7 @@
         $$strstringtoload = get_string($stringtoload);
     }
 
-	print_header("$site->shortname: $strassigncreators", 
+    print_header("$site->shortname: $strassigncreators", 
                  "$site->fullname", 
                  "<a href=\"index.php\">$stradministration</a> -> <a href=\"users.php\">$strusers</a> ->
                   $strassigncreators", "creatorsform.searchtext");

admin/cron.php

@@ -36,6 +36,9 @@
         $USER = get_admin();      /// Temporarily, to provide environment for this script
     }
 
+    //unset test cookie, user must login again anyway
+    setcookie('MoodleSessionTest'.$CFG->sessioncookie, '', time() - 3600, '/');
+
 /// Start output log
 
     $timenow  = time();
@@ -66,6 +69,12 @@
     }
     mtrace("Finished activity modules");
 
+    if (!empty($CFG->langcache)) {
+        mtrace('Updating languages cache');
+        get_list_of_languages();
+    }
+
+
 /// Run all core cron jobs, but not every time since they aren't too important.
 /// These don't have a timer to reduce load, so we'll use a random number 
 /// to randomly choose the percentage of times we should run these jobs.
@@ -118,11 +127,6 @@
         }
         flush();
 
-        if (!empty($CFG->langcache)) {
-            get_list_of_languages();
-        }
-        flush();
-
         if (!empty($CFG->notifyloginfailures)) {
             notify_login_failures();
         }
@@ -132,16 +136,12 @@
 
     } // End of occasional clean-up tasks
 
-    if (file_exists("$CFG->dataroot/cronextra.php")) {
-        mtrace("Running extra commands in $CFG->dataroot/cronextra.php ...");
-        include("$CFG->dataroot/cronextra.php");
-    }
 
     if (!isset($CFG->disablescheduledbackups)) {   // Defined in config.php
         //Execute backup's cron
         //Perhaps a long time and memory could help in large sites
         @set_time_limit(0);
-        raise_memory_limit("128M");
+        @raise_memory_limit("128M");
         if (file_exists("$CFG->dirroot/backup/backup_scheduled.php") and
             file_exists("$CFG->dirroot/backup/backuplib.php") and
             file_exists("$CFG->dirroot/backup/lib.php") and

admin/dbperformance.php

@@ -14,7 +14,7 @@
     $site = get_site();
 
     if (isset($topframe)) {
-	    print_header("$site->shortname: $strdatabaseperformance", "$site->fullname", 
+        print_header("$site->shortname: $strdatabaseperformance", "$site->fullname", 
                      "<a target=\"$CFG->framename\" href=\"index.php\">$stradministration</a> -> Database performance");
         exit;
     }

admin/delete.php

@@ -7,22 +7,29 @@
 
     require_login();
 
+    $sure = optional_param('sure', '');
+    $reallysure = optional_param('reallysure', '');
+
     if (!isadmin()) {
         error('You must be admin to use this script!');
     }
 
     $deletedir = $CFG->dataroot;   // The directory to delete!
 
-    if (!$sure) {
-        notice_yesno ('Are you completely sure you want to delete everything inside the directory '. $deletedir .' ?', 'delete.php?sure=yes', 'index.php');
+    if (empty($sure)) {
+        notice_yesno ('Are you completely sure you want to delete everything inside the directory '. $deletedir .' ?', 'delete.php?sure=yes&sesskey='.sesskey(), 'index.php');
         exit;
     }
 
-    if (!$reallysure) {
-        notice_yesno ('Are you REALLY REALLY completely sure you want to delete everything inside the directory '. $deletedir .' (this includes all user images, and any other course files that have been created) ?', 'delete.php?sure=yes&reallysure=yes', 'index.php');
+    if (empty($reallysure)) {
+        notice_yesno ('Are you REALLY REALLY completely sure you want to delete everything inside the directory '. $deletedir .' (this includes all user images, and any other course files that have been created) ?', 'delete.php?sure=yes&reallysure=yes&sesskey='.sesskey(), 'index.php');
         exit;
     }
 
+    if (!confirm_sesskey()) {
+        error('This script was called wrongly');
+    }
+
     /// OK, here goes ...
 
     delete_subdirectories($deletedir);
@@ -60,4 +67,4 @@ function delete_subdirectories($rootdir) {
     closedir($dir);
 }
   
-?>
+?>

admin/editor.html

@@ -3,7 +3,7 @@
 <table border="0" cellpadding="4" cellspacing="2">
 <tr>
     <td align="right" valign="top">htmleditor:</td>
-    <td valign="top"> 
+    <td valign="top">
     <?php
        unset($options);
        $options[0] = get_string("allownot");
@@ -179,7 +179,7 @@
         <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>&nbsp;</td>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_replace.gif" width="18" height="18" alt="<?php print_string("popupeditor","editor");?>" title="<?php print_string("searchandreplace","editor");?>" /></td>
     </tr>
     <tr>
         <td><input type="checkbox" name="buttons[inserthorizontalrule]"<?php print(in_array("inserthorizontalrule", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
@@ -193,6 +193,34 @@
         <td><input type="checkbox" name="buttons[spellcheck]"<?php print(in_array("spellcheck", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
         <td><input type="checkbox" name="buttons[htmlmode]"<?php print(in_array("htmlmode", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
         <td><input type="checkbox" name="buttons[popupeditor]"<?php print(in_array("popupeditor", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td><input type="checkbox" name="buttons[search_replace]"<?php print(in_array("search_replace", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+    </tr>
+    <tr>
+        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/images/ed_nolink.gif" width="18" height="18" alt="<?php print_string("horizontalrule","editor");?>" title="<?php print_string("nolink","editor");?>" /></td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+    </tr>
+    <tr>
+        <td><input type="checkbox" name="buttons[nolink]"<?php print(in_array("nolink", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
         <td>&nbsp;</td>
     </tr>
     </table>

admin/editor.php

@@ -102,7 +102,7 @@ function editor_update_config ($data) {
     $updatedata['editorbackgroundcolor'] = !empty($data->backgroundcolor) ? $data->backgroundcolor : "#ffffff";
     $updatedata['editorfontfamily'] = !empty($data->fontfamily) ? str_replace($nochars,"",$data->fontfamily) : "Times New Roman, Times";
     $updatedata['editorfontsize'] = !empty($data->fontsize) ? $data->fontsize : "";
-    $updatedata['editorkillword'] = !empty($data->killword) ? $data->killword : "true";
+    $updatedata['editorkillword'] = !empty($data->killword) ? $data->killword : 0;
     $updatedata['editorspelling'] = !empty($data->spelling) ? $data->spelling : 0;
     $updatedata['editorfontlist'] = $fontlist;
     $updatedata['editordictionary'] = !empty($data->dictionary) ? $data->dictionary : '';

admin/enrol.php

@@ -27,12 +27,12 @@
 
 /// If data submitted, then process and store.
 
-	if ($frm = data_submitted()) {
+    if ($frm = data_submitted()) {
         if ($enrolment->process_config($frm)) {
             set_config('enrol', $frm->enrol);
             redirect("enrol.php?sesskey=$USER->sesskey", get_string("changessaved"), 1);
         }
-	} else {
+    } else {
         $frm = $CFG;
     }
 
@@ -59,7 +59,7 @@
 
 /// Choose an enrolment method
     echo get_string('chooseenrolmethod').': ';
-	choose_from_menu ($options, "enrol", $enrol, "",
+    choose_from_menu ($options, "enrol", $enrol, "",
                       "document.location='enrol.php?sesskey=$USER->sesskey&enrol='+document.enrolmenu.enrol.options[document.enrolmenu.enrol.selectedIndex].value", "");
 
     echo "</b></p></div>";

admin/environment.php

@@ -0,0 +1,128 @@
+<?php  //$Id$
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.com                                            //
+//                                                                       //
+// Copyright (C) 2001-3001 Martin Dougiamas        http://dougiamas.com  //
+//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
+//                                                                       //
+// This program is free software; you can redistribute it and/or modify  //
+// it under the terms of the GNU General Public License as published by  //
+// the Free Software Foundation; either version 2 of the License, or     //
+// (at your option) any later version.                                   //
+//                                                                       //
+// This program is distributed in the hope that it will be useful,       //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
+// GNU General Public License for more details:                          //
+//                                                                       //
+//          http://www.gnu.org/copyleft/gpl.html                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+// This file is the admin frontend to execute all the checks available
+// in the environment.xml file. It includes database, php and
+// php_extensions. Also, it's possible to update the xml file
+// from moodle.org be able to check more and more versions.
+
+    require_once('../config.php');
+    require_once($CFG->libdir.'/environmentlib.php');
+
+
+/// Parameters
+    $action = optional_param('action', '', PARAM_ALPHA);
+    $sesskey = optional_param('sesskey');
+    $version = optional_param('version');
+
+/// Security checks
+    require_login();
+
+    if (!isadmin()) {
+        error('You need to be admin to use this page');
+    }
+
+    if (!$site = get_site()) {
+        error("Site isn't defined!");
+    }
+
+/// Get some strings
+    $stradmin = get_string('administration');
+    $stradminhelpenvironment = get_string("adminhelpenvironment");
+    $strenvironment = get_string('environment', 'admin');
+    $strerror = get_string('error');
+    $strmoodleversion = get_string('moodleversion');
+    $strupwards = get_string('upwards', 'admin');
+
+/// Print the header stuff
+    print_header("$SITE->shortname: $strenvironment", $SITE->fullname,
+                 "<a href=\"index.php\">$stradmin</a> -> ".$strenvironment);
+
+    print_heading($strenvironment);
+
+/// Start of main box
+    print_simple_box_start('center');
+
+    echo "<center>".$stradminhelpenvironment."</center><br />";
+
+/// Get current Moodle version
+    $current_version = $CFG->release;
+
+/// Calculate list of versions
+    $versions = array();
+    if ($contents = load_environment_xml()) {
+        if ($env_versions = get_list_of_environment_versions($contents)) {
+        /// Set the current version at the beginning
+            $env_version = normalize_version($current_version); //We need this later (for the upwards)
+            $versions[$env_version] = $current_version;
+        /// If no version has been previously selected, default to $current_version
+            if (empty($version)) {
+                $version =  $env_version;
+            }
+        ///Iterate over each version, adding bigged than current
+            foreach ($env_versions as $env_version) {
+                if (version_compare(normalize_version($current_version), $env_version, '<')) {
+                    $versions[$env_version] = $env_version;
+                }
+            }
+        /// Add 'upwards' to the last element
+            $versions[$env_version] = $env_version.' '.$strupwards;
+        } else {
+            $versions = array('error' => $strerror);
+        }
+    }
+
+/// Print form and popup menu
+    echo '<center><form method="post" action="'.$CFG->wwwroot.'/admin/environment.php">';
+    echo $strmoodleversion.' ';
+    choose_from_menu ($versions, 'version', $version, null, 'this.form.submit();' );
+    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+    echo '</form></center>';
+/// End of main box
+    print_simple_box_end();
+
+/// Gather and show results
+    $status = check_moodle_environment($version, $environment_results);
+
+
+
+/// Process action
+    if ($form = data_submitted()) {
+        if (confirm_sesskey()) {
+            if ($form->action == "disable") {
+
+            } else {
+
+            }
+        }
+    }
+
+/// Default action, show explanation and popup menu
+
+
+/// Print footer
+    print_footer();
+?>

admin/environment.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<COMPATIBILITY_MATRIX>
+  <MOODLE version="1.5">
+    <DATABASE level="required">
+      <VENDOR name="mysql" version="3.23" />
+      <VENDOR name="postgres" version="7.4" />
+    </DATABASE>
+    <PHP version="4.1.0" level="required" />
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="mbstring" level="optional" />
+    </PHP_EXTENSIONS>
+  </MOODLE>
+  <MOODLE version="1.6">
+    <DATABASE level="required">
+      <VENDOR name="mysql" version="4.1.12" />
+      <VENDOR name="postgres" version="7.4" />
+    </DATABASE>
+    <PHP version="4.3.0" level="required" />
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="optional" />
+      <PHP_EXTENSION name="mbstring" level="optional" />
+    </PHP_EXTENSIONS>
+  </MOODLE>
+</COMPATIBILITY_MATRIX>

admin/filters.html

@@ -85,8 +85,8 @@
 <input type="hidden" name="options" value="1">
 <table cellpadding="20">
 <tr valign="top">
-	<td nowrap="nowrap" align="right"><?php p($strcachetext) ?>:</td>
-	<td>
+    <td nowrap="nowrap" align="right"><?php p($strcachetext) ?>:</td>
+    <td>
     <?php 
        unset($options);
        $options[604800]  = get_string('numdays', '', 7);
@@ -115,12 +115,12 @@
     ?>
     </td>
     <td>
-	<?php p($strconfigcachetext) ?>
+    <?php p($strconfigcachetext) ?>
     </td>
 </tr>
 <tr valign="top">
-	<td nowrap="nowrap" align="right"><?php p($strfilteruploadedfiles) ?>:</td>
-	<td>
+    <td nowrap="nowrap" align="right"><?php p($strfilteruploadedfiles) ?>:</td>
+    <td>
     <?php 
        unset($options);
        $options[0] = get_string('no');
@@ -130,12 +130,12 @@
     ?>
     </td>
     <td>
-	<?php p($strconfigfilteruploadedfiles) ?>
+    <?php p($strconfigfilteruploadedfiles) ?>
     </td>
 </tr>
 <tr valign="top">
-	<td nowrap="nowrap" align="right"><?php p($strfilterall) ?>:</td>
-	<td>
+    <td nowrap="nowrap" align="right"><?php p($strfilterall) ?>:</td>
+    <td>
     <?php 
        unset($options);
        $options[0] = get_string('no');
@@ -145,7 +145,7 @@
     ?>
     </td>
     <td>
-	<?php p($strconfigfilterall) ?>
+    <?php p($strconfigfilterall) ?>
     </td>
 </tr>
 <tr valign="top">

admin/filters.php

@@ -84,7 +84,7 @@
 /// If data submitted, then process and store.
 
     if (!empty($options)) {
-	    if (($config = data_submitted()) && confirm_sesskey()) {  
+        if (($config = data_submitted()) && confirm_sesskey()) {  
             unset($config->options);
             unset($config->sesskey);
             foreach ($config as $name => $value) {

admin/health.php

@@ -477,6 +477,38 @@ class problem_000010 extends problem_base {
     }
 }
 
+class problem_000011 extends problem_base {
+    function title() {
+        return 'Session errors detected';
+    }
+    function exists() {
+        global $CFG;
+        return isset($CFG->session_error_counter);
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        global $CFG;
+        if (isset($CFG->session_error_counter)) {
+            return 'Session problems were detected. Total count: '.$CFG->session_error_counter;
+        } else {
+            return 'No session errors detected.';
+        }
+    }
+    function solution() {
+        global $CFG;
+        if (isset($_GET['resetsesserrorcounter'])) {
+            if (get_field('config', 'name', 'name', 'session_error_counter')) {
+                delete_records('config', 'name', 'session_error_counter');
+            }
+            return 'Error counter was cleared.';
+        } else {
+            return '<p>Session errors can be caused by:<ul><li>unresolved problem in server software (aka random switching of users),</li><li>blocked or modified cookies,</li><li>deleting of active session files.</li></ul></p><p><a href="'.me().'&resetsesserrorcounter=1">Reset counter.</a></p>';
+        }
+    }
+}
+
 
 class problem_00000x extends problem_base {
     function title() {

admin/index.php

@@ -66,9 +66,12 @@
         $CFG->version = "";
     }
 
-/// Turn off time limits, sometimes upgrades can be slow.
+/// 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.
 
@@ -153,6 +156,7 @@
                 if (main_upgrade($CFG->version)) {
                     $db->debug=false;
                     if (set_config("version", $version)) {
+                        remove_dir($CFG->dataroot . '/cache', true); // flush cache
                         notify($strdatabasesuccess, "green");
                         print_continue("index.php");
                         exit;
@@ -256,11 +260,11 @@
     if (empty($CFG->siteidentifier)) {    // Unique site identification code
         set_config('siteidentifier', random_string(32));
     }
-    
+
 /// Check if the guest user exists.  If not, create one.
     if (! record_exists("user", "username", "guest")) {
-        $guest->auth        = "manual"; 
-        $guest->username    = "guest"; 
+        $guest->auth        = "manual";
+        $guest->username    = "guest";
         $guest->password    = md5("guest");
         $guest->firstname   = addslashes(get_string("guestuser"));
         $guest->lastname    = " ";
@@ -287,6 +291,14 @@
         error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
     }
 
+/// Check if we are returning from moodle.org registration and if so, we mark that fact to remove reminders
+
+    if (!empty($_GET['id'])) {
+        if ($_GET['id'] == $CFG->siteidentifier) {
+            set_config('registered', time());
+        }
+    }
+
 /// At this point everything is set up and the user is an admin, so print menu
 
     $stradministration = get_string("administration");
@@ -311,11 +323,25 @@
         print_simple_box(get_string('sitemaintenancewarning', 'admin') , 'center');
     }
 
+/// Print slightly annoying registration button every six months   ;-)
+/// You can set the "registered" variable to something far in the future 
+/// if you really want to prevent this.   eg  9999999999
+    if (!isset($CFG->registered) || $CFG->registered < (time() - 3600*24*30*6)) {
+        $options = array();
+        $options['sesskey'] = $USER->sesskey;
+        print_simple_box_start('center');
+        echo '<div align="center">';
+        print_string('pleaseregister', 'admin');
+        print_single_button('register.php', $options, get_string('registration'));
+        echo '</div>';
+        print_simple_box_end();
+    }
+
     $table->tablealign = "right";
     $table->align = array ("right", "left");
     $table->wrap = array ("nowrap", "nowrap");
-    $table->cellpadding = 4;
-    $table->cellspacing = 3;
+    $table->cellpadding = 5;
+    $table->cellspacing = 0;
     $table->width = "40%";
 
     $configdata  = "<font size=\"+1\">&nbsp;</font><a href=\"config.php\">".get_string("configvariables", 'admin')."</a> - <font size=\"1\">".
@@ -396,20 +422,20 @@
     //////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-    echo "<table border=\"0\" align=\"center\" width=\"100%\"><tr>";
-    echo "<td align=\"center\" width=\"33%\">";
-    print_single_button("$CFG->wwwroot/doc", NULL, get_string("documentation"));
-    echo "</td>";
+    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%">';
+    print_single_button('phpinfo.php', NULL, get_string('phpinfo'));
+    echo '</td>';
 
-    echo "<td align=\"center\" width=\"33%\">";
+    echo '<td align="center" width="33%">';
+    $options = array();
     $options['sesskey'] = $USER->sesskey;
-    print_single_button("register.php", $options, get_string("registration"));
-    echo "</td>";
-    echo "<tr></table>";
+    print_single_button('register.php', $options, get_string('registration'));
+    echo '</td></tr></table>';
 
     print_simple_box_end();
 

admin/langdoc.php

@@ -4,8 +4,10 @@
 This script enables Moodle translators to edit /docs and /help language
 files directly via WWW interface.
 
-Author:     mudrd8mz@it.pedf.cuni.cz (http://moodle.cz)
+Author:     mudrd8mz@uxit.pedf.cuni.cz (http://moodle.cz)
 Based on:   lang.php in 1.4.3+ release
+Thanks:     Jaime Villate for important bug fixing, koen roggemans for his job and all moodlers
+            for intensive testing of this my first contribution
 */
 
     //
@@ -158,7 +160,7 @@ $langdir/$currentfile")."</font></p>";
 
         echo "<table align=\"center\"><tr valign=\"center\"><td align=\"center\">\n";
         echo "<textarea rows=\"$fileeditorrows\" cols=\"$fileeditorcols\" name=\"\">\n";
-        include("$enlangdir/$currentfile");
+        echo htmlspecialchars(file_get_contents("$enlangdir/$currentfile"));
         echo "</textarea>\n";
         link_to_popup_window("/lang/en/$currentfile", "popup", get_string("preview"));
         echo "</td>\n";
@@ -176,7 +178,7 @@ $langdir/$currentfile")."</font></p>";
         echo "<textarea rows=\"$fileeditorrows\" cols=\"$fileeditorcols\" name=\"filedata\">\n";
 
         if (file_exists("$langdir/$currentfile")) {
-            include("$langdir/$currentfile");
+	    echo htmlspecialchars(file_get_contents("$langdir/$currentfile"));
         } else {
             echo ($filetemplate);
         }
@@ -216,11 +218,9 @@ function langdoc_save_file($path, $file, $content) {
 
     $content = str_replace("\r", "",$content);              // Remove linefeed characters
     $content = preg_replace("/\n{3,}/", "\n\n", $content);  // Collapse runs of blank lines
-    $content = str_replace("\\","",$content);               // Delete all slashes
-    $content = str_replace("%%","%",$content);
     $content = trim($content);                              // Delete leading/trailing whitespace
-
-    fwrite($f, $content);
+        
+    fwrite($f, stripslashes($content));
 
     fclose($f);
 

admin/maintenance.php

@@ -17,7 +17,7 @@
             error("Could not create site folder.  The site administrator needs to fix the file permissions");
         }
 
-    $filename = $CFG->dataroot.'/1/maintenance.html';
+    $filename = $CFG->dataroot.'/'.SITEID.'/maintenance.html';
 
     if ($form = data_submitted()) {
         if (confirm_sesskey()) {
@@ -26,7 +26,7 @@
                 redirect('index.php', get_string('sitemaintenanceoff','admin'));
             } else {
                 $file = fopen($filename, 'w');
-                fwrite($file, $form->text);
+                fwrite($file, stripslashes($form->text));
                 fclose($file);
                 redirect('index.php', get_string('sitemaintenanceon', 'admin'));
             }

admin/module.php

@@ -20,21 +20,36 @@
         if (!confirm_sesskey()) {
             error(get_string('confirmsesskeybad', 'error'));
         }
+        
+        if ($module = optional_param('module', '', PARAM_CLEANFILE)) {
+            // if the config.html contains a hidden form field giving
+            // the module name then the form does not have to prefix all
+            // its variable names, we will do it here.
+            $moduleprefix = $module.'_';
+            // let the module process the form data if it has to,
+            // $config is passed to this function by reference
+            require_once("$CFG->dirroot/mod/$module/lib.php");
+            $moduleconfig = $module.'_process_options';
+            if (function_exists($moduleconfig)) {
+                $moduleconfig($config);
+            }
+        } else {
+            $moduleprefix = '';
+        }
+
         print_header();
+
         foreach ($config as $name => $value) {
-            set_config($name, $value);
+            set_config($moduleprefix.$name, $value);
         }
         redirect("$CFG->wwwroot/$CFG->admin/modules.php", get_string("changessaved"), 1);
         exit;
-	}
+    }
 
 /// Otherwise print the form.
 
-    require_variable($module);
-
-    $module = clean_filename($module);
-	require_once("$CFG->dirroot/mod/$module/lib.php");
-
+    $module = required_param('module', '', PARAM_CLEANFILE);
+    require_once("$CFG->dirroot/mod/$module/lib.php");
 
     $stradmin = get_string("administration");
     $strconfiguration = get_string("configuration");
@@ -52,7 +67,7 @@
     echo "<br />";
 
     print_simple_box_start("center", "");
-	include("$CFG->dirroot/mod/$module/config.html");
+    include("$CFG->dirroot/mod/$module/config.html");
     print_simple_box_end();
 
     print_footer();

admin/oacleanup.php

@@ -0,0 +1,148 @@
+<?php
+
+if (!isset($CFG)) {
+
+    require('../config.php');
+
+    require_login();
+
+    if (!isadmin()) {
+        error('You must be an admin to use this script');
+        exit;
+    }
+    
+    print_header_simple('Online Assignment Cleanup','Online Assignment Cleanup', 'Admin');
+
+    online_assignment_cleanup(true);
+
+    print_footer();
+
+}
+
+
+
+function online_assignment_cleanup($output=false) {
+    global $CFG;
+
+    if ($output) {
+        print_heading('Online Assignment Cleanup');
+        echo '<center>';
+    }
+
+    // get the module id for assignments from db
+    $arecord = get_record('modules', 'name', 'assignment');
+    $aid = $arecord->id;
+
+
+    /// get a list of all courses on this site
+    $courses = get_courses();
+
+    /// cycle through each course
+    foreach ($courses as $course) {
+
+        $fullname = empty($course->fullname) ? 'Course: '.$course->id : $course->fullname;
+        if ($output) print_heading($fullname);
+
+        /// retrieve a list of sections beyond what is currently being shown
+        $sql = 'SELECT * FROM '.$CFG->prefix.'course_sections WHERE `course`='.$course->id.' AND `section`>'.$course->numsections.' ORDER BY `section` ASC';
+        if (!($xsections = get_records_sql($sql))) {
+            if ($output) echo 'No extra sections<br />';
+            continue;
+        }
+
+        /// cycle through each of the xtra sections
+        foreach ($xsections as $xsection) {
+
+            if ($output) echo 'Checking Section: '.$xsection->section.'<br />';
+
+            /// grab any module instances from the sequence field
+            if (!empty($xsection->sequence)) {
+                $instances = explode(',', $xsection->sequence);
+
+                /// cycle through the instances
+                foreach ($instances as $instance) {
+                    /// is this an instance of an online assignment
+                    $sql = "SELECT a.id 
+                        FROM  {$CFG->prefix}course_modules cm,
+                    {$CFG->prefix}assignment a
+                    WHERE cm.id = '$instance' AND
+                        cm.module = '$aid' AND
+                        cm.instance = a.id AND
+                        a.assignmenttype = 'online'";
+
+
+                    /// if record exists then we need to move instance to it's correct section
+                    if (record_exists_sql($sql)) {
+
+                        /// check the new section id
+                        /// the journal update erroneously stored it in course_sections->section
+                        $newsection = $xsection->section;
+                        /// double check the new section
+                        if ($newsection > $course->numsections) {
+                            /// get the record for section 0 for this course
+                            if (!($zerosection = get_record('course_sections', 'course', $course->id, 'section', '0'))) {
+                                continue;
+                            }
+                            $newsection = $zerosection->id;
+                        }
+
+                        /// grab the section record
+                        if (!($section = get_record('course_sections', 'id', $newsection))) {
+                            if ($output) echo 'Serious error: Cannot retrieve section: '.$newsection.' for course: '.$course->fullname.'<br />';
+                            continue;
+                        }
+
+                        /// explode the sequence
+                        if  (($sequence = explode(',', $section->sequence)) === false) {
+                            $sequence = array();
+                        }
+
+                        /// add instance to correct section
+                        array_push($sequence, $instance);
+
+                        /// implode the sequence
+                        $section->sequence = implode(',', $sequence);
+
+                        set_field('course_sections', 'sequence', $section->sequence, 'id', $section->id);
+
+                        /// now we need to remove the instance from the old sequence
+
+                        /// grab the old section record
+                        if (!($section = get_record('course_sections', 'id', $xsection->id))) {
+                            if ($output) echo 'Serious error: Cannot retrieve old section: '.$xsection->id.' for course: '.$course->fullname.'<br />';
+                            continue;
+                        }
+
+                        /// explode the sequence
+                        if  (($sequence = explode(',', $section->sequence)) === false) {
+                            $sequence = array();
+                        }
+
+                        /// remove the old value from the array
+                        $key = array_search($instance, $sequence);
+                        unset($sequence[$key]);
+
+                        /// implode the sequence
+                        $section->sequence = implode(',', $sequence);
+
+                        set_field('course_sections', 'sequence', $section->sequence, 'id', $section->id);
+
+                        
+                        if ($output) echo 'Online Assignment (instance '.$instance.') moved from section '.$section->id.': to section '.$newsection.'<br />';
+
+                    }
+                }
+            }
+
+            /// if the summary and sequence are empty then remove this section
+            if (empty($xsection->summary) and empty($xsection->sequence)) {
+                delete_records('course_sections', 'id', $xsection->id);
+                if ($output) echo 'Deleting empty section '.$xsection->section.'<br />';
+            }
+        }
+    }
+
+    echo '</center>';
+}
+
+?>

admin/phpinfo.php

@@ -13,7 +13,7 @@
         $stradministration = get_string("administration");
         $site = get_site();
     
-	    print_header("$site->shortname: phpinfo", "$site->fullname", 
+        print_header("$site->shortname: phpinfo", "$site->fullname", 
                      "<a target=\"$CFG->framename\" href=\"index.php\">$stradministration</a> -> PHP info");
         exit;
     }

admin/process_email.php

@@ -45,7 +45,7 @@ $modargs = substr($address,6,-16);
 $hash = substr($address,-16);
 
 if (substr(md5($prefix.$mod.$modargs.$CFG->siteidentifier),0,16) != $hash) {
-	die("HASH DIDN'T MATCH!\n");
+    die("HASH DIDN'T MATCH!\n");
 }
 list(,$modid) = unpack('C',base64_decode($mod.'=='));
 
@@ -59,7 +59,7 @@ else {
 $function = $modname.'_process_email';
 
 if (!function_exists($function)) {
-	die(); 
+    die(); 
 }
 $fd = fopen('php://stdin','r');
 if (!$fd) {
@@ -76,4 +76,4 @@ fclose($handle);
 
 
 
-?>
+?>

admin/register.php

@@ -36,7 +36,7 @@
     $strregistration = get_string("registration");
     $strregistrationinfo = get_string("registrationinfo");
 
-	print_header("$site->shortname: $strregistration", "$site->fullname", 
+    print_header("$site->shortname: $strregistration", "$site->fullname", 
                  "<a href=\"../$CFG->admin/index.php\">$stradministration</a> -> $strregistration");
 
     print_heading($strregistration);

admin/site.html

@@ -13,8 +13,7 @@
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><?php print_string("frontpagedescription") ?>:<br />
-     <font size="1">
+    <td align="right"><?php print_string("frontpagedescription") ?>:<br /><br />
      <?PHP
         helpbutton("writing", get_string("helpwriting"), "moodle", true, true);
         echo "<br />";
@@ -23,9 +22,8 @@
         } else {
            helpbutton("html", get_string("helphtml"), "moodle", true, true);
         }
+        echo "<br />";
       ?>
-      <br />
-     </font>
     </td>
     <td><?php  print_textarea($usehtmleditor, 20, 50, 600, 400, "summary", $form->summary); ?></td>
 </tr>

admin/site.php

@@ -26,7 +26,7 @@
         if (count($err) == 0) {
 
             set_config("frontpage", $form->frontpage);
-            if ($form->frontpage = FRONTPAGETOPICONLY) {
+            if ($form->frontpage == FRONTPAGETOPICONLY) {
                 $form->numsections = 1;    // Force the topic display for this format
             }
 

admin/upgradeforumread.php

@@ -0,0 +1,160 @@
+<?PHP  //$Id$
+
+    require("../config.php");
+    require("$CFG->dirroot/mod/forum/lib.php");
+
+    optional_variable($confirm);
+
+    require_login();
+
+    if (!isadmin()) {
+        error("You must be an admin to use this script");
+    }
+
+    if ($CFG->version < 2005042300) {
+        error("This script does not work with this old version of Moodle");
+    }
+
+    if (!$site = get_site()) {
+        redirect("index.php");
+    }
+
+
+/// Print header
+
+    $stradministration = get_string("administration");
+    $strupgradingdata  = get_string("upgradingdata", "admin");
+
+    print_header("$site->shortname: $stradministration: $strupgradingdata", "$site->fullname", 
+                 "<a href=\"index.php\">$stradministration</a> -> $strupgradingdata");
+
+    if (empty($_GET['confirm'])) {
+        notice_yesno(get_string("upgradeforumreadinfo", "admin"), 
+                     "upgradeforumread.php?confirm=true&sesskey=$USER->sesskey", 
+                     "index.php");
+        print_footer();
+        exit;
+    } else if (!confirm_sesskey()) {
+        error(get_string('confirmsesskeybad', 'error'));
+    }
+
+
+/// Turn off time limits, sometimes upgrades can be slow.
+
+    @set_time_limit(0);
+    @ob_implicit_flush(true);
+    @ob_end_flush();
+
+    execute_sql('TRUNCATE TABLE '.$CFG->prefix.'forum_read;', false);   // Trash all old entries
+
+/// Enter initial read records for all posts older than 1 day.
+
+/// Timestamp for old posts (and therefore considered read).
+    $dateafter = time() - ($CFG->forum_oldpostdays*24*60*60);
+
+/// Timestamp for one day ago.
+    $onedayago = time() - (24*60*60);
+
+
+/// Get all discussions that have had posts since the old post date.
+    if ($discussions = get_records_select('forum_discussions', 'timemodified > '.$dateafter,
+                                          'course', 'id,course,forum,groupid,userid')) {
+        $dtotal = count($discussions);
+        print_heading('Updating forum post read/unread records for '.$dtotal.' discussions...'.
+                      'Please keep this window open until it completes', '', 3);
+
+        $groups = array();
+    
+        $currcourse = 0;
+        $users = 0;
+        $count = 0;
+        $dcount = 0;
+
+        foreach ($discussions as $discussion) {
+            $dcount++;
+            print_progress($dcount, $dtotal);
+
+            if ($discussion->course != $currcourse) {
+                /// Discussions are ordered by course, so we only need to get any course's users once.
+                $currcourse = $discussion->course;
+                $users = get_course_users($currcourse, '', '', 'u.id,u.confirmed');
+            }
+            /// If this course has users, and posts more than a day old, mark them for each user.
+            if ($users &&
+                    ($posts = get_records_select('forum_posts', 'discussion = '.$discussion->id.
+                                                 ' AND '.$dateafter.' < modified AND modified < '.$onedayago, 
+                                                 '', 'id,discussion,modified'))) {
+                foreach ($users as $user) {
+                    /// If its a group discussion, make sure the user is in the group.
+                    if ($discussion->groupid) {
+                        if (!isset($groups[$discussion->groupid][$user->id])) {
+                            $groups[$discussion->groupid][$user->id] = ismember($discussion->groupid, $user->id);
+                        }
+                    }
+                    if (!$discussion->groupid || !empty($groups[$discussion->groupid][$user->id])) {
+                        foreach ($posts as $post) {
+                            print_progress($dcount, $dtotal);
+                            forum_tp_mark_post_read($user->id, $post, $discussion->forum);
+                        }
+                    }
+                }
+            }
+        }
+        print_progress($dcount, $dtotal, 0);
+    }
+    
+
+    delete_records('config', 'name', 'upgrade', 'value', 'forumread');
+
+    notify('Log upgrading was successful!', 'notifysuccess');
+
+    print_continue('index.php');
+
+    print_footer();
+
+    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/uploaduser.php

@@ -102,11 +102,11 @@
                           "course3" => 1, 
                           "course4" => 1, 
                           "course5" => 1,
-			  "group1" => 1,
-			  "group2" => 1,
-			  "group3" => 1,
-			  "group4" => 1,
-			  "group5" =>1);
+                          "group1" => 1,
+                          "group2" => 1,
+                          "group3" => 1,
+                          "group4" => 1,
+                          "group5" =>1);
 
         // --- get header (field names) ---
         $header = split($csv_delimiter, fgets($fp,1024));
@@ -209,20 +209,20 @@
                         notify(get_string('unknowncourse', 'error', $addcourse[$i]));
                     }
                 }
-		for ($i=0; $i<5; $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]));
-		      }
-		    }
-		  }
-		}
+                    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])) {
@@ -233,26 +233,26 @@
                     }
                 }
                 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 ($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]));
-		    }
-		  }
-		}
+                        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);
             }

admin/user.php

@@ -163,6 +163,7 @@
                 $updateuser->deleted = "1";
                 $updateuser->username = "$user->email.".time();  // Remember it just in case
                 $updateuser->email = "";               // Clear this field to free it up
+                $updateuser->idnumber = "";               // Clear this field to free it up
                 $updateuser->timemodified = time();
                 if (update_record("user", $updateuser)) {
                     unenrol_student($user->id);  // From all courses

admin/users.php

@@ -27,12 +27,10 @@
 
     $table->data[] = array("<b><a href=\"user.php\">".get_string("edituser")."</a></b>",
                            get_string("adminhelpedituser"));
-    if (is_internal_auth()) {
-        $table->data[] = array("<b><a href=\"$CFG->wwwroot/$CFG->admin/user.php?newuser=true&amp;sesskey=$USER->sesskey\">".get_string("addnewuser")."</a></b>",
+    $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>",
+    $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"));

auth/cas/config.html

@@ -74,7 +74,7 @@
 <tr valign="top"  class="required">
     <td align="right">cas_language:</td>
     <td>
-        <?php choose_from_menu ($caslanguages, "cas_language", $config->cas_language, "");?>
+        <?php choose_from_menu ($CASLANGUAGES, "cas_language", $config->cas_language, "");?>
     </td>
     <td>
     <?php  print_string("auth_cas_language","auth") ?>

auth/cas/lib.php

@@ -41,7 +41,7 @@ function cas_ldap_auth_user_login ($username, $password) {
  
     if ($CFG->auth == "cas" && !empty($CFG->cas_enabled)){ //cas specific
        if ($CFG->cas_create_user=="0"){
-          if (get_user_info_from_db("username", $username)){
+          if (record_exists('user', 'username', $username)){
              return true;
           }else{
              return false;
@@ -67,7 +67,7 @@ function cas_ldap_auth_user_login ($username, $password) {
         ldap_close($ldap_connection);
         if ($ldap_login) {
            if ($CFG->cas_create_user=="0"){  //cas specific
-              if (get_user_info_from_db("username", $username)){
+              if (record_exists('user', 'username', $username)){
                 return true;
               }else{
                 return false;
@@ -105,8 +105,8 @@ function cas_authenticate_user_login ($username, $password) {
       phpCAS::authenticateIfNeeded();
    }
    if ($CFG->cas_create_user=="0"){
-      if (get_user_info_from_db("username", phpCAS::getUser())){
-        $user = authenticate_user_login(phpCAS::getUser(), 'cas');
+      if (record_exists('user', 'username', phpCAS::getUser())) {
+         $user = authenticate_user_login(phpCAS::getUser(), 'cas');
       }else{
          //login as guest if CAS but not Moodle and not automatic creation
          if ($CFG->guestloginbutton){
@@ -142,7 +142,7 @@ function cas_automatic_authenticate ($user="") {
         }
         if (phpCAS::isAuthenticated()){
            if ($CFG->cas_create_user=="0"){
-              if (get_user_info_from_db("username", phpCAS::getUser())){
+              if (record_exists('user', 'username', phpCAS::getUser())) {
                  $user = authenticate_user_login(phpCAS::getUser(), 'cas');
               }else{
                  //login as guest if CAS but not Moodle and not automatic creation
@@ -166,4 +166,4 @@ function cas_automatic_authenticate ($user="") {
    }
 }
 
-?>
+?>

auth/cas/login.php

@@ -4,7 +4,6 @@
 //CHANGELOG:
 //05.03.2005 replace /login/index.php
 
-    require_once($CFG->dirroot.'/auth/cas/lib.php');
 
     //Define variables used in page
     if (!$site = get_site()) {
@@ -61,6 +60,7 @@
             $frm = false;
         } else if (!$user) {
             if ($CFG->auth == "cas" && $frm->username != 'guest'){ /// Cas SSO case
+               require_once($CFG->dirroot.'/auth/cas/lib.php');
                $user = cas_authenticate_user_login($frm->username, $frm->password);
             }else{
                $user = authenticate_user_login($frm->username, $frm->password);
@@ -168,6 +168,7 @@
     
         } else {
           if ($CFG->auth == "cas" ){ /// CAS error login
+            require_once($CFG->dirroot.'/auth/cas/lib.php');
             $errormsg = get_string("invalidcaslogin");
             phpCAS::logout("$CFG->wwwroot/auth/cas/forbidden.php");
           }else{
@@ -175,7 +176,7 @@
           }
         }
     }
-
+    require_once($CFG->dirroot.'/auth/cas/lib.php');
     $user=cas_automatic_authenticate($user);
     if ($user) {
         if (! $user->confirmed ) {       // they never confirmed via email 

auth/db/config.html

@@ -28,19 +28,19 @@
     }
 ?>
 <tr valign="top" class="required">
-	<td align="right">auth_dbhost:</td>
-	<td>
+    <td align="right">auth_dbhost:</td>
+    <td>
         <input name="auth_dbhost" type="text" size="30" value="<?php echo $config->auth_dbhost?>" />
-	<?php  if (isset($err["auth_dbhost"])) formerr($err["auth_dbhost"]); ?>
-	</td>
+    <?php  if (isset($err["auth_dbhost"])) formerr($err["auth_dbhost"]); ?>
+    </td>
     <td>
     <?php  print_string("auth_dbhost","auth") ?>
     </td>
 </tr>
 
 <tr valign="top" class="required">
-	<td align="right">auth_dbtype:</td>
-	<td>
+    <td align="right">auth_dbtype:</td>
+    <td>
     <?php  $dbtypes = array("access","ado_access", "ado", "ado_mssql", "borland_ibase", "csv", "db2", "fbsql", "firebird", "ibase", "informix72", "informix", "mssql", "mysql", "mysqlt", "oci805", "oci8", "oci8po", "odbc", "odbc_mssql", "odbc_oracle", "oracle", "postgres64", "postgres7", "postgres", "proxy", "sqlanywhere", "sybase", "vfp");
        foreach ($dbtypes as $dbtype) {
            $dboptions[$dbtype] = $dbtype;
@@ -55,8 +55,8 @@
 </tr>
 
 <tr valign="top" class="required">
-	<td align="right">auth_dbname:</td>
-	<td>
+    <td align="right">auth_dbname:</td>
+    <td>
     <input name="auth_dbname" type="text" size="30" value="<?php echo $config->auth_dbname?>" />
     <?php  if (isset($err["auth_dbname"]))formerr($err["auth_dbname"]); ?>
     </td>
@@ -66,8 +66,8 @@
 </tr>
 
 <tr valign="top" class="required">
-	<td align="right">auth_dbuser:</td>
-	<td>
+    <td align="right">auth_dbuser:</td>
+    <td>
     <input name="auth_dbuser" type="text" size="30" value="<?php echo $config->auth_dbuser?>" />
     <?php  if (isset($err["auth_dbuser"])) formerr($err["auth_dbuser"]); ?>
     </td>
@@ -77,8 +77,8 @@
 </tr>
 
 <tr valign="top" class="required">
-	<td align="right">auth_dbpass:</td>
-	<td>
+    <td align="right">auth_dbpass:</td>
+    <td>
     <input name="auth_dbpass" type="text" size="30" value="<?php echo $config->auth_dbpass?>" />
     <?php  if (isset($err["auth_dbpass"])) formerr($err["auth_dbpass"]); ?>
     </td>
@@ -88,8 +88,8 @@
 </tr>
 
 <tr valign="top" class="required">
-	<td align="right">auth_dbtable:</td>
-	<td>
+    <td align="right">auth_dbtable:</td>
+    <td>
     <input name="auth_dbtable" type="text" size="30" value="<?php echo $config->auth_dbtable?>" />
     <?php  if (isset($err["auth_dbtable"])) formerr($err["auth_dbtable"]); ?>
     </td>
@@ -99,8 +99,8 @@
 </tr>
 
 <tr valign="top" class="required">
-	<td align="right">auth_dbfielduser:</td>
-	<td>
+    <td align="right">auth_dbfielduser:</td>
+    <td>
     <input name="auth_dbfielduser" type="text" size="30" value="<?php echo $config->auth_dbfielduser?>" />
     <?php  if (isset($err["auth_dbfielduser"])) formerr($err["auth_dbfielduser"]); ?>
     </td>
@@ -110,8 +110,8 @@
 </tr>
 
 <tr valign="top" class="required">
-	<td align="right">auth_dbfieldpass:</td>
-	<td>
+    <td align="right">auth_dbfieldpass:</td>
+    <td>
     <input name="auth_dbfieldpass" type="text" size="30" value="<?php echo $config->auth_dbfieldpass?>" />
     <?php  if (isset($err["auth_dbfieldpass"])) formerr($err["auth_dbfieldpass"]); ?>
     </td>
@@ -121,8 +121,8 @@
 </tr>
 
 <tr valign="top" class="required">
-	<td align="right">auth_dbpasstype:</td>
-	<td>
+    <td align="right">auth_dbpasstype:</td>
+    <td>
     <?php  
        $passtype["plaintext"] = get_string("plaintext", "auth");
        $passtype["md5"]       = get_string("md5", "auth");
@@ -135,98 +135,11 @@
     </td>
 </tr>
 
-
-<tr>
-	<td align="right"><?php  print_string("firstname") ?>:</td>
-	<td>
-    <input name="auth_user_firstname" type="text" size="30" value="<?php echo $config->auth_user_firstname?>" />
-    </td>
-    <td rowspan="12" valign="middle">
-    <?php  print_string("auth_dbextrafields","auth") ?>
-    </td>
-</tr>
+<?php print_auth_lock_options($auth, $user_fields, get_string("auth_dbextrafields","auth"), true, false);  ?>
 
 <tr valign="top">
-	<td align="right"><?php  print_string("lastname") ?>:</td>
-	<td>
-    <input name="auth_user_lastname" type="text" size="30" value="<?php echo $config->auth_user_lastname?>" />
-    </td>
-</tr>
-
-<tr valign="top">
-	<td align="right"><?php  print_string("email") ?>:</td>
-	<td>
-    <input name="auth_user_email" type="text" size="30" value="<?php echo $config->auth_user_email?>" />
-    </td>
-</tr>
-
-<tr valign="top">
-	<td align="right"><?php  print_string("phone") ?> 1:</td>
-	<td>
-    <input name="auth_user_phone1" type="text" size="30" value="<?php echo $config->auth_user_phone1?>" />
-    </td>
-</tr>
-
-<tr valign="top">
-	<td align="right"><?php  print_string("phone") ?> 2:</td>
-	<td>
-    <input name="auth_user_phone2" type="text" size="30" value="<?php echo $config->auth_user_phone2?>" />
-    </td>
-</tr>
-
-<tr valign="top">
-	<td align="right"><?php  print_string("department") ?>:</td>
-	<td>
-    <input name="auth_user_department" type="text" size="30" value="<?php echo $config->auth_user_department?>" />
-    </td>
-</tr>
-
-<tr valign="top">
-	<td align="right"><?php  print_string("address") ?>:</td>
-	<td>
-    <input name="auth_user_address" type="text" size="30" value="<?php echo $config->auth_user_address?>" />
-    </td>
-</tr>
-
-<tr valign="top">
-	<td align="right"><?php  print_string("city") ?>:</td>
-	<td>
-    <input name="auth_user_city" type="text" size="30" value="<?php echo $config->auth_user_city?>" />
-    </td>
-</tr>
-
-<tr valign="top">
-	<td align="right"><?php  print_string("country") ?>:</td>
-	<td>
-    <input name="auth_user_country" type="text" size="30" value="<?php echo $config->auth_user_country?>" />
-    </td>
-</tr>
-
-<tr valign="top">
-	<td align="right"><?php  print_string("description") ?>:</td>
-	<td>
-    <input name="auth_user_description" type="text" size="30" value="<?php echo $config->auth_user_description?>" />
-    </td>
-</tr>
-
-<tr valign="top">
-	<td align="right"><?php  print_string("idnumber") ?>:</td>
-	<td>
-    <input name="auth_user_idnumber" type="text" size="30" value="<?php echo $config->auth_user_idnumber?>" />
-    </td>
-</tr>
-
-<tr valign="top">
-	<td align="right"><?php  print_string("language") ?>:</td>
-	<td>
-    <input name="auth_user_lang" type="text" size="30" value="<?php echo $config->auth_user_lang?>" />
-    </td>
-</tr>
-
-
-<tr valign="top">
-	<td align="right"><?php  print_string("instructions", "auth") ?>:</td>
-	<td>
+    <td align="right"><?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>

auth/db/lib.php

@@ -13,8 +13,11 @@ function auth_user_login ($username, $password) {
     // the first database again, after having accessed the second.
     // The following hack will make the database explicit which keeps it happy
     // This seems to broke postgesql so ..
+
+    $prefix = $CFG->prefix.'';    // Remember it.  The '' is to prevent PHP5 reference.. see bug 3223
+
     if ($CFG->dbtype != 'postgres7') {
-        $CFG->prefix = "$CFG->dbname.$CFG->prefix";
+        $CFG->prefix = $CFG->dbname.$CFG->prefix;
     }
 
     // Connect to the external database
@@ -32,6 +35,8 @@ function auth_user_login ($username, $password) {
                               AND $CFG->auth_dbfieldpass = '$password' ");
     $authdb->Close();
 
+    $CFG->prefix = $prefix;
+
     if (!$rs) {
         notify("Could not connect to the specified authentication database...");
         return false;
@@ -53,6 +58,9 @@ function auth_get_userinfo($username){
 
     $config = (array) $CFG;
 
+    $pcfg = get_config('auth/db');
+    $pcfg = (array) $pcfg;
+
     ADOLoadCode($CFG->auth_dbtype);          
     $authdb = &ADONewConnection();         
     $authdb->PConnect($CFG->auth_dbhost,$CFG->auth_dbuser,$CFG->auth_dbpass,$CFG->auth_dbname); 
@@ -64,8 +72,8 @@ function auth_get_userinfo($username){
     $result = array();
 
     foreach ($fields as $field) {
-        if ($config["auth_user_$field"]) {
-            if ($rs = $authdb->Execute("SELECT ".$config["auth_user_$field"]." FROM $CFG->auth_dbtable
+        if ($pcfg["field_map_$field"]) {
+            if ($rs = $authdb->Execute("SELECT ".$pcfg["field_map_$field"]." FROM $CFG->auth_dbtable
                                         WHERE $CFG->auth_dbfielduser = '$username'")) {
                 if ( $rs->RecordCount() == 1 ) {
                     $result["$field"] = $rs->fields[0];

auth/email/config.html

@@ -1,2 +1,4 @@
 <!-- No config needed -->
 <div align="center"><?php print_string('none'); ?></div>
+
+<?php print_auth_lock_options($auth, $user_fields, get_string('auth_fieldlocks_help', 'auth'), false, false); ?>

auth/email/lib.php

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

auth/fc/config.html

@@ -166,3 +166,4 @@
 
 </tr>
 
+<?php print_auth_lock_options($auth, $user_fields, get_string('auth_fieldlocks_help', 'auth'), false, false); ?>

auth/fc/lib.php

@@ -91,7 +91,7 @@ description           Get data from users resume. Pictures will be removed.
           $userinfo['email']       = strtok($fpp->getUserInfo($username,"1252"),',');
           $userinfo['phone1']      = $fpp->getUserInfo($username,"1206");
           $userinfo['phone2']      = $fpp->getUserInfo($username,"1207");
-	  $userinfo['description'] = $fpp->getResume($username);
+          $userinfo['description'] = $fpp->getResume($username);
 
        }
     }
@@ -151,4 +151,4 @@ function auth_iscreator($username=0) {
     
     return false;
 }
-  
+  

auth/imap/config.html

@@ -10,11 +10,11 @@
     }
 ?>
 <tr valign="top" class="required">
-	<td align="right">auth_imaphost:</td>
-	<td>
+    <td align="right">auth_imaphost:</td>
+    <td>
         <input name="auth_imaphost" type="text" size="30" value="<?php echo $config->auth_imaphost?>" />
-	<?php  if (isset($err["auth_imaphost"])) formerr($err["auth_imaphost"]); ?>
-	</td>
+    <?php  if (isset($err["auth_imaphost"])) formerr($err["auth_imaphost"]); ?>
+    </td>
     <td>
     <?php  print_string("auth_imaphost","auth") ?> 
     <?php  print_string("auth_multiplehosts","auth") ?>
@@ -22,8 +22,8 @@
 </tr>
 
 <tr valign="top" class="required">
-	<td align="right">auth_imaptype:</td>
-	<td>
+    <td align="right">auth_imaptype:</td>
+    <td>
     <?php  $imaptypes = array("imap","imapssl", "imapcert", "imaptls");
        foreach($imaptypes as $imaptype) {
            $imapoptions[$imaptype] = $imaptype;
@@ -37,8 +37,8 @@
 </tr>
 
 <tr valign="top" class="required">
-	<td align="right">auth_imapport:</td>
-	<td>
+    <td align="right">auth_imapport:</td>
+    <td>
     <input name="auth_imapport" type="text" size="6" value="<?php echo $config->auth_imapport?>" />
     <?php  if (isset($err["auth_imapport"])) formerr($err["auth_imapport"]); ?>
     </td>
@@ -48,8 +48,8 @@
 </tr>
 
 <tr valign="top">
-	<td align="right"><?php  print_string("instructions", "auth") ?>:</td>
-	<td>
+    <td align="right"><?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>
@@ -57,3 +57,4 @@
     <?php  helpbutton("text", get_string("helptext")) ?>
     </td>
 </tr>
+<?php print_auth_lock_options($auth, $user_fields, get_string('auth_fieldlocks_help', 'auth'), false, false); ?>

auth/ldap/config.html

@@ -1,4 +1,4 @@
-<?PHP
+<?php
     // Initialize vars
     optional_variable($config->ldap_host_url,             "");
     optional_variable($config->ldap_contexts,             "");
@@ -20,51 +20,14 @@
     optional_variable($config->ldap_graceattr,         "");
     optional_variable($config->auth_user_create,         "");
     optional_variable($config->auth_user_create,         "");
-    optional_variable($config->auth_ldap_forcepasswordchange,         "");
+    optional_variable($config->auth_ldap_forcechangepassword,         "");
     
-    optional_variable($config->auth_user_firstname_updatelocal,     "1");
-    optional_variable($config->auth_user_firstname_editlock,        "1");  
-    optional_variable($config->auth_user_firstname_updateremote,    "");                    
-    optional_variable($config->auth_user_lastname_updatelocal,         "1");
-    optional_variable($config->auth_user_lastname_editlock,         "1");  
-    optional_variable($config->auth_user_lastname_updateremote,     "");  
-    optional_variable($config->auth_user_email_updatelocal,         "1");
-    optional_variable($config->auth_user_email_editlock,             "1");  
-    optional_variable($config->auth_user_email_updateremote,         ""); 
-    optional_variable($config->auth_user_phone1_updatelocal,         "");
-    optional_variable($config->auth_user_phone1_editlock,             "");  
-    optional_variable($config->auth_user_phone1_updateremote,         ""); 
-    optional_variable($config->auth_user_phone2_updatelocal,         "");
-    optional_variable($config->auth_user_phone2_editlock,             "");  
-    optional_variable($config->auth_user_phone2_updateremote,         ""); 
-    optional_variable($config->auth_user_department_updatelocal,     "");
-    optional_variable($config->auth_user_department_editlock,         "");  
-    optional_variable($config->auth_user_department_updateremote,  ""); 
-    optional_variable($config->auth_user_address_updatelocal,         "");
-    optional_variable($config->auth_user_address_editlock,             "");  
-    optional_variable($config->auth_user_address_updateremote,         ""); 
-    optional_variable($config->auth_user_city_updatelocal,             "");
-    optional_variable($config->auth_user_city_editlock,             "");  
-    optional_variable($config->auth_user_city_updateremote,         ""); 
-    optional_variable($config->auth_user_country_updatelocal,         "");
-    optional_variable($config->auth_user_country_editlock,             "");  
-    optional_variable($config->auth_user_country_updateremote,         ""); 
-    optional_variable($config->auth_user_description_updatelocal,     "");
-    optional_variable($config->auth_user_description_editlock,         "");  
-    optional_variable($config->auth_user_description_updateremote, ""); 
-    optional_variable($config->auth_user_lang_updatelocal,             "");
-    optional_variable($config->auth_user_lang_editlock,             "");  
-    optional_variable($config->auth_user_lang_updateremote,         ""); 
-    optional_variable($config->auth_user_idnumber_updatelocal,         "");
-    optional_variable($config->auth_user_idnumber_editlock,         "");  
-    optional_variable($config->auth_user_idnumber_updateremote,     ""); 
-
     optional_variable($config->auth_ldap_stdchangepassword,        false); 
     
 if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
-    print '<p align="center"><font color="red"><strong>Warning:
+    print '<tr><td><p align="center"><font color="red"><strong>Warning:
            The PHP LDAP module does not seem to be present. 
-           Please ensure it is installed and enabled.</strong></font></p>';
+           Please ensure it is installed and enabled.</strong></font></p></td></tr>';
 }
     
 ?>
@@ -157,7 +120,12 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
 <tr valign="top" class="required">
     <td align="right">ldap_search_sub:</td>
     <td>
-    <input name="ldap_search_sub" type="text" size="1" value="<?php echo $config->ldap_search_sub?>">
+<?php
+    $choices = array();;
+    $choices["0"] = get_string("no");
+    $choices["1"] = get_string("yes");
+    choose_from_menu ($choices, "ldap_search_sub", $config->ldap_search_sub, "");
+?>
     <?php  if (isset($err["ldap_search_sub"])) formerr($err["ldap_search_sub"]); ?>
     </td>
     <td>
@@ -363,382 +331,17 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
     </td>
 </tr>
 
+<?php 
 
-<tr>
-   <td colspan="2">
-        <h4><?php print_string("auth_data_mapping", "auth") ?> </h4>
-   </td>
-</tr>
-
-
-<tr valign="top" class="required">
-    <td align="right"><?php  print_string("firstname") ?>:</td>
-    <td>
-    <input name="auth_user_firstname" type="text" size="30" value="<?php echo $config->auth_user_firstname?>">
-    <div align="right">
-    <?php  print_string("auth_updatelocal", "auth") ?>
-    <select name="auth_user_firstname_updatelocal">
-        <option value="0" <?php echo ($config->auth_user_firstname_updatelocal ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_firstname_updatelocal ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>
-    <?php  print_string("auth_editlock", "auth") ?>
-    <select name="auth_user_firstname_editlock">
-        <option value="0" <?php echo ($config->auth_user_firstname_editlock ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_firstname_editlock ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>    
-    <?php  print_string("auth_updateremote", "auth") ?>
-    <select name="auth_user_firstname_updateremote">
-        <option value="0" <?php echo ($config->auth_user_firstname_updateremote ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_firstname_updateremote ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>    
-    </div>
-    </td>
-    <td rowspan=12 valign="top">
-    <?php  print_string("auth_ldapextrafields","auth") ?>
-    <?php  print_string("auth_updatelocal_expl","auth") ?>
-    <?php  print_string("auth_editlock_expl","auth") ?>
-    <?php  print_string("auth_updateremote_expl","auth") ?>
-    <hr>
-    <?php  print_string("auth_updateremote_ldap","auth") ?>
-    </td>
-</tr>
-
-<tr valign="top" class="required">
-    <td align="right"><?php  print_string("lastname") ?>:</td>
-    <td>
-    <input name="auth_user_lastname" type="text" size="30" value="<?php echo $config->auth_user_lastname?>">
-    <div align="right">
-    <?php  print_string("auth_updatelocal", "auth") ?>
-    <select name="auth_user_lastname_updatelocal">
-        <option value="0" <?php echo ($config->auth_user_lastname_updatelocal ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_lastname_updatelocal ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>
-    <?php  print_string("auth_editlock","auth") ?>
-    <select name="auth_user_lastname_editlock">
-        <option value="0" <?php echo ($config->auth_user_lastname_editlock ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_lastname_editlock ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>    
-    <?php  print_string("auth_updateremote", "auth") ?>
-    <select name="auth_user_lastname_updateremote">
-        <option value="0" <?php echo ($config->auth_user_lastname_updateremote ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_lastname_updateremote ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>    
-    </div>
-    </td>
-</tr>
-
-<tr valign="top" class="required">
-    <td align="right"><?php  print_string("email") ?>:</td>
-    <td>
-    <input name="auth_user_email" type="text" size="30" value="<?php echo $config->auth_user_email?>">
-    <div align="right">
-    <?php  print_string("auth_updatelocal", "auth") ?>
-    <select name="auth_user_email_updatelocal">
-        <option value="0" <?php echo ($config->auth_user_email_updatelocal ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_email_updatelocal ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>
-    <?php  print_string("auth_editlock", "auth") ?>
-    <select name="auth_user_email_editlock">
-        <option value="0" <?php echo ($config->auth_user_email_editlock ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_email_editlock ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>    
-    <?php  print_string("auth_updateremote", "auth") ?>
-    <select name="auth_user_email_updateremote">
-        <option value="0" <?php echo ($config->auth_user_email_updateremote ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_email_updateremote ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>    
-    </div>
-    </td>
-</tr>
-
-<tr valign="top" class="required">
-    <td align="right"><?php  print_string("phone") ?> 1:</td>
-    <td>
-    <input name="auth_user_phone1" type="text" size="30" value="<?php echo $config->auth_user_phone1?>">
-    <div align="right">
-    <?php  print_string("auth_updatelocal", "auth") ?>
-    <select name="auth_user_phone1_updatelocal">
-        <option value="0" <?php echo ($config->auth_user_phone1_updatelocal ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_phone1_updatelocal ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>
-    <?php  print_string("auth_editlock", "auth") ?>
-    <select name="auth_user_phone1_editlock">
-        <option value="0" <?php echo ($config->auth_user_phone1_editlock ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_phone1_editlock ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>    
-    <?php  print_string("auth_updateremote", "auth") ?>
-    <select name="auth_user_phone1_updateremote">
-        <option value="0" <?php echo ($config->auth_user_phone1_updateremote ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_phone1_updateremote ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>    
-    </div>
-    </td>
-</tr>
-
-<tr valign="top" class="required">
-    <td align="right"><?php  print_string("phone") ?> 2:</td>
-    <td>
-    <input name="auth_user_phone2" type="text" size="30" value="<?php echo $config->auth_user_phone2?>">
-    <div align="right">
-    <?php  print_string("auth_updatelocal", "auth") ?>
-    <select name="auth_user_phone2_updatelocal">
-        <option value="0" <?php echo ($config->auth_user_phone2_updatelocal ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_phone2_updatelocal ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>
-    <?php  print_string("auth_editlock", "auth") ?>
-    <select name="auth_user_phone2_editlock">
-        <option value="0" <?php echo ($config->auth_user_phone2_editlock ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_phone2_editlock ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>    
-    <?php  print_string("auth_updateremote", "auth") ?>
-    <select name="auth_user_phone2_updateremote">
-        <option value="0" <?php echo ($config->auth_user_phone2_updateremote ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_phone2_updateremote ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>    
-    </div>
-    </td>
-</tr>
-
-<tr valign="top" class="required">
-    <td align="right"><?php  print_string("department") ?>:</td>
-    <td>
-    <input name="auth_user_department" type="text" size="30" value="<?php echo $config->auth_user_department?>">
-    <div align="right">
-    <?php  print_string("auth_updatelocal", "auth") ?>
-    <select name="auth_user_department_updatelocal">
-        <option value="0" <?php echo ($config->auth_user_department_updatelocal ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_department_updatelocal ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>
-    <?php  print_string("auth_editlock", "auth") ?>
-    <select name="auth_user_department_editlock">
-        <option value="0" <?php echo ($config->auth_user_department_editlock ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_department_editlock ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>    
-    <?php  print_string("auth_updateremote", "auth") ?>
-    <select name="auth_user_department_updateremote">
-        <option value="0" <?php echo ($config->auth_user_department_updateremote ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_department_updateremote ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>    
-    </div>
-    </td>
-</tr>
-
-<tr valign="top" class="required">
-    <td align="right"><?php  print_string("address") ?>:</td>
-    <td>
-    <input name="auth_user_address" type="text" size="30" value="<?php echo $config->auth_user_address?>">
-    <div align="right">
-    <?php  print_string("auth_updatelocal", "auth") ?>
-    <select name="auth_user_address_updatelocal">
-        <option value="0" <?php echo ($config->auth_user_address_updatelocal ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_address_updatelocal ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>
-    <?php  print_string("auth_editlock", "auth") ?>
-    <select name="auth_user_address_editlock">
-        <option value="0" <?php echo ($config->auth_user_address_editlock ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_address_editlock ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>    
-    <?php  print_string("auth_updateremote", "auth") ?>
-    <select name="auth_user_address_updateremote">
-        <option value="0" <?php echo ($config->auth_user_address_updateremote ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_address_updateremote ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>    
-    </div>
-    </td>
-</tr>
-
-<tr valign="top" class="required">
-    <td align="right"><?php  print_string("city") ?>:</td>
-    <td>
-    <input name="auth_user_city" type="text" size="30" value="<?php echo $config->auth_user_city?>">
-    <div align="right">
-    <?php  print_string("auth_updatelocal", "auth") ?>
-    <select name="auth_user_city_updatelocal">
-        <option value="0" <?php echo ($config->auth_user_city_updatelocal ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_city_updatelocal ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>
-    <?php  print_string("auth_editlock", "auth") ?>
-    <select name="auth_user_city_editlock">
-        <option value="0" <?php echo ($config->auth_user_city_editlock ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_city_editlock ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>    
-    <?php  print_string("auth_updateremote", "auth") ?>
-    <select name="auth_user_city_updateremote">
-        <option value="0" <?php echo ($config->auth_user_city_updateremote ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_city_updateremote ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>    
-    </div>
-    </td>
-</tr>
-
-<tr valign="top" class="required">
-    <td align="right"><?php  print_string("country") ?>:</td>
-    <td>
-    <input name="auth_user_country" type="text" size="30" value="<?php echo $config->auth_user_country?>">
-    <div align="right">
-    <?php  print_string("auth_updatelocal", "auth") ?>
-    <select name="auth_user_country_updatelocal">
-        <option value="0" <?php echo ($config->auth_user_country_updatelocal ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_country_updatelocal ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>
-    <?php  print_string("auth_editlock", "auth") ?>
-    <select name="auth_user_country_editlock">
-        <option value="0" <?php echo ($config->auth_user_country_editlock ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_country_editlock ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>    
-    <?php  print_string("auth_updateremote", "auth") ?>
-    <select name="auth_user_country_updateremote">
-        <option value="0" <?php echo ($config->auth_user_country_updateremote ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_country_updateremote ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>    
-    </div>
-    </td>
-</tr>
-
-<tr valign="top" class="required">
-    <td align="right"><?php  print_string("description") ?>:</td>
-    <td>
-    <input name="auth_user_description" type="text" size="30" value="<?php echo $config->auth_user_description?>">
-    <div align="right">
-    <?php  print_string("auth_updatelocal", "auth") ?>
-    <select name="auth_user_description_updatelocal">
-        <option value="0" <?php echo ($config->auth_user_description_updatelocal ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_description_updatelocal ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>
-    <?php  print_string("auth_editlock", "auth") ?>
-    <select name="auth_user_description_editlock">
-        <option value="0" <?php echo ($config->auth_user_description_editlock ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_description_editlock ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>    
-    <?php  print_string("auth_updateremote", "auth") ?>
-    <select name="auth_user_description_updateremote">
-        <option value="0" <?php echo ($config->auth_user_description_updateremote ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_description_updateremote ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>    
-    </div>
-    </td>
-</tr>
-
-<tr valign="top" class="required">
-    <td align="right"><?php  print_string("idnumber") ?>:</td>
-    <td>
-    <input name="auth_user_idnumber" type="text" size="30" value="<?php echo $config->auth_user_idnumber?>">
-    <div align="right">
-    <?php  print_string("auth_updatelocal", "auth") ?>
-    <select name="auth_user_idnumber_updatelocal">
-        <option value="0" <?php echo ($config->auth_user_idnumber_updatelocal ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_idnumber_updatelocal ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>
-    <?php  print_string("auth_editlock", "auth") ?>
-    <select name="auth_user_idnumber_editlock">
-        <option value="0" <?php echo ($config->auth_user_idnumber_editlock ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_idnumber_editlock ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>    
-    <?php  print_string("auth_updateremote", "auth") ?>
-    <select name="auth_user_idnumber_updateremote">
-        <option value="0" <?php echo ($config->auth_user_idnumber_updateremote ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_idnumber_updateremote ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>    
-    </div>
-    </td>
-</tr>
-
-<tr valign="top" class="required">
-    <td align="right"><?php  print_string("language") ?>:</td>
-    <td>
-    <input name="auth_user_lang" type="text" size="30" value="<?php echo $config->auth_user_lang?>">
-    <div align="right">
-    <?php  print_string("auth_updatelocal", "auth") ?>
-    <select name="auth_user_lang_updatelocal">
-        <option value="0" <?php echo ($config->auth_user_lang_updatelocal ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_lang_updatelocal ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>
-    <?php  print_string("auth_editlock", "auth") ?>
-    <select name="auth_user_lang_editlock">
-        <option value="0" <?php echo ($config->auth_user_lang_editlock ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_lang_editlock ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>    
-    <?php  print_string("auth_updateremote", "auth") ?>
-    <select name="auth_user_lang_updateremote">
-        <option value="0" <?php echo ($config->auth_user_lang_updateremote ? '' : 'selected="yes"') ?> >
-            <?php  print_string("no")  ?></option>
-        <option value="1" <?php echo ($config->auth_user_lang_updateremote ? 'selected="yes"' : '') ?> >
-            <?php  print_string("yes") ?></option>
-    </select><br>    
-    </div>
-    </td>
-</tr>
+$help  = get_string("auth_ldapextrafields","auth");
+$help .= get_string("auth_updatelocal_expl","auth");
+$help .= get_string("auth_fieldlock_expl","auth");
+$help .= get_string("auth_updateremote_expl","auth");
+$help .= '<hr />';
+$help .= get_string("auth_updateremote_ldap","auth");
 
+print_auth_lock_options($auth, $user_fields, $help, true, true); 
+?>
 
 <tr valign="top" class="required">
     <td align="right"><?php  print_string("instructions", "auth") ?>:</td>
@@ -746,6 +349,7 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
     <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>

auth/ldap/lib.php

@@ -186,7 +186,7 @@ function auth_user_exists ($username) {
  * @param mixed $plainpass   Plaintext password
  */
 function auth_user_create ($userobject,$plainpass) {
-	global $CFG;
+    global $CFG;
     $ldapconnection = auth_ldap_connect();
     $attrmap = auth_ldap_attributes();
     
@@ -372,6 +372,7 @@ function auth_sync_users ($bulk_insert_records = 1000, $do_updates=1) {
 
 
     global $CFG ;
+    $pcfg = get_config('auth/ldap');
 
     // configure a temp table 
     print "Configuring temp table\n";    
@@ -503,11 +504,11 @@ function auth_sync_users ($bulk_insert_records = 1000, $do_updates=1) {
     ////
     if ($do_updates) {
         // narrow down what fields we need to update
-        $all_keys = array_keys(get_object_vars($CFG));
+        $all_keys = array_keys(get_object_vars($pcfg));
         $updatekeys = array();
         foreach ($all_keys as $key) {
-            if (preg_match('/^auth_user_(.+)_updatelocal$/',$key, $match)) {
-                if ($CFG->{$match[0]}) { // if it has a true value
+            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
                 }
             }
@@ -637,6 +638,8 @@ function auth_ldap_update_user_record($username, $updatekeys=false) {
 
     global $CFG;
 
+    $pcfg = get_config('auth/ldap');
+
     //just in case check text case
     $username = trim(moodle_strtolower($username));
     
@@ -663,8 +666,7 @@ function auth_ldap_update_user_record($username, $updatekeys=false) {
                 } else {
                     $value = '';
                 }
-                if(isset($CFG->{'auth_user_' . $key. '_updatelocal'}) 
-                   &&    $CFG->{'auth_user_' . $key. '_updatelocal'}){
+                if (!empty($pcfg->{'field_updatelocal_' . $key})) { 
                        if ($user->{$key} != $value) { // only update if it's changed
                            set_field('user', $key, $value, 'username', $username);
                        }
@@ -701,7 +703,7 @@ function auth_ldap_bulk_insert($users){
  * @return boolen result
  */
 function auth_user_activate ($username) {
-	global $CFG;
+    global $CFG;
 
     $ldapconnection = auth_ldap_connect();
     
@@ -726,7 +728,7 @@ function auth_user_activate ($username) {
  * @return boolean result
  */
 function auth_user_disable ($username) {
-	global $CFG;
+    global $CFG;
 
     $ldapconnection = auth_ldap_connect();
 
@@ -782,6 +784,8 @@ function auth_iscreator($username=0) {
 function auth_user_update($olduser, $newuser) {
 
     global $USER , $CFG;
+
+    $pcfg = get_config('auth/ldap');
     
     $ldapconnection = auth_ldap_connect();
     
@@ -810,7 +814,7 @@ function auth_user_update($olduser, $newuser) {
         //error_log(var_export($user_entry) . 'fpp' );
         
         foreach ($attrmap as $key=>$ldapkeys){
-            if (isset($CFG->{'auth_user_'. $key.'_updateremote'}) && $CFG->{'auth_user_'. $key.'_updateremote'}){
+            if (!empty($pcfg->{'field_updateremote_'. $key})) {
 
                 // for ldap values that could be in more than one 
                 // ldap key, we will do our best to match 
@@ -1031,8 +1035,8 @@ function auth_ldap_getdefaults(){
                         );
     $default['ldap_memberattribute_isdn'] = array(
                         'edir' => '1',
-                        'rfs2307' => '0',
-                        'rfs2307bis' => '1',
+                        'rfc2307' => '0',
+                        'rfc2307bis' => '1',
                         'samba' => '0', //is this right?
                         'ad' => '0', //is this right?
                         'default' => '0'
@@ -1310,7 +1314,7 @@ function auth_ldap_find_userdn ($ldapconnection, $username){
     $ldap_contexts = explode(";",$CFG->ldap_contexts);
     
     if (!empty($CFG->ldap_create_context)){
-	  array_push($ldap_contexts, $CFG->ldap_create_context);
+      array_push($ldap_contexts, $CFG->ldap_create_context);
     }
   
     foreach ($ldap_contexts as $context) {
@@ -1348,24 +1352,26 @@ function auth_ldap_find_userdn ($ldapconnection, $username){
 
 function auth_ldap_attributes (){
 
-	global $CFG;
+    global $CFG;
 
     $config = (array)$CFG;
     $fields = array("firstname", "lastname", "email", "phone1", "phone2", 
                     "department", "address", "city", "country", "description", 
                     "idnumber", "lang" );
 
+    $pcfg = get_config('auth/ldap');
+
     $moodleattributes = array();
     foreach ($fields as $field) {
-        if (!empty($config["auth_user_$field"])) {
-            $moodleattributes[$field] = $config["auth_user_$field"];
+        if (!empty($pcfg->{"field_map_$field"})) {
+            $moodleattributes[$field] = $pcfg->{"field_map_$field"};
             if (preg_match('/,/',$moodleattributes[$field])) {
                 $moodleattributes[$field] = explode(',', $moodleattributes[$field]); // split ?
             }
         }
     }
     $moodleattributes['username']=$config["ldap_user_attribute"];
-	return $moodleattributes;
+    return $moodleattributes;
 }
 
 /**

auth/manual/config.html

@@ -1,6 +1,6 @@
 <tr valign="top">
-	<td align="right"><?php  print_string("instructions", "auth") ?>:</td>
-	<td>
+    <td align="right"><?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>
@@ -8,4 +8,4 @@
     <?php  helpbutton("text", get_string("helptext")) ?>
     </td>
 </tr>
-
+<?php print_auth_lock_options($auth, $user_fields, get_string('auth_fieldlocks_help', 'auth'), false, false); ?>

auth/manual/lib.php

@@ -5,7 +5,7 @@ function auth_user_login ($username, $password) {
 // Returns false if the username doesn't exist yet
 // Returns true if the username and password work
 
-    if ($user = get_user_info_from_db("username", $username)) {
+    if ($user = get_record('user', 'username', $username)) {
         return ($user->password == md5($password));
     }
 

auth/nntp/config.html

@@ -8,11 +8,11 @@
 ?>
 
 <tr valign="top" class="required">
-	<td align="right">auth_nntphost:</td>
-	<td>
+    <td align="right">auth_nntphost:</td>
+    <td>
         <input name="auth_nntphost" type="text" size="30" value="<?php echo $config->auth_nntphost?>" />
-	<?php  if (isset($err["auth_nntphost"]))  formerr($err["auth_nntphost"]); ?>
-	</td>
+    <?php  if (isset($err["auth_nntphost"]))  formerr($err["auth_nntphost"]); ?>
+    </td>
     <td>
     <?php  print_string("auth_nntphost","auth") ?>
     <?php  print_string("auth_multiplehosts","auth") ?>
@@ -20,8 +20,8 @@
 </tr>
 
 <tr valign="top" class="required">
-	<td align="right">auth_nntpport:</td>
-	<td>
+    <td align="right">auth_nntpport:</td>
+    <td>
     <input name="auth_nntpport" type="text" size="6" value="<?php echo $config->auth_nntpport?>" />
     <?php  if (isset($err["auth_nntpport"])) formerr($err["auth_nntpport"]); ?>
     </td>
@@ -31,8 +31,8 @@
 </tr>
 
 <tr valign="top">
-	<td align="right"><?php  print_string("instructions", "auth") ?>:</td>
-	<td>
+    <td align="right"><?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>
@@ -40,3 +40,4 @@
     <?php  helpbutton("text", get_string("helptext")) ?>
     </td>
 </tr>
+<?php print_auth_lock_options($auth, $user_fields, get_string('auth_fieldlocks_help', 'auth'), false, false); ?>

auth/none/config.html

@@ -1,2 +1,3 @@
 <!-- No config needed -->
 <div align="center"><?php print_string('none'); ?></div>
+<?php print_auth_lock_options($auth, $user_fields, get_string('auth_fieldlocks_help', 'auth'), false, false); ?>

auth/none/lib.php

@@ -5,11 +5,11 @@ function auth_user_login ($username, $password) {
 // Returns true if the username doesn't exist yet
 // Returns true if the username and password work
 
-    if (! $user = get_user_info_from_db("username", $username)) {
-        return true;
+    if ($user = get_record('user', 'username', $username)) {
+        return ($user->password == md5($password));
     }
 
-    return ($user->password == md5($password));
+    return false;
 }
 
 

auth/pam/config.html

@@ -6,4 +6,5 @@
     <?php  print_string("authinstructions","auth") ?>
     <?php  helpbutton("text", get_string("helptext")) ?>
   </td>
-</tr>
+</tr>
+<?php print_auth_lock_options($auth, $user_fields, get_string('auth_fieldlocks_help', 'auth'), false, false); ?>

auth/pop3/config.html

@@ -13,11 +13,11 @@
     }
 ?>
 <tr valign="top" class="required">
-	<td align="right">auth_pop3host:</td>
-	<td>
+    <td align="right">auth_pop3host:</td>
+    <td>
         <input name="auth_pop3host" type="text" size="30" value="<?php echo $config->auth_pop3host?>" />
-	<?php  if (isset($err["auth_pop3host"])) formerr($err["auth_pop3host"]); ?>
-	</td>
+    <?php  if (isset($err["auth_pop3host"])) formerr($err["auth_pop3host"]); ?>
+    </td>
     <td>
     <?php  print_string("auth_pop3host","auth") ?>
     <?php  print_string("auth_multiplehosts","auth") ?>
@@ -25,8 +25,8 @@
 </tr>
 
 <tr valign="top" class="required">
-	<td align="right">auth_pop3type:</td>
-	<td>
+    <td align="right">auth_pop3type:</td>
+    <td>
     <?php  $pop3types = array("pop3","pop3cert", "pop3notls");
        foreach($pop3types as $pop3type) {
            $pop3options[$pop3type] = $pop3type;
@@ -40,8 +40,8 @@
 </tr>
 
 <tr valign="top" class="required">
-	<td align="right">auth_pop3port:</td>
-	<td>
+    <td align="right">auth_pop3port:</td>
+    <td>
     <input name="auth_pop3port" type="text" size="6" value="<?php echo $config->auth_pop3port?>" />
     <?php  if (isset($err["auth_pop3port"])) formerr($err["auth_pop3port"]); ?>
     </td>
@@ -51,8 +51,8 @@
 </tr>
 
 <tr valign="top" class="required">
-	<td align="right">auth_pop3mailbox:</td>
-	<td>
+    <td align="right">auth_pop3mailbox:</td>
+    <td>
     <input name="auth_pop3mailbox" type="text" size="6" value="<?php echo $config->auth_pop3mailbox?>" />
     <?php  if (isset($err["auth_pop3mailbox"])) formerr($err["auth_pop3mailbox"]); ?>
     </td>
@@ -62,8 +62,8 @@
 </tr>
 
 <tr valign="top">
-	<td align="right"><?php  print_string("instructions", "auth") ?>:</td>
-	<td>
+    <td align="right"><?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>
@@ -71,3 +71,5 @@
     <?php  helpbutton("text", get_string("helptext")) ?>
     </td>
 </tr>
+
+<?php print_auth_lock_options($auth, $user_fields, get_string('auth_fieldlocks_help', 'auth'), false, false); ?>

auth/pop3/lib.php

@@ -12,7 +12,7 @@ function auth_user_login ($username, $password) {
     foreach ($hosts as $host) {                 // Try each host in turn
 
         $host = trim($host);
-	 
+
         // remove any trailing slash
         if (substr($host, -1) == '/') {
             $host = substr($host, 0, strlen($host) - 1);

auth/shibboleth/.htaccess

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

@@ -1,76 +1,177 @@
-Shibboleth authentication for Moodle
--------------------------------------------------------------------------------
-Requirements
-- Shibboleth target 1.1 or later
-
-SHIBBOLET Target configuration
+Shibboleth Authentication for Moodle
 -------------------------------------------------------------------------------
 
-#### 1. Only shibboleth users are allowed use this 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.
 
-Just add shibboleth protection against Moodle directory.
+Changes:
+- 11. 2004: Created by Markus Hagman
+- 05. 2005: Modifications to login process by Martin Dougiamas
+- 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
 
-#### 2. Shibboleth and manually added users are able to use Moodle
-
-
-You need to use lazy sessions for Moodle directory. Lazy session can be
-turned on by adding lines below to your .htaccess file in Moodle directory:
-
-## Shibboleth lazy session
-AuthType shibboleth
-ShibRequireSession Off
-require shibboleth
-
-Lazy session allows users to access Moodle directory without having to
-authenticate against shibboleth. When user authenticates against Shibboleth
-the attributes which shibboleth provide get accessible ($_SERVER). These
-attributes are used by Moodle to determine users identity.
-
-For envoking shibboleth session:
-
-1. make a directory for example moodle-proxy (in place where it's accessible
-from web)
-2. create index.php and add lines below (redirect to your moodle):
-<?
-header("Location:https://my.domain.com/moodle/login/index.php");
-exit;
-?>
-3. Add .htaccess file in this directory which contains:
-
-## Shibboleth authentication required
-AuthType shibboleth
-ShibRequireSession On
-require valid-user
-
-
-NEW! Modifications to login/index.php
+Moodle Configuration with Dual login
 -------------------------------------------------------------------------------
-Moodle checks if user theres a shibboleth authenticated session alive. If
-username attribute is found, user is considered authenticated.
+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.
 
-Add code after line 31:
+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:
 
-    if ($_SERVER[$CFG->shib_user_attribute]) {
-       /// Log in automatically if user is has been shibboleth authenticated
-        $frm->username = $_SERVER[$CFG->shib_user_attribute];
-        $frm->password = "guest";
-    } else {
-        $frm = data_submitted();
+--
+<Location ~  "/auth/shibboleth/shib-protected.php">
+        AuthType shibboleth
+        ShibRequireSession On
+        require valid-user
+</Location>
+--
+
+   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 
+   Options' and select the 'Shibboleth' authentication method from the pop-up.
+   
+4. 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 
+   the Shibboleth documentation or the documentation of your Shibboleth
+   federation for information on which attributes are available).
+   Especially the 'Username' field is of great importance because 
+   this attribute is used for the Moodle authentication of Shibboleth users.
+   
+   #############################################################################
+   Shibboleth Attributes needed by Moodle:
+   For Moodle to work properly Shibboleth should at least provide the attributes
+   that are used as username, firstname, lastname and email in Moodle.
+   The attribute used for the username has to be unique for all Shibboleth user.
+   All attributes must obey a certain length, otherwise Moodle cuts off the
+   ends. Consult the Moodle documentation for further information on the maximum
+   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 
+   Shibboleth login button.
+
+6. 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'
+     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.
+
+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 
+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. 
+
+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 
+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 
+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 
+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
+--------------------------------------------------------------------------------
+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.
+You can use this if you want to further process the way your Shibboleth
+attributes are used in Moodle. 
+
+Example 1: Your Shibboleth federation uses an attribute that specifies the 
+           user's preferred language, but the content of this attribute is not
+           compatible with the Moodle data representation, e.g. the Shibboleth
+           attribute contains 'German' but Moodle needs a two letter value like 
+           'de'.
+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 
+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
+can directly edit the object $result.
+
+Example file:
+
+--
+<?PHP
+
+    // Set the zip code and the adress
+    if ($_SERVER[$pluginconfig->field_map_address] != '')
+    {
+        // $address contains something like 'SWITCH$Limmatquai 138$CH-8021 Zurich'
+        // We want to split this up to get: 
+        // 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];
+        
+        ereg('(.+)-',$zip_city, $regs);
+        $country = $regs[1];
+        
+        $result["address"] = $street;
+        $result["city"] = $city;
+        $result["country"] = $country;
+        $result["department"] = $institution;
     }
+?>
+--
 
+Bugs
+--------------------------------------------------------------------------------
+The current implementation has not yet been extensively tested. So there may be
+bugs. Please send bug reports concerning the Shibboleth part to 
+Lukas Haemmerle <haemmerle@switch.ch>
 
-MOODLE Authentication options
--------------------------------------------------------------------------------
-
-Shibboleth origin url: 
-This is were you put the Shibboleth WAYF url address or the Shibboleth Origin
-login url if WAYF is not used. If user selects shibboleth authentication
-method he/she is redirected there to authenticate.
-
-Username, First name, Surname, Email address:
-The fields in authentication options are filled with the names of the
-shibboleth attributes that your server provides for example:
-
-$_SERVER['HTTP_SHIB_PNAME'] is the defined attribute in shibboleth target
-configuration for username use HTTP_SHIB_PNAME in Username field at
-authentication options
+--------------------------------------------------------------------------------
+In case of problems and questions with Shibboleth authentication, contact 
+Lukas Haemmerle <haemmerle@switch.ch> or Markus Hagman <hagman@hytti.uku.fi>

auth/shibboleth/config.html

@@ -1,127 +1,55 @@
-<?PHP
+<?php
+// Set default values
+$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');
+}
+
+optional_variable($pluginconfig->user_attribute, '');
+optional_variable($pluginconfig->convert_data,   '');
+
 ?>
+<tr>
+    <td colspan="3" align="left">
+      <p>
+        <?php  print_string("auth_shib_username_description", "auth") ?>
+      </p>
+    </td>
+</tr>
+<tr valign="top" class="required">
+    <td align="right"><?php  print_string("username") ?>:</td>
+    <td>
+    <input name="pluginconfig_shib_user_attribute" type="text" size="30" value="<?php echo $pluginconfig->shib_user_attribute ?>">
+    </td>
+    <td></td>
+    </td>
+</tr>
+
+<?php print_auth_lock_options($auth, $user_fields, '<!-- empty help -->', true, false);  ?>
+
 <tr valign="top">
-    <TD ALIGN=RIGHT><P>Shibboleth origin url:</TD>
-    <TD>
-        <INPUT name=shib_wayf_url TYPE=text SIZE=30 VALUE="<?php echo $config->shib_wayf_url?>">
-    <?php  if (isset($err["shib_wayf_url"])) formerr($err["shib_wayf_url"]); ?>
-    </TD>
-    <TD>
-    </TD>
-</TR>
-<!--
-<TR>
-    <TD ALIGN=RIGHT><P>Shibboleth logout url ():</TD>
-    <TD>
-    <INPUT name="shib_logout_url" TYPE="text" SIZE="30" VALUE="<?php echo $config->shib_logout_url?>">
-    </TD>
-    <TD rowspan=12 VALIGN=CENTER>                                                                                                                                 </TD>
-</TR>-->  
-<TR>
-    <TD ALIGN=RIGHT><P><?php  print_string("username") ?>:</TD>
-    <TD>
-    <INPUT name="shib_user_attribute" TYPE="text" SIZE="30" VALUE="<?php echo $config->shib_user_attribute?>">
-    </TD>
-    <TD rowspan=12 VALIGN=CENTER>
-    </TD>
-</TR>
-
-<TR>
-    <TD ALIGN=RIGHT><P><?php  print_string("firstname") ?>:</TD>
-    <TD>
-    <INPUT name="auth_user_firstname" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_firstname?>">
-    </TD>
-    <TD rowspan=12 VALIGN=CENTER>
-    </TD>
-</TR>
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P><?php  print_string("lastname") ?>:</TD>
-    <TD>
-    <INPUT name="auth_user_lastname" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_lastname?>">
-    </TD>
-</TR>
-
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P><?php  print_string("email") ?>:</TD>
-    <TD>
-    <INPUT name="auth_user_email" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_email?>">
-    </TD>
-</TR>
-<!--
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P><?php  print_string("phone") ?> 1:</TD>
-    <TD>
-    <INPUT name="auth_user_phone1" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_phone1?>">
-    </TD>
-</TR>
-
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P><?php  print_string("phone") ?> 2:</TD>
-    <TD>
-    <INPUT name="auth_user_phone2" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_phone2?>">
-    </TD>
-</TR>
-
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P><?php  print_string("department") ?>:</TD>
-    <TD>
-    <INPUT name="auth_user_department" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_department?>">
-    </TD>
-</TR>
-
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P><?php  print_string("address") ?>:</TD>
-    <TD>
-    <INPUT name="auth_user_address" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_address?>">
-    </TD>
-</TR>
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P><?php  print_string("city") ?>:</TD>
-    <TD>
-    <INPUT name="auth_user_city" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_city?>">
-    </TD>
-</TR>
-
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P><?php  print_string("country") ?>:</TD>
-    <TD>
-    <INPUT name="auth_user_country" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_country?>">
-    </TD>
-</TR>
-
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P><?php  print_string("description") ?>:</TD>
-    <TD>
-    <INPUT name="auth_user_description" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_description?>">
-    </TD>
-</TR>
-
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P><?php  print_string("idnumber") ?>:</TD>
-    <TD>
-    <INPUT name="auth_user_idnumber" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_idnumber?>">
-    </TD>
-</TR>
-
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P><?php  print_string("language") ?>:</TD>
-    <TD>
-    <INPUT name="auth_user_lang" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_lang?>">
-    </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") ?>
+    <td align="right"><?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("auth_shib_instructions_help","auth", htmlspecialchars($CFG->wwwroot.'/auth/shibboleth')) ?>
     <?php  helpbutton("text", get_string("helptext")) ?>
-    </TD>
-</TR>
-
-
-
-
+    </td>
+</tr>
+<tr valign="top">
+    <td align="right"><?php  print_string("auth_shib_convert_data", "auth") ?>:</td>
+    <td>
+    <input name="pluginconfig_convert_data" type="text" size="30" value="<?php echo $pluginconfig->convert_data?>"> 
+    <? 
+          if ($pluginconfig->convert_data && $pluginconfig->convert_data != '' && !is_readable($pluginconfig->convert_data)){
+              echo '<br><font color="red">';
+              print_string("auth_shib_convert_data_warning", "auth");
+              echo '</font>';
+          }
+    ?>
+    </td>
+    <td><?php  print_string("auth_shib_convert_data_description", "auth") ?></td>
+    </td>
+</tr>

auth/shibboleth/index.php

@@ -0,0 +1,59 @@
+<?php // $Id$
+      // Designed to be redirected from moodle/login/index.php
+
+    require('../../config.php');
+    require('lib.php');
+
+    if (isloggedin()) {      // Nothing to do
+        redirect($CFG->wwwroot.'/index.php');
+    }
+
+    $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.');
+    }
+
+/// 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
+        $frm->username = $_SERVER[$pluginconfig->shib_user_attribute];
+        $frm->password = substr(base64_encode($_SERVER[$pluginconfig->shib_user_attribute]),0,8);
+        // The random password consists of the first 8 letters of the base 64 encoded user ID
+        // This password is never used unless the user account is converted to manual 
+
+    /// Check if the user has actually submitted login data to us
+    
+        if ($user = authenticate_user_login($frm->username, $frm->password)) {
+
+            // Let's get them all set up.
+            $USER = $user;
+
+            add_to_log(SITEID, 'user', 'login', "view.php?id=$USER->id&course=".SITEID, $USER->id, 0, $USER->id);
+
+            update_user_login_times();
+            set_moodle_cookie($USER->username);
+            set_login_session_preferences();
+        
+            if (user_not_fully_set_up($USER)) {
+                $urltogo = $CFG->wwwroot.'/user/edit.php?id='.$USER->id.'&amp;course='.SITEID;
+                // We don't delete $SESSION->wantsurl yet, so we get there later
+
+            } else 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);
+        }
+    }
+
+    $SESSION->shibboleth_checked = true;   // This will stop us bouncing back here
+
+    redirect($CFG->wwwroot.'/login/index.php');
+
+?>

auth/shibboleth/lib.php

@@ -3,24 +3,23 @@
 //28.10.2004 SHIBBOLETH Authentication functions v.0.1
 //Distributed under GPL (c)Markus Hagman 2004-
 
-function auth_user_login ($username, $password) {
+function auth_user_login($username, $password) {
     global $CFG;
-	if($_SERVER[$CFG->shib_user_attribute] == $username) {
-        return true;
-    }
-    // Returns false if the username doesn't exist yet
-    // Returns true if the username and password work
-    if ($user = get_user_info_from_db("username", $username)) {
-		if($user->auth == "shibboleth") {
-            return false;
-            exit;
-        } else {
-            return ($user->password == md5($password));
-            exit;
-        }
-    }   
 
-    return false;
+    $pluginconfig   = get_config('auth/shibboleth');
+    
+/// 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;
 }
 
 function auth_get_userinfo($username) {
@@ -28,33 +27,63 @@ function auth_get_userinfo($username) {
     global $CFG;
 
     $config = (array)$CFG;
+    $pluginconfig   = get_config('auth/shibboleth');
+
+    // Check whether we have got all the essential attributes
+    if (
+           empty($_SERVER[$pluginconfig->shib_user_attribute])
+        || empty($_SERVER[$pluginconfig->field_map_firstname])
+        || 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.");
+    }
+
     $attrmap = auth_shib_attributes();
-   
+
     $result = array();
     $search_attribs = array();
   
     foreach ($attrmap as $key=>$value) {
-        $result[$key]=$_SERVER[$value];
+        $result[$key]=utf8_decode($_SERVER[$value]);
     }
+    
+     // Provide an API to modify the information to fit the Moodle internal
+    // data representation
+    if (   
+          $config["shib_convert_data"] 
+          && $config["shib_convert_data"] != ''
+          && is_readable($config["shib_convert_data"])
+        ){
+        
+        // Include a custom file outside the Moodle dir to
+        // modify the variable $moodleattributes
+        include($config["shib_convert_data"]);
+    }
+    
     return $result;
 }
 
-function auth_shib_attributes (){
+function auth_shib_attributes(){
 //returns array containg attribute mappings between Moodle and shibboleth
 	global $CFG;
 
     $config = (array)$CFG;
+    $pluginconfig   = get_config('auth/shibboleth');
+    $pluginconfig   = (array) $pluginconfig;
+
     $fields = array("firstname", "lastname", "email", "phone1", "phone2", 
                     "department", "address", "city", "country", "description", 
                     "idnumber", "lang", "guid");
 
     $moodleattributes = array();
     foreach ($fields as $field) {
-        if ($config["auth_user_$field"]) {
-            $moodleattributes[$field] = $config["auth_user_$field"];
+        if ($pluginconfig["field_map_$field"]) {
+            $moodleattributes[$field] = $pluginconfig["field_map_$field"];
         }
     }
     $moodleattributes['username']=$config["shib_user_attribute"];
+
 	return $moodleattributes;
 }
 ?>

auth/shibboleth/shib-protected.php

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

backup/CHANGES_14_15.txt

@@ -30,37 +30,48 @@ Now I show the specific detailed status of every item in the process:
           teacher in the restored course. See bug 2381.
 19. DONE: Move blocks code to libraries and use it in a standard way. Now new
           blocks are supported by scheduled backup.
-20. PROG: Review the lesson module completely! Check the upgrade process to
-          mimic it. Pending to decide if the grade field must go to the score
-          one when restoring old files!! (sent to Michael, Mark and Martin).
+20. DONE: Review the lesson module completely! Check the upgrade process to
+          mimic it. 
 21. DONE: Review the workshop module completely! Check the upgrade process to
           mimic it.
-22. PROG: Review the wiki module fully. Now the wiki backup & restore seems to
+22. DONE: Review the wiki module fully. Now the wiki backup & restore seems to
           be working fine. About binary contents loaded directly to DB, I
           haven't found HOW TO LOAD them. I've opened Bug 2634 to see if
-          somebody can tell me how to reproduce it!
+          somebody can tell me how to reproduce it! After chat with MD, the
+          option to upload everything to filesystem seems to be the correct
+          approach. Sent to the bug.
 23. DONE: Add support for metacourses in backup and restore. Show a new option
           to decide what to do (ignore, process).
 24. DONE: Take out THEME from backup directory.
 25. DONE: Add support for forum_read table in backup and restore.
 26. DONE: chat_users->course and chat_users->lang. No changes required!
-27. PROG: Make the backup/restore/config/logs/index.php XHTML 1.0 Transitional.
+27. DONE: Make the backup/restore/config/logs/index.php XHTML 1.0 Transitional.
           Done in manual backups, config, logs and restore.
 28. DONE: Add course->theme, groups->them and user->theme. If no present,
           default blank.
 29. DONE: Add support for block instances in modules. Bug 2517. By Jon.
-30. DELAY:Add support for user->dstpreset. After talking with Jon, delayed
+30. DONE: Add support for user->dstpreset. After talking with Jon, delayed
           because there isn't possible to recode it to destination server. But
           sometime we should think in a solution (STAMPS or CHECKSUMS of DSTs).
+          Not needed due to the final timezone/dst schema (it uses common names
+          consistent between servers). PJ. Skipped.
 31. DONE: Change mail's priority (bug 2647) if something goes wrong in scheduled backups.
 32. DONE: quiz_questions->hidden and quiz_responses->originalquestion
 33. DONE: quiz_question_version
 34. DONE: Group images aren't included at all in backup/restore. Bug 2674.
 35. DONE: New glossary log action: "view_entry".
-36. PROG: Add support for quiz log action: "editquestions". Bug 2778 pending!
+36. DONE: Add support for quiz log action: "editquestions".
 37. DONE: Convert module ids in every Wiki reference to other activities.
 38. DONE: Convert every wiki formatted text to markdown. Bye, wikies! ;-)
-39. TODO: Add backup/restore of new grade tables.
+39. DONE: Add backup/restore of new grade tables.
+40. DONE: event->repeatid.
+41. DONE: Add support to forum_track_prefs table. Not necessary. MD. Skipped.
+42. DONE: Add user->trackforums (MD did).
+43. DONE: Add forum->trackingtype
+44. TODO: Review SCORM module. Bug 3404 seems to break restore.
+45. DONE: Modify QUIZ  module restore for pre1.5 courses (Eloy)
+46. TODO: Modify QUIZ  module 1.5 <==> 1.5 backup & restore (Gustav's team)
+47. DONE: Orphan categories thing in quiz module need final solution. Bug 2459 is 95% solved.
+          (only a nice interface is required to re-assign site categories to other courses).
          
-Eloy (stronk7)
-23-01-2004
+Maintained by Eloy (stronk7)

backup/backup_execute.html

@@ -270,6 +270,14 @@
             }
         }
 
+        //Print gradebook info
+        if ($status) { 
+            echo "<li>".get_string("writinggradebookinfo").'</li>';
+            if (!$status = backup_gradebook_info($backup_file,$preferences)) {
+                notify("An error occurred while backing up gradebook");
+            }
+        }
+
         //Module info, this unique function makes all the work!!
         //db export and module fileis copy
         if ($status) {

backup/backup_form.html

@@ -166,7 +166,7 @@
         else {
             echo '<input type="hidden" name="backup_logs" value="0" />';
         }
-	    
+ 
         if (empty($to)) {
             //Now print the User Files tr
             echo "<tr>";

backup/backup_scheduled.php

@@ -634,6 +634,12 @@ function schedule_backup_course_execute($preferences,$starttime = 0) {
             $status = backup_events_info($backup_file,$preferences);
         }
 
+        //Print gradebook info
+        if ($status) {
+            schedule_backup_log($starttime,$preferences->backup_course,"      gradebook");
+            $status = backup_gradebook_info($backup_file,$preferences);
+        }
+
         //Module info, this unique function makes all the work!!
         //db export and module fileis copy
         if ($status) {

backup/backuplib.php

@@ -2,104 +2,6 @@
     //This file contains all the function needed in the backup utility
     //except the mod-related funtions that are into every backuplib.php inside
     //every mod directory
-
-    //Insert necessary category ids to backup_ids table
-    function insert_category_ids ($course,$backup_unique_code) {
-        global $CFG;
-
-        //Create missing categories and reasign orphaned questions
-        fix_orphaned_questions($course);
-
-        //Detect used categories (by category in questions)
-        $status = execute_sql("INSERT INTO {$CFG->prefix}backup_ids
-                                   (backup_code, table_name, old_id)
-                               SELECT DISTINCT $backup_unique_code,'quiz_categories',t.category
-                               FROM {$CFG->prefix}quiz_questions t,
-                                    {$CFG->prefix}quiz_question_grades g,
-                                    {$CFG->prefix}quiz q
-                               WHERE q.course = '$course' AND
-                                     g.quiz = q.id AND
-                                     g.question = t.id",false);
-
-        //Now, foreach detected category, we look for their parents upto 0 (top category)
-        $categories = get_records_sql("SELECT old_id, old_id 
-                                       FROM {$CFG->prefix}backup_ids
-                                       WHERE backup_code = $backup_unique_code AND
-                                             table_name = 'quiz_categories'");
-
-        if ($categories) {
-            foreach ($categories as $category) {
-                if ($dbcat = get_record('quiz_categories','id',$category->old_id)) {
-                    //echo $dbcat->name;      //Debug
-                    //Go up to 0
-                    while ($dbcat->parent != 0) {
-                        //echo '->';              //Debug
-                        $current = $dbcat->id;
-                        if ($dbcat = get_record('quiz_categories','id',$dbcat->parent)) {
-                            //Found parent, add it to backup_ids (by using backup_putid
-                            //we ensure no duplicates!)
-                            $status = backup_putid($backup_unique_code,'quiz_categories',$dbcat->id,0);
-                            //echo $dbcat->name;      //Debug
-                        } else {
-                            //Parent not found, fix it (set its parent to 0)
-                            set_field ('quiz_categories','parent',0,'id',$current);
-                            //echo 'assigned to top!';          //Debug
-                        }
-                    }
-                    //echo '<br />';          //Debug
-                }
-            }
-        }
-
-        return $status;
-    }
-
-    //This function is used to detect orphaned questions (pointing to a
-    //non existing category) and to recreate such category. This function
-    //is used by the backup process, to ensure consistency and should be
-    //executed in the upgrade process and, perhaps in the health center.
-    function fix_orphaned_questions ($course) {
-
-        global $CFG;
-
-        $categories = get_records_sql("SELECT DISTINCT t.category, t.category
-                                       FROM {$CFG->prefix}quiz_questions t,
-                                            {$CFG->prefix}quiz_question_grades g,
-                                            {$CFG->prefix}quiz q
-                                       WHERE q.course = '$course' AND
-                                             g.quiz = q.id AND
-                                             g.question = t.id",false);
-        if ($categories) {
-            foreach ($categories as $key => $category) {
-                $exist = get_record('quiz_categories','id', $key);
-                //If the category doesn't exist
-                if (!$exist) {
-                    //Build a new category
-                    $db_cat->course = $course;
-                    $db_cat->name = get_string('recreatedcategory','',$key);
-                    $db_cat->info = get_string('recreatedcategory','',$key);
-                    $db_cat->publish = 1;
-                    $db_cat->stamp = make_unique_id_code();
-                    //Insert the new category
-                    $catid = insert_record('quiz_categories',$db_cat);
-                    unset ($db_cat);
-                    if ($catid) {
-                        //Reasign orphaned questions to their new category
-                        set_field ('quiz_questions','category',$catid,'category',$key);
-                    }
-                }
-            }
-        }
-    }
-    
-    //Delete category ids from backup_ids table
-    function delete_category_ids ($backup_unique_code) {
-        global $CFG;
-        $status = true;
-        $status = execute_sql("DELETE FROM {$CFG->prefix}backup_ids
-                               WHERE backup_code = '$backup_unique_code'",false);
-        return $status;
-    }
  
     //Calculate the number of users to backup and put their ids in backup_ids
     //Return an array of info (name,value)
@@ -1125,6 +1027,7 @@
                 fwrite ($bf,full_tag("MAILDISPLAY",4,false,$user_data->maildisplay));
                 fwrite ($bf,full_tag("HTMLEDITOR",4,false,$user_data->htmleditor));
                 fwrite ($bf,full_tag("AUTOSUBSCRIBE",4,false,$user_data->autosubscribe));
+                fwrite ($bf,full_tag("TRACKFORUMS",4,false,$user_data->trackforums));
                 fwrite ($bf,full_tag("TIMEMODIFIED",4,false,$user_data->timemodified));
 
                 //Output every user role (with its associated info) 
@@ -1313,6 +1216,194 @@
         return $status;
     }
 
+    //Backup gradebook info
+    function backup_gradebook_info($bf,$preferences) {
+
+        global $CFG;
+
+        $status = true;
+
+        //Gradebook header
+        fwrite ($bf,start_tag("GRADEBOOK",2,true));
+
+        //Output grade_preferences
+        $grade_preferences = get_records("grade_preferences", "courseid", $preferences->backup_course);
+        if ($grade_preferences) {
+            //Begin grade_preferences tag
+            fwrite ($bf,start_tag("GRADE_PREFERENCES",3,true)); 
+            //Iterate for each preference
+            foreach ($grade_preferences as $grade_preference) {
+                //Begin grade_preference
+                fwrite ($bf,start_tag("GRADE_PREFERENCE",4,true)); 
+                //Output individual fields
+                fwrite ($bf,full_tag("ID",5,false,$grade_preference->id));
+                fwrite ($bf,full_tag("PREFERENCE",5,false,$grade_preference->preference));
+                fwrite ($bf,full_tag("VALUE",5,false,$grade_preference->value));
+                //End grade_preference
+                fwrite ($bf,end_tag("GRADE_PREFERENCE",4,true)); 
+            }
+            //End grade_preferences tag
+            $status = fwrite ($bf,end_tag("GRADE_PREFERENCES",3,true));
+        }
+
+        //Output grade_letter
+        $grade_letters = get_records("grade_letter", "courseid", $preferences->backup_course);
+        if ($grade_letters) {
+            //Begin grade_letters tag
+            fwrite ($bf,start_tag("GRADE_LETTERS",3,true)); 
+            //Iterate for each letter
+            foreach ($grade_letters as $grade_letter) {
+                //Begin grade_letter
+                fwrite ($bf,start_tag("GRADE_LETTER",4,true)); 
+                //Output individual fields
+                fwrite ($bf,full_tag("ID",5,false,$grade_letter->id));
+                fwrite ($bf,full_tag("LETTER",5,false,$grade_letter->letter));
+                fwrite ($bf,full_tag("GRADE_HIGH",5,false,$grade_letter->grade_high));
+                fwrite ($bf,full_tag("GRADE_LOW",5,false,$grade_letter->grade_low));
+                //End grade_letter
+                fwrite ($bf,end_tag("GRADE_LETTER",4,true)); 
+            }
+            //End grade_letters tag
+            $status = fwrite ($bf,end_tag("GRADE_LETTERS",3,true));
+        }
+
+        //Output grade_category
+        $grade_categories = get_records("grade_category", "courseid", $preferences->backup_course);
+        if ($grade_categories) {
+            //Begin grade_categories tag
+            fwrite ($bf,start_tag("GRADE_CATEGORIES",3,true)); 
+            //Iterate for each category
+            foreach ($grade_categories as $grade_category) {
+                //Begin grade_category
+                fwrite ($bf,start_tag("GRADE_CATEGORY",4,true)); 
+                //Output individual fields
+                fwrite ($bf,full_tag("ID",5,false,$grade_category->id));
+                fwrite ($bf,full_tag("NAME",5,false,$grade_category->name));
+                fwrite ($bf,full_tag("DROP_X_LOWEST",5,false,$grade_category->drop_x_lowest));
+                fwrite ($bf,full_tag("BONUS_POINTS",5,false,$grade_category->bonus_points));
+                fwrite ($bf,full_tag("HIDDEN",5,false,$grade_category->hidden));
+                fwrite ($bf,full_tag("WEIGHT",5,false,$grade_category->weight));
+
+                //Now backup grade_item (inside grade_category)
+                $status = backup_gradebook_item_info($bf,$preferences,$grade_category->id);
+
+                //End grade_category
+                fwrite ($bf,end_tag("GRADE_CATEGORY",4,true)); 
+            }
+            //End grade_categories tag
+            $status = fwrite ($bf,end_tag("GRADE_CATEGORIES",3,true));
+        }
+        //Gradebook footer
+        $status = fwrite ($bf,end_tag("GRADEBOOK",2,true));
+        return $status;
+    }
+
+    //Backup gradebook_item (called from backup_gradebook_info
+    function backup_gradebook_item_info($bf,$preferences,$gradecategoryid) {
+
+        global $CFG;
+
+        $status = true;
+
+        //Output grade_item (only for modules included in backup)
+        $grade_items = get_records_sql("SELECT *
+                                    FROM {$CFG->prefix}grade_item
+                                    WHERE courseid = $preferences->backup_course AND
+                                          category = $gradecategoryid");
+        //Filter items about modules not included in backup
+        $inc_grade_items = array();
+        if ($grade_items) {
+            foreach ($grade_items as $grade_item) {
+                //Get modulename
+                $rec_module = get_record("modules", "id", $grade_item->modid);
+                //If it exists and it's included in backup
+                if ($rec_module && $preferences->mods[$rec_module->name]->backup == 1) {
+                    //Set the name and add it
+                    $grade_item->module_name = $rec_module->name;
+                    $inc_grade_items[] = $grade_item;
+                } else {
+                    if ($CFG->debug > 7) {
+                        echo "skipping $grade_item->modid"."-"."$rec_module->name<br />";
+                    }
+                }
+            }
+        }
+        if ($inc_grade_items) {
+            //Begin grade_items tag
+            fwrite ($bf,start_tag("GRADE_ITEMS",5,true)); 
+            //Iterate for each item
+            foreach ($inc_grade_items as $grade_item) {
+                //Begin grade_item
+                fwrite ($bf,start_tag("GRADE_ITEM",6,true)); 
+                //Output individual fields
+                fwrite ($bf,full_tag("MODULE_NAME",7,false,$grade_item->module_name));
+                fwrite ($bf,full_tag("CMINSTANCE",7,false,$grade_item->cminstance));
+                fwrite ($bf,full_tag("SCALE_GRADE",7,false,$grade_item->scale_grade));
+                fwrite ($bf,full_tag("EXTRA_CREDIT",7,false,$grade_item->extra_credit));
+                fwrite ($bf,full_tag("SORT_ORDER",7,false,$grade_item->sort_order));
+ 
+                //Now backup grade_exceptions (inside grade_item)
+                $status = backup_gradebook_exceptions_info($bf,$preferences,$grade_item->id);
+
+                //End grade_item
+                fwrite ($bf,end_tag("GRADE_ITEM",6,true)); 
+            }
+            //End grade_items tag
+            $status = fwrite ($bf,end_tag("GRADE_ITEMS",5,true));
+        }
+
+        return $status;
+    }
+
+    //Backup gradebook_exceptions (called from backup_gradebook_item_info
+    function backup_gradebook_exceptions_info($bf,$preferences,$gradeitemid) {
+
+        global $CFG;
+
+        $status = true;
+
+        //Output grade_exceptions (only for users included in backup)
+        $grade_exceptions = get_records_sql("SELECT *
+                                             FROM {$CFG->prefix}grade_exceptions
+                                             WHERE courseid = $preferences->backup_course AND
+                                                   grade_itemid = $gradeitemid");
+        //Filter exceptions about users not included in backup
+        $inc_grade_exceptions = array();
+        if ($grade_exceptions) {
+            foreach ($grade_exceptions as $grade_exception) {
+                //Check if user has been included in backup
+                $rec_user = get_record ("backup_ids","backup_code",$preferences->backup_unique_code,
+                                        "table_name","user",
+                                        "old_id",$grade_exception->userid);
+                //If it's included in backup
+                if ($rec_user) {
+                    //Add it
+                    $inc_grade_exceptions[] = $grade_exception;
+                } else {
+                    if ($CFG->debug > 7) {
+                        echo "skipping $grade_exception->userid"."-user<br />";
+                    }
+                }
+            }
+        }
+        if ($inc_grade_exceptions) {
+            //Begin grade_exceptions tag
+            fwrite ($bf,start_tag("GRADE_EXCEPTIONS",7,true));
+            //Iterate for each exception
+            foreach ($inc_grade_exceptions as $grade_exception) {
+                //Begin grade_exception
+                fwrite ($bf,start_tag("GRADE_EXCEPTION",8,true));
+                //Output individual fields
+                fwrite ($bf,full_tag("USERID",9,false,$grade_exception->userid));
+                //End grade_exception
+                fwrite ($bf,end_tag("GRADE_EXCEPTION",8,true));
+            }
+            //End grade_exceptions tag
+            $status = fwrite ($bf,end_tag("GRADE_EXCEPTIONS",7,true));
+        }
+
+        return $status;
+    }
 
     //Backup scales info (common and course scales)
     function backup_scales_info($bf,$preferences) {
@@ -1392,6 +1483,7 @@
                 fwrite ($bf,full_tag("FORMAT",4,false,$event->format));
                 fwrite ($bf,full_tag("GROUPID",4,false,$event->groupid));
                 fwrite ($bf,full_tag("USERID",4,false,$event->userid));
+                fwrite ($bf,full_tag("REPEATID",4,false,$event->repeatid));
                 fwrite ($bf,full_tag("EVENTTYPE",4,false,$event->eventtype));
                 fwrite ($bf,full_tag("TIMESTART",4,false,$event->timestart));
                 fwrite ($bf,full_tag("TIMEDURATION",4,false,$event->timeduration));

backup/restore.php

@@ -129,7 +129,15 @@
         }
     } else if ($launch == "check") {
         include_once("restore_check.html");
+        //To avoid multiple restore executions...
+        $SESSION->cancontinue = true;
     } else if ($launch == "execute") {
+        //Prevent multiple restore executions...
+        if (empty($SESSION->cancontinue)) {
+            error("Multiple restore execution not allowed!");
+        }
+        //Unset this for the future
+        unset($SESSION->cancontinue);
         include_once("restore_execute.html");
     }
     print_simple_box_end();

backup/restore_execute.html

@@ -290,6 +290,14 @@
         }
     }
 
+    //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

backup/restorelib.php

@@ -189,6 +189,15 @@
         return $info;
     }
 
+    //This function read the xml file and store its data from the gradebook in a object
+    function restore_read_xml_gradebook ($restore, $xml_file) {
+
+        //We call the main read_xml function, with todo = GRADEBOOK
+        $info = restore_read_xml ($xml_file,"GRADEBOOK",$restore);
+    
+        return $info;
+    }
+
     //This function read the xml file and store its data from the users in 
     //backup_ids->info db (and user's id in $info)
     function restore_read_xml_users ($restore,$xml_file) {
@@ -542,6 +551,44 @@
         return $status;
     }
 
+   /**
+    * Returns the best quiz category (id) found to restore one
+    * quiz category from a backup file. Works by stamp (since Moodle 1.1)
+    * or by name (for older versions).
+    *
+    * @param object  $cat      the quiz_categories record to be searched
+    * @param integer $courseid the course where we are restoring
+    * @return integer the id of a existing quiz_category or 0 (not found)
+    */
+    function restore_get_best_quiz_category($cat, $courseid) {
+        
+        $found = 0;
+
+        //Decide how to work (by stamp or name)
+        if ($cat->stamp) {
+            $searchfield = 'stamp';
+            $searchvalue = $cat->stamp;
+        } else {
+            $searchfield = 'name';
+            $searchvalue = $cat->name;
+        }
+        
+        //First shot. Try to get the category from the course being restored
+        if ($fcat = get_record('quiz_categories','course',$courseid,$searchfield,$searchvalue)) {
+            $found = $fcat->id;
+        //Second shot. Try to obtain any concordant category and check its publish status and editing rights
+        } else if ($fcats = get_records('quiz_categories', $searchfield, $searchvalue, 'id', 'id, publish, course')) {
+            foreach ($fcats as $fcat) {
+                if ($fcat->publish == 1 && isteacheredit($fcat->course)) {
+                    $found = $fcat->id;
+                    break;
+                }
+            }
+        }
+
+        return $found;
+    }
+
     //This function creates all the block stuff when restoring courses
     //It calls selectively to  restore_create_block_instances() for 1.5 
     //and above backups. Upwards compatible with old blocks.
@@ -927,6 +974,288 @@
         return $status;
     }
     
+    //This function creates all the gradebook data from xml, notifying 
+    //about each incidence
+    function restore_create_gradebook($restore,$xml_file) {
+
+        global $CFG,$db;
+
+        $status = true;
+        //Check it exists
+        if (!file_exists($xml_file)) {
+            $status = false;
+        }
+        //Get info from xml
+        if ($status) {
+            //info will contain the number of record to process
+            $info = restore_read_xml_gradebook($restore, $xml_file);
+
+        //If we have info, then process preferences, letters & categories
+            if ($info > 0) {
+                //Count how many we have
+                $preferencescount = count_records ('backup_ids', 'backup_code', $restore->backup_unique_code, 'table_name', 'grade_preferences');
+                $letterscount = count_records ('backup_ids', 'backup_code', $restore->backup_unique_code, 'table_name', 'grade_letter');
+                $categoriescount = count_records ('backup_ids', 'backup_code', $restore->backup_unique_code, 'table_name', 'grade_category');
+                if ($preferencescount || $letterscount || $categoriescount) {
+                    //Start ul
+                    echo '<ul>';
+                    //Number of records to get in every chunk
+                    $recordset_size = 2;
+                    //Flag to mark if we must continue
+                    $continue = true;
+
+                    //If there aren't preferences, stop
+                    if (!$preferencescount) {
+                        $continue = false;
+                        echo '<li>'.get_string('backupwithoutgradebook','grade').'</li>';
+                    }
+
+                    //If we are restoring to an existing course and it has advanced disabled, stop
+                    if ($restore->restoreto != 2) {
+                        //Fetch the 'use_advanced' preferences (id = 0)
+                        if ($pref_rec = get_record('grade_preferences','courseid',$restore->course_id,'preference',0)) {
+                            if ($pref_rec->value == 0) {
+                                $continue = false;
+                                echo '<li>'.get_string('respectingcurrentdata','grade').'</li>';
+                            }
+                        }
+                    }
+
+                    //Process preferences
+                    if ($preferencescount && $continue) {
+                        echo '<li>'.get_string('preferences','grades').'</li>';
+                        $counter = 0;
+                        while ($counter < $preferencescount) {
+                            //Fetch recordset_size records in each iteration
+                            $recs = get_records_select("backup_ids","table_name = 'grade_preferences' AND backup_code = '$restore->backup_unique_code'",
+                                                       "old_id",
+                                                       "old_id, old_id",
+                                                       $counter,
+                                                       $recordset_size);
+                            if ($recs) {
+                                foreach ($recs as $rec) {
+                                    //Get the full record from backup_ids
+                                    $data = backup_getid($restore->backup_unique_code,'grade_preferences',$rec->old_id);
+                                   if ($data) {
+                                        //Now get completed xmlized object
+                                        $info = $data->info;
+                                        //traverse_xmlize($info);                            //Debug
+                                        //print_object ($GLOBALS['traverse_array']);         //Debug
+                                        //$GLOBALS['traverse_array']="";                     //Debug
+                                        //Now build the GRADE_PREFERENCES record structure
+                                        $dbrec->courseid   = $restore->course_id;
+                                        $dbrec->preference = backup_todb($info['GRADE_PREFERENCE']['#']['PREFERENCE']['0']['#']);
+                                        $dbrec->value      = backup_todb($info['GRADE_PREFERENCE']['#']['VALUE']['0']['#']);
+   
+                                        //Structure is equal to db, insert record
+                                        //if the preference doesn't exist
+                                        if (!$prerec = get_record('grade_preferences','courseid',$dbrec->courseid,'preference',$dbrec->preference)) {
+                                            $status = insert_record('grade_preferences',$dbrec);
+                                        }
+
+                                        //Do some output
+                                        $counter++;
+                                        if ($counter % 1 == 0) {
+                                            echo ".";
+                                            if ($counter % 20 == 0) {
+                                                echo "<br />";
+                                            }
+                                            backup_flush(300);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    //Process letters
+                    //If destination course has letters, skip restoring letters
+                    $hasletters = get_records('grade_letter', 'courseid', $restore->course_id);
+
+                    if ($preferencescount && $continue && !$hasletters) {
+                        echo '<li>'.get_string('letters','grades').'</li>';
+                        $counter = 0;
+                        while ($counter < $letterscount) {
+                            //Fetch recordset_size records in each iteration
+                            $recs = get_records_select("backup_ids","table_name = 'grade_letter' AND backup_code = '$restore->backup_unique_code'",
+                                                       "old_id",
+                                                       "old_id, old_id",
+                                                       $counter,
+                                                       $recordset_size);
+                            if ($recs) {
+                                foreach ($recs as $rec) {
+                                    //Get the full record from backup_ids
+                                    $data = backup_getid($restore->backup_unique_code,'grade_letter',$rec->old_id);
+                                   if ($data) {
+                                        //Now get completed xmlized object
+                                        $info = $data->info;
+                                        //traverse_xmlize($info);                            //Debug
+                                        //print_object ($GLOBALS['traverse_array']);         //Debug
+                                        //$GLOBALS['traverse_array']="";                     //Debug
+                                        //Now build the GRADE_LETTER record structure
+                                        $dbrec->courseid   = $restore->course_id;
+                                        $dbrec->letter     = backup_todb($info['GRADE_LETTER']['#']['LETTER']['0']['#']);
+                                        $dbrec->grade_high = backup_todb($info['GRADE_LETTER']['#']['GRADE_HIGH']['0']['#']);
+                                        $dbrec->grade_low  = backup_todb($info['GRADE_LETTER']['#']['GRADE_LOW']['0']['#']);
+
+                                        //Structure is equal to db, insert record
+                                        $status = insert_record('grade_letter',$dbrec);
+
+                                        //Do some output
+                                        $counter++;
+                                        if ($counter % 1 == 0) {
+                                            echo ".";
+                                            if ($counter % 20 == 0) {
+                                                echo "<br />";
+                                            }
+                                            backup_flush(300);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    //Process categories
+                    if ($categoriescount && $continue) {
+                        echo '<li>'.get_string('categories','grades').'</li>';
+                        $counter = 0;
+                        $countercat = 0;
+                        while ($countercat < $categoriescount) {
+                            //Fetch recordset_size records in each iteration
+                            $recs = get_records_select("backup_ids","table_name = 'grade_category' AND backup_code = '$restore->backup_unique_code'",
+                                                       "old_id",
+                                                       "old_id, old_id",
+                                                       $counter,
+                                                       $recordset_size);
+                            if ($recs) {
+                                foreach ($recs as $rec) {
+                                    //Get the full record from backup_ids
+                                    $data = backup_getid($restore->backup_unique_code,'grade_category',$rec->old_id);
+                                   if ($data) {
+                                        //Now get completed xmlized object
+                                        $info = $data->info;
+                                        //traverse_xmlize($info);                            //Debug
+                                        //print_object ($GLOBALS['traverse_array']);         //Debug
+                                        //$GLOBALS['traverse_array']="";                     //Debug
+                                        //Now build the GRADE_CATEGORY record structure
+                                        $dbrec->courseid     = $restore->course_id;
+                                        $dbrec->name         = backup_todb($info['GRADE_CATEGORY']['#']['NAME']['0']['#']);
+                                        $dbrec->drop_x_lowest= backup_todb($info['GRADE_CATEGORY']['#']['DROP_X_LOWEST']['0']['#']);
+                                        $dbrec->bonus_points = backup_todb($info['GRADE_CATEGORY']['#']['BONUS_POINTS']['0']['#']);
+                                        $dbrec->hidden       = backup_todb($info['GRADE_CATEGORY']['#']['HIDDEN']['0']['#']);
+                                        $dbrec->weight       = backup_todb($info['GRADE_CATEGORY']['#']['WEIGHT']['0']['#']);
+
+                                        //If the grade_category exists in the course (by name), don't insert anything
+                                        $catex = get_record('grade_category','courseid',$dbrec->courseid,'name',$dbrec->name);
+
+                                        if (!$catex) {
+                                            //Structure is equal to db, insert record
+                                            $categoryid = insert_record('grade_category',$dbrec);
+                                        } else {
+                                            //Simply remap category
+                                            $categoryid = $catex->id;
+                                        }
+
+                                        //Now, restore grade_item
+                                        $items = $info['GRADE_CATEGORY']['#']['GRADE_ITEMS']['0']['#']['GRADE_ITEM'];
+
+                                        //Iterate over items
+                                        for($i = 0; $i < sizeof($items); $i++) {
+                                            $ite_info = $items[$i];
+                                            //traverse_xmlize($ite_info);                                                                 //Debug
+                                            //print_object ($GLOBALS['traverse_array']);                                                  //Debug
+                                            //$GLOBALS['traverse_array']="";                                                              //Debug
+
+                                            //Now build the GRADE_ITEM record structure
+                                            $item->courseid     = $restore->course_id;
+                                            $item->category     = $categoryid;
+                                            $item->module_name  = backup_todb($ite_info['#']['MODULE_NAME']['0']['#']);
+                                            $item->cminstance   = backup_todb($ite_info['#']['CMINSTANCE']['0']['#']);
+                                            $item->scale_grade  = backup_todb($ite_info['#']['SCALE_GRADE']['0']['#']);
+                                            $item->extra_credit = backup_todb($ite_info['#']['EXTRA_CREDIT']['0']['#']);
+                                            $item->sort_order   = backup_todb($ite_info['#']['SORT_ORDER']['0']['#']);
+
+                                            //Check that the module has been included in the restore
+                                            if ($restore->mods[$item->module_name]->restore) {
+                                                //Get the id of the moduletype
+                                                if ($module = get_record('modules','name',$item->module_name)) {
+                                                    $item->modid = $module->id;
+                                                    //Get the instance id
+                                                    if ($instance = backup_getid($restore->backup_unique_code,$item->module_name,$item->cminstance)) {
+                                                        $item->cminstance = $instance->new_id;
+                                                        //Structure is equal to db, insert record
+                                                        $itemid = insert_record('grade_item',$item);
+
+                                                        //Now process grade_exceptions
+                                                        $exceptions = $ite_info['#']['GRADE_EXCEPTIONS']['0']['#']['GRADE_EXCEPTION'];
+
+                                                        //Iterate over exceptions
+                                                        for($j = 0; $j < sizeof($exceptions); $j++) {
+                                                            $exc_info = $exceptions[$j];
+                                                            //traverse_xmlize($exc_info);                                                                 //Debug
+                                                            //print_object ($GLOBALS['traverse_array']);                                                  //Debug
+                                                            //$GLOBALS['traverse_array']="";                                                              //Debug
+
+                                                            //Now build the GRADE_EXCEPTIONS record structure
+                                                            $exception->courseid     = $restore->course_id;
+                                                            $exception->grade_itemid = $itemid;
+                                                            $exception->userid       = backup_todb($exc_info['#']['USERID']['0']['#']);
+
+                                                            //We have to recode the useridto field
+                                                            $user = backup_getid($restore->backup_unique_code,"user",$exception->userid);
+                                                            if ($user) {
+                                                                $exception->userid = $user->new_id;
+                                                                //Structure is equal to db, insert record
+                                                                $exceptionid = insert_record('grade_exceptions',$exception);
+                                                                //Do some output
+                                                                $counter++;
+                                                                if ($counter % 20 == 0) {
+                                                                    echo ".";
+                                                                    if ($counter % 400 == 0) {
+                                                                        echo "<br />";
+                                                                    }
+                                                                    backup_flush(300);
+                                                                }
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+
+                                        //Re-sort all the grade_items because we can have duplicates
+                                        if ($grade_items = get_records ('grade_item','courseid',$restore->course_id,'sort_order','id,sort_order')) {
+                                            $order = 1;
+                                            foreach ($grade_items as $grade_item) {
+                                                $grade_item->sort_order = $order;
+                                                set_field ('grade_item','sort_order',$grade_item->sort_order,'id',$grade_item->id);
+                                                $order++;
+                                            }
+                                        }
+                                        //Do some output
+                                        $countercat++;
+                                        if ($countercat % 1 == 0) {
+                                            echo ".";
+                                            if ($countercat % 20 == 0) {
+                                                echo "<br />";
+                                            }
+                                            backup_flush(300);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    //End ul
+                    echo '</ul>';
+                }
+            }
+        }                
+     
+        return $status;
+    }
+
     //This function creates all the user, user_students, user_teachers
     //user_course_creators and user_admins from xml
     function restore_create_users($restore,$xml_file) {
@@ -1206,7 +1535,6 @@
                     $recordset_size = 4;
 
                     //Process unread
-                    $db->debug=true;
                     if ($unreadcount) {
                         echo '<li>'.get_string('unreadmessages','message').'</li>';
                         $counter = 0;
@@ -1388,7 +1716,6 @@
                     }
                     //End ul
                     echo '</ul>';
-                    $db->debug=true;
                 }
             }
         }
@@ -1575,7 +1902,7 @@
                 //Iterate over each group
                 foreach ($groups as $group) {
                     //Get record from backup_ids
-                    $data = backup_getid($restore->backup_unique_code,"group",$group->id);
+                    $data = backup_getid($restore->backup_unique_code,"groups",$group->id);
                     //Init variables
                     $create_group = false;
 
@@ -1738,6 +2065,7 @@
                         $eve->courseid = $restore->course_id;
                         $eve->groupid = backup_todb($info['EVENT']['#']['GROUPID']['0']['#']);
                         $eve->userid = backup_todb($info['EVENT']['#']['USERID']['0']['#']);
+                        $eve->repeatid = backup_todb($info['EVENT']['#']['REPEATID']['0']['#']);
                         $eve->modulename = "";
                         $eve->instance = 0;
                         $eve->eventtype = backup_todb($info['EVENT']['#']['EVENTTYPE']['0']['#']);
@@ -1764,8 +2092,22 @@
                                 //Assign it to admin
                                 $eve->userid = $adminid;
                             }
+
+                            //We must recode the repeatid if the event has it
+                            if (!empty($eve->repeatid)) {
+                                $repeat_rec = backup_getid($restore->backup_unique_code,"event_repeatid",$eve->repeatid);
+                                if ($repeat_rec) {    //Exists, so use it...
+                                    $eve->repeatid = $repeat_rec->new_id;
+                                } else {              //Doesn't exists, calculate the next and save it
+                                    $oldrepeatid = $eve->repeatid;
+                                    $max_rec = get_record_sql('SELECT 1, MAX(repeatid) AS repeatid FROM '.$CFG->prefix.'event');
+                                    $eve->repeatid = empty($max_rec) ? 1 : $max_rec->repeatid + 1;
+                                    backup_putid($restore->backup_unique_code,"event_repeatid", $oldrepeatid, $eve->repeatid);
+                                }
+                            }
+ 
                             //We have to recode the groupid field
-                            $group = backup_getid($restore->backup_unique_code,"group",$eve->groupid);
+                            $group = backup_getid($restore->backup_unique_code,"groups",$eve->groupid);
                             if ($group) {
                                 $eve->groupid = $group->new_id;
                             } else {
@@ -2515,6 +2857,31 @@
             //if ($this->tree[3] == "METACOURSE")                                                         //Debug
             //    echo $this->level.str_repeat("&nbsp;",$this->level*2)."&lt;".$tagName."&gt;<br />\n";   //Debug
         }
+
+        //This is the startTag handler we use where we are reading the gradebook zone (todo="GRADEBOOK")
+        function startElementGradebook($parser, $tagName, $attrs) {
+
+            //Refresh properties
+            $this->level++;
+            $this->tree[$this->level] = $tagName;
+
+            //Output something to avoid browser timeouts...
+            backup_flush();
+
+            //Check if we are into GRADEBOOK zone
+            //if ($this->tree[3] == "GRADEBOOK")                                                         //Debug
+            //    echo $this->level.str_repeat("&nbsp;",$this->level*2)."&lt;".$tagName."&gt;<br />\n";  //Debug
+
+            //If we are under a GRADE_PREFERENCE, GRADE_LETTER or GRADE_CATEGORY tag under a GRADEBOOK zone, accumule it
+            if (isset($this->tree[5]) and isset($this->tree[3])) {
+                if (($this->tree[5] == "GRADE_PREFERENCE" || $this->tree[5] == "GRADE_LETTER" || $this->tree[5] == "GRADE_CATEGORY" ) && ($this->tree[3] == "GRADEBOOK")) {
+                    if (!isset($this->temp)) {
+                        $this->temp = "";
+                    }
+                    $this->temp .= "<".$tagName.">";
+                }
+            }
+        }
         
         
         //This is the startTag handler we use where we are reading the user zone (todo="USERS")
@@ -2804,17 +3171,17 @@
                 }
             }
 
+            //Stop parsing if todo = INFO and tagName = INFO (en of the tag, of course)
+            //Speed up a lot (avoid parse all)
+            if ($tagName == "INFO") {
+                $this->finished = true;
+            }
 
             //Clear things
             $this->tree[$this->level] = "";
             $this->level--;
             $this->content = "";
 
-            //Stop parsing if todo = INFO and tagName = INFO (en of the tag, of course)
-            //Speed up a lot (avoid parse all)
-            if ($tagName == "INFO") {
-                $this->finished = true;
-            }
         }
 
         //This is the endTag handler we use where we are reading the course_header zone (todo="COURSE_HEADER")
@@ -2939,19 +3306,21 @@
                 }
 
             }
-            //Clear things
-            $this->tree[$this->level] = "";
-            $this->level--;
-            $this->content = "";
 
             //Stop parsing if todo = COURSE_HEADER and tagName = HEADER (en of the tag, of course)
             //Speed up a lot (avoid parse all)
             if ($tagName == "HEADER") {
                 $this->finished = true;
             }
+
+            //Clear things
+            $this->tree[$this->level] = "";
+            $this->level--;
+            $this->content = "";
+
         }
 
-        //This is the endTag handler we use where we are reading the sections zone (todo="SECTIONS")
+        //This is the endTag handler we use where we are reading the sections zone (todo="BLOCKS")
         function endElementBlocks($parser, $tagName) {
             //Check if we are into BLOCKS zone
             if ($this->tree[3] == 'BLOCKS') {
@@ -2996,10 +3365,6 @@
                     }
                 }
             }
-            //Clear things
-            $this->tree[$this->level] = '';
-            $this->level--;
-            $this->content = "";
 
             //Stop parsing if todo = BLOCKS and tagName = BLOCKS (en of the tag, of course)
             //Speed up a lot (avoid parse all)
@@ -3008,6 +3373,11 @@
             if ($this->tree[3] == 'BLOCKS' && $tagName == 'BLOCKS') {
                 $this->finished = true;
             }
+
+            //Clear things
+            $this->tree[$this->level] = '';
+            $this->level--;
+            $this->content = "";
         }
 
         //This is the endTag handler we use where we are reading the sections zone (todo="SECTIONS")
@@ -3097,16 +3467,18 @@
                     }
                 }
             }
-            //Clear things
-            $this->tree[$this->level] = "";
-            $this->level--;
-            $this->content = "";
 
             //Stop parsing if todo = SECTIONS and tagName = SECTIONS (en of the tag, of course)
             //Speed up a lot (avoid parse all)
             if ($tagName == "SECTIONS") {
                 $this->finished = true;
             }
+
+            //Clear things
+            $this->tree[$this->level] = "";
+            $this->level--;
+            $this->content = "";
+
         }
 
         //This is the endTag handler we use where we are reading the metacourse zone (todo="METACOURSE")
@@ -3147,18 +3519,122 @@
                     }
                 }
             }
-            //Clear things
-            $this->tree[$this->level] = '';
-            $this->level--;
-            $this->content = "";
 
             //Stop parsing if todo = METACOURSE and tagName = METACOURSE (en of the tag, of course)
             //Speed up a lot (avoid parse all)
             if ($this->tree[3] == 'METACOURSE' && $tagName == 'METACOURSE') {
                 $this->finished = true;
             }
+
+            //Clear things
+            $this->tree[$this->level] = '';
+            $this->level--;
+            $this->content = "";
         }
 
+        //This is the endTag handler we use where we are reading the gradebook zone (todo="GRADEBOOK")
+        function endElementGradebook($parser, $tagName) {
+            //Check if we are into GRADEBOOK zone
+            if ($this->tree[3] == "GRADEBOOK") {
+                //if (trim($this->content))                                                             //Debug
+                //    echo "C".str_repeat("&nbsp;",($this->level+2)*2).$this->getContents()."<br />\n"; //Debug
+                //echo $this->level.str_repeat("&nbsp;",$this->level*2)."&lt;/".$tagName."&gt;<br />\n";//Debug
+                //Acumulate data to info (content + close tag)
+                //Reconvert: strip htmlchars again and trim to generate xml data
+                if (!isset($this->temp)) {
+                    $this->temp = "";
+                }
+                $this->temp .= htmlspecialchars(trim($this->content))."</".$tagName.">";
+                //We have finished preferences, letters or categories, reset accumulated
+                //data because they are close tags
+                if ($this->level == 4) {
+                    $this->temp = "";
+                }
+                //If we've finished a message, xmlize it an save to db
+                if (($this->level == 5) and ($tagName == "GRADE_PREFERENCE")) {
+                    //Prepend XML standard header to info gathered
+                    $xml_data = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n".$this->temp;
+                    //Call to xmlize for this portion of xml data (one PREFERENCE)
+                    //echo "-XMLIZE: ".strftime ("%X",time()),"-";                                    //Debug
+                    $data = xmlize($xml_data,0);
+                    //echo strftime ("%X",time())."<p>";                                              //Debug
+                    //traverse_xmlize($data);                                                         //Debug
+                    //print_object ($GLOBALS['traverse_array']);                                      //Debug
+                    //$GLOBALS['traverse_array']="";                                                  //Debug
+                    //Now, save data to db. We'll use it later
+                    //Get id and status from data
+                    $preference_id = $data["GRADE_PREFERENCE"]["#"]["ID"]["0"]["#"];
+                    $this->counter++;
+                    //Save to db
+                    $status = backup_putid($this->preferences->backup_unique_code, 'grade_preferences', $preference_id, 
+                                           null,$data);
+                    //Create returning info
+                    $this->info = $this->counter;
+                    //Reset temp
+                    unset($this->temp);
+                }
+                //If we've finished a grade_letter, xmlize it an save to db
+                if (($this->level == 5) and ($tagName == "GRADE_LETTER")) {
+                    //Prepend XML standard header to info gathered
+                    $xml_data = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n".$this->temp;
+                    //Call to xmlize for this portion of xml data (one LETTER)
+                    //echo "-XMLIZE: ".strftime ("%X",time()),"-";                                    //Debug
+                    $data = xmlize($xml_data,0);
+                    //echo strftime ("%X",time())."<p>";                                              //Debug
+                    //traverse_xmlize($data);                                                         //Debug
+                    //print_object ($GLOBALS['traverse_array']);                                      //Debug
+                    //$GLOBALS['traverse_array']="";                                                  //Debug
+                    //Now, save data to db. We'll use it later
+                    //Get id and status from data
+                    $letter_id = $data["GRADE_LETTER"]["#"]["ID"]["0"]["#"];
+                    $this->counter++;
+                    //Save to db
+                    $status = backup_putid($this->preferences->backup_unique_code, 'grade_letter' ,$letter_id, 
+                                           null,$data);
+                    //Create returning info
+                    $this->info = $this->counter;
+                    //Reset temp
+                    unset($this->temp);
+                }
+
+                //If we've finished a grade_category, xmlize it an save to db
+                if (($this->level == 5) and ($tagName == "GRADE_CATEGORY")) {
+                    //Prepend XML standard header to info gathered
+                    $xml_data = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n".$this->temp;
+                    //Call to xmlize for this portion of xml data (one CATECORY)
+                    //echo "-XMLIZE: ".strftime ("%X",time()),"-";                                    //Debug
+                    $data = xmlize($xml_data,0);
+                    //echo strftime ("%X",time())."<p>";                                              //Debug
+                    //traverse_xmlize($data);                                                         //Debug
+                    //print_object ($GLOBALS['traverse_array']);                                      //Debug
+                    //$GLOBALS['traverse_array']="";                                                  //Debug
+                    //Now, save data to db. We'll use it later
+                    //Get id and status from data
+                    $category_id = $data["GRADE_CATEGORY"]["#"]["ID"]["0"]["#"];
+                    $this->counter++;
+                    //Save to db
+                    $status = backup_putid($this->preferences->backup_unique_code, 'grade_category' ,$category_id,
+                                           null,$data);
+                    //Create returning info
+                    $this->info = $this->counter;
+                    //Reset temp
+                    unset($this->temp);
+                }
+            }
+
+            //Stop parsing if todo = GRADEBOOK and tagName = GRADEBOOK (en of the tag, of course)
+            //Speed up a lot (avoid parse all)
+            if ($tagName == "GRADEBOOK" and $this->level == 3) {
+                $this->finished = true;
+                $this->counter = 0;
+            }
+
+            //Clear things
+            $this->tree[$this->level] = "";
+            $this->level--;
+            $this->content = "";
+
+        }
         
         //This is the endTag handler we use where we are reading the users zone (todo="USERS")
         function endElementUsers($parser, $tagName) {
@@ -3320,6 +3796,9 @@
                         case "AUTOSUBSCRIBE": 
                             $this->info->tempuser->autosubscribe = $this->getContents();
                             break;
+                        case "TRACKFORUMS": 
+                            $this->info->tempuser->trackforums = $this->getContents();
+                            break;
                         case "TIMEMODIFIED": 
                             $this->info->tempuser->timemodified = $this->getContents();
                             break;
@@ -3398,6 +3877,7 @@
             $this->tree[$this->level] = "";
             $this->level--;
             $this->content = "";
+
         }
 
         //This is the endTag handler we use where we are reading the messages zone (todo="MESSAGES")
@@ -3472,13 +3952,13 @@
             if ($tagName == "MESSAGES" and $this->level == 3) {
                 $this->finished = true;
                 $this->counter = 0;
-
             }
 
             //Clear things
             $this->tree[$this->level] = "";
             $this->level--;
             $this->content = "";
+
         }
 
         //This is the endTag handler we use where we are reading the questions zone (todo="QUESTIONS")  
@@ -3529,6 +4009,7 @@
             $this->tree[$this->level] = "";
             $this->level--;
             $this->content = "";
+
         }
 
         //This is the endTag handler we use where we are reading the scales zone (todo="SCALES")
@@ -3579,6 +4060,7 @@
             $this->tree[$this->level] = "";
             $this->level--;
             $this->content = "";
+
         }
 
         //This is the endTag handler we use where we are reading the groups zone (todo="GROUPS")
@@ -3609,7 +4091,7 @@
                     //Get id and from data
                     $group_id = $data["GROUP"]["#"]["ID"]["0"]["#"];
                     //Save to db
-                    $status = backup_putid($this->preferences->backup_unique_code,"group",$group_id,
+                    $status = backup_putid($this->preferences->backup_unique_code,"groups",$group_id,
                                      null,$data);
                     //Create returning info
                     $ret_info->id = $group_id;
@@ -3629,6 +4111,7 @@
             $this->tree[$this->level] = "";
             $this->level--;
             $this->content = "";
+
         }
 
         //This is the endTag handler we use where we are reading the events zone (todo="EVENTS")
@@ -3679,6 +4162,7 @@
             $this->tree[$this->level] = "";
             $this->level--;
             $this->content = "";
+
         }
 
         //This is the endTag handler we use where we are reading the modules zone (todo="MODULES")
@@ -3735,6 +4219,7 @@
             $this->tree[$this->level] = "";
             $this->level--;
             $this->content = "";
+
         }
 
         //This is the endTag handler we use where we are reading the logs zone (todo="LOGS")
@@ -3791,13 +4276,13 @@
             if ($tagName == "LOGS" and $this->level == 3) {
                 $this->finished = true;
                 $this->counter = 0;
-
             }
 
             //Clear things
             $this->tree[$this->level] = "";
             $this->level--;
             $this->content = "";
+
         }
 
         //This is the endTag default handler we use when todo is undefined
@@ -3844,6 +4329,9 @@
         } else if ($todo == "METACOURSE") {
             //Define handlers to that zone
             xml_set_element_handler($xml_parser, "startElementMetacourse", "endElementMetacourse");
+        } else if ($todo == "GRADEBOOK") {
+            //Define handlers to that zone
+            xml_set_element_handler($xml_parser, "startElementGradebook", "endElementGradebook");
         } else if ($todo == "USERS") {
             //Define handlers to that zone
             xml_set_element_handler($xml_parser, "startElementUsers", "endElementUsers");

backup/version.php

@@ -5,6 +5,6 @@
 // database (backup_version) to determine whether upgrades should
 // be performed (see db/backup_*.php)
 
-$backup_version = 2005041100;   // The current version is a date (YYYYMMDDXX)
+$backup_version = 2005060300;   // The current version is a date (YYYYMMDDXX)
 
-$backup_release = "1.5 development";  // User-friendly version number
+$backup_release = "1.5";  // User-friendly version number

blocks/HOWTO.html

@@ -42,20 +42,9 @@
         font-size: 1.6em;
         margin: 10px;
     }
-    .header #doc_author {
+    .header #doc_author, .header #doc_version, .header #doc_translator {
         text-align: right;
     }
-    .header #doc_author:before {
-        content: "Author: ";
-        font-weight: bold;
-    }
-    .header #doc_version {
-        text-align: right;
-    }
-    .header #doc_version:before {
-        content: "Version: ";
-        font-weight: bold;
-    }
     .code {
         border-top: 1px #FFC85F solid;
         border-left: 1px #FFC85F solid;
@@ -121,8 +110,8 @@
 <div class="header">
     <h1>MOODLE DEVELOPER DOCUMENTATION</h1>
     <div id="doc_subject">BLOCKS</div>
-    <div id="doc_author">Jon Papaioannou (pj@uom.gr)</div>
-    <div id="doc_version">$Id$</div>
+    <div id="doc_author"><strong>Author:</strong> Jon Papaioannou (pj@uom.gr)</div>
+    <div id="doc_version"><strong>Version:</strong> $Id$</div>
 </div>
 
 <h2>A Step-by-step Guide To Creating Blocks</h2>
@@ -157,19 +146,16 @@
     <pre class="code">class block_simplehtml extends block_base {
     function init() {
         $this->title = get_string('simplehtml', 'block_simplehtml');
-        $this->content_type = BLOCK_TYPE_TEXT;
         $this->version = 2004111200;
     }
 }</pre>
 
     <p>The first line is our block class definition; it must be named exactly in the manner shown. Again, only the "simplehtml" part can (and indeed must) change; everything else is standardized.</p>
 
-    <p>Our class is then given a small method: <a class="function_title" href="#method_init">init</a>. This is essential for all blocks, and its function is to set the three class member variables listed inside it. But what do these values actually mean? Here's a more detailed description.</p>
+    <p>Our class is then given a small method: <a class="function_title" href="#method_init">init</a>. This is essential for all blocks, and its purpose is to set the two class member variables listed inside it. But what do these values actually mean? Here's a more detailed description.</p>
 
     <p><a class="variable_title" href="#variable_title">$this->title</a> is the title displayed in the header of our block. We can set it to whatever we like; in this case it's set to read the actual title from a language file we are presumably distributing together with the block. I 'll skip ahead a bit here and say that if you want your block to display <strong>no</strong> title at all, then you should set this to any descriptive value you want (but <strong>not</strong> make it an empty string). We will later see <a href="#section_eye_candy">how to disable the title's display</a>.</p>
 
-    <p><a class="variable_title" href="#variable_content_type">$this->content_type</a> tells Moodle what kind of content to expect from this block. Here we have two simple choices. Either we set it to <a class="named_constant" href="#constant_block_type_text">BLOCK_TYPE_TEXT</a>, which tells Moodle to just take our content and display it on screen as-is; or we set it to <a class="named_constant" href="#constant_block_type_list">BLOCK_TYPE_LIST</a>, which tells Moodle that we want our block to display a nicely formatted list of items with optional icons next to each one. We can use <a class="named_constant" href="#constant_block_type_text">BLOCK_TYPE_TEXT</a> to manually create any content we want (do not be fooled by the name; HTML is allowed in the block's content without restriction) or use <a class="named_constant" href="#constant_block_type_list">BLOCK_TYPE_LIST</a> to easily create a simple menu.</p>
-
     <p><a class="variable_title" href="#variable_version">$this->version</a> is the version of our block. This actually would only make a difference if your block wanted to keep its own data in special tables in the database (i.e. for very complex blocks). In that case the version number is used exactly as it's used in activities; an upgrade script uses it to incrementally upgrade an "old" version of the block's data to the latest. We will outline this process further ahead, since blocks tend to be relatively simple and not hold their own private data. In our example, this is certainly the case so we just set <a class="variable_title" href="#variable_version">$this->version</a> to <strong>YYYYMMDD00</strong> and forget about it.</p>
 
     <p class="updating"><strong>UPDATING:</strong> Prior to version 1.5, the basic structure of each block class was slightly different. Refer to <a href="#appendix_b">Appendix B</a> for more information on the changes that old blocks have to make to conform to the new standard.</p>
@@ -279,7 +265,7 @@ $this->content->footer = '';</pre>
 
     <p>Implementing instance configuration for the block's contents was good enough to whet our apetite, but who wants to stop there? Why not customize the block's title, too?</p>
 
-    <p>Why not, indeed. Well, our first attempt is natural enough: let's add another field to <span class="filename">/blocks/simplehtml/config_instance.html</span>. Here goes:</p>
+    <p>Why not, indeed. Well, our first attempt to achieve this is natural enough: let's add another field to <span class="filename">/blocks/simplehtml/config_instance.html</span>. Here goes:</p>
 
     <pre class="code">
 &lt;tr valign="top"&gt;
@@ -311,17 +297,9 @@ function specialization() {
 
     <p>Now would be a good time to mention another nifty technique that can be used in blocks, and which comes in handy quite often. Specifically, it may be the case that our block will have something interesting to display some of the time; but in some other cases, it won't have anything useful to say. (An example here would be the "Recent Activity" block, in the case where no recent activity in fact exists. However in that case the block chooses to explicitly inform you of the lack of said activity, which is arguably useful). It would be nice, then, to be able to have our block "disappear" if it's not needed to display it.</p>
 
-    <p>This is indeed possible, and the way to do it is to make sure that after the <a class="function_title" href="#method_get_content">get_content</a> method is called, the block is completely void of content. Specifically:</p>
+    <p>This is indeed possible, and the way to do it is to make sure that after the <a class="function_title" href="#method_get_content">get_content</a> method is called, the block is completely void of content. Specifically, "void of content" means that both $this->content->text and $this->content->footer are each equal to the empty string (''). Moodle performs this check by calling the block's <a class="function_title" href="#method_is_empty">is_empty()</a> method, and if the block is indeed empty then it is not displayed at all.</p>
 
-    <ul>
-
-    <li>If <a class="variable_title" href="#variable_content_type">$this->content_type</a> equals <a class="named_constant" href="#constant_block_type_text">BLOCK_TYPE_TEXT</a>, then "void of content" means that both $this->content->text and $this->content->footer are each equal to the empty string ('').</li>
-
-    <li>If <a class="variable_title" href="#variable_content_type">$this->content_type</a> equals <a class="named_constant" href="#constant_block_type_list">BLOCK_TYPE_LIST</a>, then "void of content" means that $this->content->items is an empty array and $this->content->footer is equal to the empty string ('').</li>
-    
-    </ul>
-
-    <p>Refer to <a href="#ready_set_go">Part 3</a> which explains the <a class="function_title" href="#method_init">init</a> function for more information on <a class="variable_title" href="#variable_content_type">$this->content_type</a> and its significance. Note that the exact value of the block's title and the presence or absence of a <a class="function_title" href="#method_hide_header">hide_header</a> method do <em>not</em> affect this behavior. A block is considered empty if it has no content, irrespective of anything else.</p>
+    <p>Note that the exact value of the block's title and the presence or absence of a <a class="function_title" href="#method_hide_header">hide_header</a> method do <em>not</em> affect this behavior. A block is considered empty if it has no content, irrespective of anything else.</p>
 
 </li>
 
@@ -554,13 +532,21 @@ function applicable_formats() {
 
     <h3>Lists and Icons</h3>
 
-    <p>In this final part of the guide, we will briefly discuss what the differences between blocks of <a class="named_constant" href="#constant_block_type_text">BLOCK_TYPE_TEXT</a> and those of <a class="named_constant" href="#constant_block_type_list">BLOCK_TYPE_LIST</a> are. The vast majority of the techniques and options discussed before apply to any block; the only difference is in the handling of the <a class="variable_title" href="#variable_content">$this->content</a> variable.</p>
+    <p>In this final part of the guide we will briefly discuss an additional capability of Moodle's block system, namely the ability to very easily create blocks that display a list of choices to the user. This list is displayed with one item per line, and an optional image (icon) next to the item. An example of such a <em>list block</em> is the standard Moodle "admin" block, which illustrates all the points discussed in this section.</p>
+    
+    <p>As we have seen so far, blocks of use two properties of <a class="variable_title" href="#variable_content">$this->content</a>: "text" and "footer". The text is displayed as-is as the block content, and the footer is displayed below the content in a smaller font size. List blocks use $this->content->footer in the exact same way, but they ignore $this->content->text.</p>
 
-    <p>As we have seen, blocks of <a class="named_constant" href="#constant_block_type_text">BLOCK_TYPE_TEXT</a> use two properties of <a class="variable_title" href="#variable_content">$this->content</a>: "text" and "footer". The text is displayed as-is as the block content, and the footer goes below in smaller font size. Blocks of <a class="named_constant" href="#constant_block_type_list">BLOCK_TYPE_LIST</a> use $this->content->footer in the exact same way, but they ignore $this->content->text.</p>
+    <p>Instead, Moodle expects such blocks to set two other properties when the <a class="function_title" href="#method_get_content">get_content</a> method is called: $this->content->items and $this->content->icons. $this->content->items should be a numerically indexed array containing elements that represent the HTML for each item in the list that is going to be displayed. Usually these items will be HTML anchor tags which provide links to some page. $this->content->icons should also be a numerically indexed array, with exactly as many items as $this->content->items has. Each of these items should be a fully qualified HTML &lt;img&gt; tag, with "src", "height", "width" and "alt" attributes. Obviously, it makes sense to keep the images small and of a uniform size.</p>
 
-    <p>Instead, Moodle expects such blocks to set two other properties when the <a class="function_title" href="#method_get_content">get_content</a> method is called. $this->content->items should be a numerically indexed array containing elements that represent the HTML for each item in the list that is going to be displayed. Usually these items will be links, so being free to write HTML allows us to provide anchor tags as list items. $this->content->icons should also be a numerically indexed array, with exactly as many items as $this->content->items has. Each of these items should be a fully qualified HTML &lt;img&gt; tag, with "src", "height", "width" and "alt" attributes. Obviously, it makes sense to keep the images small and of a uniform size.</p>
+    <p>In order to tell Moodle that we want to have a list block instead of the standard text block, we need to make a small change to our block class declaration. Instead of extending class <strong>block_base</strong>, our block will extend class <strong>block_list</strong>. For example:</p>
 
-    <p>Thus, if we were to create a list block, our <a class="function_title" href="#method_get_content">get_content</a> method might read:</p>
+    <pre class="code">
+class block_my_menu extends block_list {
+    // The init() method does not need to change at all
+}
+</pre>
+
+    <p>In addition to making this change, we must of course also modify the <a class="function_title" href="#method_get_content">get_content</a> method to construct the <a class="variable_title" href="#variable_content">$this->content</a> variable as discussed above:</p>    
 
     <pre class="code">
 function get_content() {
@@ -581,7 +567,7 @@ function get_content() {
     return $this->content;
 }</pre>
 
-    <p>The end result when such a block is printed will be a list of items with the corresponding icons before each one, and an optional footer below. For a real world block of this type, there is no better example than the "admin" block which illustrates all of the above.</p>
+    <p>To summarize, if we want to create a list block instead of a text block, we just need to change the block class declaration and the <a class="function_title" href="#method_get_content">get_content</a> method. Adding the mandatory <a class="function_title" href="#method_init">init</a> method as discussed earlier will then give us our first list block in no time!</p>
 
 </li>
 
@@ -687,9 +673,9 @@ function get_content() {
 
     <p>This method should, when called, populate the <a class="variable_title" href="#variable_content">$this->content</a> variable of your block. Populating the variable means:
 
-    <p><strong>EITHER</strong><br />defining $this->content->text and $this->content->footer if your block is of type <a class="named_constant" href="#constant_block_type_text">BLOCK_TYPE_TEXT</a>. Both of these should be strings, and can contain arbitrary HTML.</p>
+    <p><strong>EITHER</strong><br />defining $this->content->text and $this->content->footer if your block derives from <strong>block_base</strong>. Both of these should be strings, and can contain arbitrary HTML.</p>
 
-    <p><strong>OR</strong><br />defining $this->content->items, $this->content->icons and $this->content->footer if your block is of type <a class="named_constant" href="#constant_block_type_list">BLOCK_TYPE_LIST</a>. The first two should be numerically indexed arrays having the exact same number of elements. $this->content->items is an array of strings that can contain arbitrary HTML while $this->content->icons also contains should strings, but those must be fully-qualified HTML &lt;img&gt; tags <strong>and nothing else</strong>. $this->content->footer is a string, as above.</p>
+    <p><strong>OR</strong><br />defining $this->content->items, $this->content->icons and $this->content->footer if your block derives from <strong>block_list</strong>. The first two should be numerically indexed arrays having the exact same number of elements. $this->content->items is an array of strings that can contain arbitrary HTML while $this->content->icons also contains should strings, but those must be fully-qualified HTML &lt;img&gt; tags <strong>and nothing else</strong>. $this->content->footer is a string, as above.</p>
 
     <p>If you set <em>all</em> of these variables to their default "empty" values (empty arrays for the arrays and empty strings for the strings), the block will <strong>not</strong> be displayed at all except to editing users. This is a good way of having your block hide itself to unclutter the screen if there is no reason to have it displayed.</p>
 
@@ -758,11 +744,10 @@ function html_attributes() {
     <pre class="code">
 function init() {
     $this->title = get_string('simplehtml', 'block_simplehtml');
-    $this->content_type = BLOCK_TYPE_TEXT;
     $this->version = 2004111200;
 }</pre>
 
-    <p>This method must be implemented for all blocks. It has to assign meaningful values to the object variables <a class="variable_title" href="#variable_title">$this->title</a>, <a class="variable_title" href="#variable_content_type">$this->content_type</a> (which must be either <a class="named_constant" href="#constant_block_type_text">BLOCK_TYPE_TEXT</a> or <a class="named_constant" href="#constant_block_type_list">BLOCK_TYPE_LIST</a>) and <a class="variable_title" href="#variable_version">$this->version</a> (which is used by Moodle for performing automatic updates when available).</p>
+    <p>This method must be implemented for all blocks. It has to assign meaningful values to the object variables <a class="variable_title" href="#variable_title">$this->title</a> and <a class="variable_title" href="#variable_version">$this->version</a> (which is used by Moodle for performing automatic updates when available).</p>
 
     <p>No return value is expected from this method.</p>
 
@@ -948,6 +933,27 @@ function get_version() {
     <p>This method returns the value of <a class="variable_title" href="#variable_version">$this->version</a>, and is the preferred way of accessing that variable. It is guaranteed to always work, now and forever. Directly accessing the variable is <strong>not recommended</strong>; future library changes may break compatibility with code that does so.</p>
 
 </li>
+
+<li id="method_is_empty">
+    <div class="function_title">is_empty</div>
+    <p>For blocks that extend class <strong>block_base</strong>:</p>
+    <pre class="code">
+function is_empty() {
+    $this->get_content();
+    return(empty($this->content->text) && empty($this->content->footer));
+}</pre>
+    <p>For blocks that extend class <strong>block_list</strong>:</p>
+    <pre class="code">
+function is_empty() {
+    $this->get_content();
+    return (empty($this->content->items) && empty($this->content->footer));
+}
+</pre>
+
+    <p>This method returns the a boolean true/false value, depending on whether the block has any content at all to display. Blocks without content are not displayed by the framework.</p>
+
+</li>
+
 <li id="method_name">
     <div class="function_title">name</div>
     <pre class="code">
@@ -1016,7 +1022,7 @@ function name() {
 
     <div class="variable_title">$this->content_type</div>
 
-    <p>This variable instructs Moodle on what type of content it should assume the block has. It is essential that it has a meaningful value, as Moodle depends on this for correctly displaying the block on screen. Consequently, this variable is closely tied with the varaible <a class="variable_title" href="#variable_content">$this->content</a>. The variable is expected to have a valid value after the framework calls the <a class="function_title" href="#method_init">init</a> method for each block.</p>
+    <p>This variable instructs Moodle on what type of content it should assume the block has, and is used to differentiate text blocks from list blocks. It is essential that it has a meaningful value, as Moodle depends on this for correctly displaying the block on screen. Consequently, this variable is closely tied with the variable <a class="variable_title" href="#variable_content">$this->content</a>. The variable is expected to have a valid value after the framework calls the <a class="function_title" href="#method_init">init</a> method for each block.</p>
 
     <p>The only valid values for this variable are the two named constants <a class="named_constant" href="#constant_block_type_text">BLOCK_TYPE_TEXT</a> and <a class="named_constant" href="#constant_block_type_list">BLOCK_TYPE_LIST</a>.</p>
   </li>
@@ -1132,6 +1138,12 @@ class CourseBlock_online_users extends MoodleBlock { ... }
 
     <pre class="code">
 class block_online_users extends block_base { ... }
+</pre>
+
+    <p>An exception to the above is the special case where the block is intended to display a list of items instead of arbitrary text; in this case the block class must derive from class <strong>block_list</strong> instead, like this:<p>
+    
+    <pre class="code">
+class block_admin extends block_list { ... }
 </pre>
 
 </li>
@@ -1156,7 +1168,6 @@ class block_online_users extends block_base { ... }
     <pre class="code">
     function init() {
         $this->title = get_string('blockname','block_online_users');
-        $this->content_type = BLOCK_TYPE_TEXT;
         $this->version = 2004111600;
     }
 </pre>

blocks/admin/block_admin.php

@@ -33,16 +33,16 @@ class block_admin extends block_list {
         global $CFG, $USER;
 
         if (isadmin()) {
-            $this->content->items[] = '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/configure.php">'.get_string('configuration').'</a>...';
+            $this->content->items[] = '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/configure.php">'.get_string('configuration').'</a>';
             $this->content->icons[] = '<img src="'.$CFG->pixpath.'/i/admin.gif" height="16" width="16" alt="" />';
 
-            $this->content->items[] = '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/users.php">'.get_string('users').'</a>...';
+            $this->content->items[] = '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/users.php">'.get_string('users').'</a>';
             $this->content->icons[] = '<img src="'.$CFG->pixpath.'/i/users.gif" height="16" width="16" alt="" />';
 
-            $this->content->items[]='<a href="'.$CFG->wwwroot.'/backup/backup.php?id='.SITEID.'">'.get_string('backup').'...</a>';
+            $this->content->items[]='<a href="'.$CFG->wwwroot.'/backup/backup.php?id='.SITEID.'">'.get_string('backup').'</a>';
             $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/backup.gif" height="16" width="16" alt="" />';
 
-            $this->content->items[]='<a href="'.$CFG->wwwroot.'/files/index.php?id='.SITEID.'&amp;wdir=/backupdata">'.get_string('restore').'...</a>';
+            $this->content->items[]='<a href="'.$CFG->wwwroot.'/files/index.php?id='.SITEID.'&amp;wdir=/backupdata">'.get_string('restore').'</a>';
             $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/restore.gif" height="16" width="16" alt="" />';
         }
 
@@ -62,7 +62,7 @@ class block_admin extends block_list {
                 $this->content->items[] = '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/'.$CFG->dbtype.'/frame.php">'.get_string('managedatabase').'</a>';
                 $this->content->icons[] = '<img src="'.$CFG->pixpath.'/i/db.gif" height="16" width="16" alt="" />';
             }
-            $this->content->footer = '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/">'.get_string('admin').'</a>...';
+            $this->content->footer = '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/">'.get_string('admin').'...</a>';
         }
     }
 
@@ -77,6 +77,8 @@ class block_admin extends block_list {
 
         $course = get_record('course', 'id', $this->instance->pageid);
 
+
+
         if (isteacher($this->instance->pageid)) {
 
             $isteacheredit = isteacheredit($this->instance->pageid);
@@ -89,14 +91,25 @@ class block_admin extends block_list {
                     $this->content->items[]='<a href="view.php?id='.$this->instance->pageid.'&amp;edit=on">'.get_string('turneditingon').'</a>';
                 }
                 
-                $this->content->items[]='<a href="edit.php?id='.$this->instance->pageid.'">'.get_string('settings').'...</a>';
+                $this->content->items[]='<a href="edit.php?id='.$this->instance->pageid.'">'.get_string('settings').'</a>';
                 $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/settings.gif" height="16" width="16" alt="" />';
 
+
+            $fullname = fullname($USER, true);
+            $editmyprofile = '<a title="'.$fullname.'" href="'.$CFG->wwwroot.'/user/edit.php?id='.$USER->id.'&amp;course='.$this->instance->pageid.'">'.get_string('editmyprofile').'</a>';
+            if (empty($USER->description)) {
+                $this->content->items[]= $editmyprofile." <blink>*</blink>";
+            } else {
+                $this->content->items[]= $editmyprofile;
+            }
+            $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" height="16" width="16" alt="" />';
+
+
                 if (iscreator() || !empty($CFG->teacherassignteachers)) {
                     if (!$course->teachers) {
                         $course->teachers = get_string('defaultcourseteachers');
                     }
-                    $this->content->items[]='<a href="teacher.php?id='.$this->instance->pageid.'">'.$course->teachers.'...</a>';
+                    $this->content->items[]='<a href="teacher.php?id='.$this->instance->pageid.'">'.$course->teachers.'</a>';
                     $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/users.gif" height="16" width="16" alt="" />';
                 }
 
@@ -104,38 +117,43 @@ class block_admin extends block_list {
                     $course->students = get_string('defaultcoursestudents');
                 } 
                 if (!$course->metacourse) {
-                    $this->content->items[]='<a href="student.php?id='.$this->instance->pageid.'">'.$course->students.'...</a>';
+                    $this->content->items[]='<a href="student.php?id='.$this->instance->pageid.'">'.$course->students.'</a>';
                     $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/users.gif" height="16" width="16" alt="" />';
-                }
-                else {
-                    $this->content->items[]='<a href="importstudents.php?id='.$this->instance->pageid.'">'.$course->students.'...</a>';
+                } else {
+                    $this->content->items[]='<a href="importstudents.php?id='.$this->instance->pageid.'">'.$course->students.'</a>';
                     $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/users.gif" height="16" width="16" alt="">';
                 }
-                $this->content->items[]='<a href="'.$CFG->wwwroot.'/backup/backup.php?id='.$this->instance->pageid.'">'.get_string('backup').'...</a>';
+                if ($course->groupmode || !$course->groupmodeforce) {
+                    $strgroups = get_string('groups');
+                    $this->content->items[]='<a title="'.$strgroups.'" href="'.$CFG->wwwroot.'/course/groups.php?id='.$this->instance->pageid.'">'.$strgroups.'</a>';
+                    $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/group.gif" height="16" width="16" alt="" />';
+                }
+
+                $this->content->items[]='<a href="'.$CFG->wwwroot.'/backup/backup.php?id='.$this->instance->pageid.'">'.get_string('backup').'</a>';
                 $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/backup.gif" height="16" width="16" alt="" />';
 
-                $this->content->items[]='<a href="'.$CFG->wwwroot.'/files/index.php?id='.$this->instance->pageid.'&amp;wdir=/backupdata">'.get_string('restore').'...</a>';
+                $this->content->items[]='<a href="'.$CFG->wwwroot.'/files/index.php?id='.$this->instance->pageid.'&amp;wdir=/backupdata">'.get_string('restore').'</a>';
                 $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/restore.gif" height="16" width="16" alt="" />';
 
                 $this->content->items[]='<a href="'.$CFG->wwwroot.'/course/import.php?id='.$this->instance->pageid.'">'.get_string('importdata').'</a>';
                 $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/restore.gif" height="16" width="16" alt="" />';
 
-                $this->content->items[]='<a href="scales.php?id='.$this->instance->pageid.'">'.get_string('scales').'...</a>';
+                $this->content->items[]='<a href="scales.php?id='.$this->instance->pageid.'">'.get_string('scales').'</a>';
                 $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/scales.gif" height="16" width="16" alt="" />';
             }
 
-            $this->content->items[]='<a href="'.$CFG->wwwroot.'/grade/index.php?id='.$this->instance->pageid.'">'.get_string('grades').'...</a>';
+            $this->content->items[]='<a href="'.$CFG->wwwroot.'/grade/index.php?id='.$this->instance->pageid.'">'.get_string('grades').'</a>';
             $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/grades.gif" height="16" width="16" alt="" />';
 
-            $this->content->items[]='<a href="log.php?id='.$this->instance->pageid.'">'.get_string('logs').'...</a>';
+            $this->content->items[]='<a href="log.php?id='.$this->instance->pageid.'">'.get_string('logs').'</a>';
             $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/log.gif" height="16" width="16" alt="" />';
 
             if ($isteacheredit) {
-                $this->content->items[]='<a href="'.$CFG->wwwroot.'/files/index.php?id='.$this->instance->pageid.'">'.get_string('files').'...</a>';
+                $this->content->items[]='<a href="'.$CFG->wwwroot.'/files/index.php?id='.$this->instance->pageid.'">'.get_string('files').'</a>';
                 $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/files.gif" height="16" width="16" alt="" />';
             }
 
-            $this->content->items[]='<a href="'.$CFG->wwwroot.'/doc/view.php?id='.$this->instance->pageid.'&amp;file=teacher.html">'.get_string('help').'...</a>';
+            $this->content->items[]='<a href="'.$CFG->wwwroot.'/doc/view.php?id='.$this->instance->pageid.'&amp;file=teacher.html">'.get_string('help').'</a>';
             $this->content->icons[]='<img src="'.$CFG->modpixpath.'/resource/icon.gif" height="16" width="16" alt="" />';
 
             if ($teacherforum = forum_get_course_forum($this->instance->pageid, 'teacher')) {
@@ -146,22 +164,33 @@ class block_admin extends block_list {
         } else if (!isguest()) {  // Students menu
 
             if ($course->showgrades) {
-                $this->content->items[]='<a href="'.$CFG->wwwroot.'/grade/index.php?id='.$this->instance->pageid.'">'.get_string('grades').'...</a>';
+                $this->content->items[]='<a href="'.$CFG->wwwroot.'/grade/index.php?id='.$this->instance->pageid.'">'.get_string('grades').'</a>';
                 $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/grades.gif" height="16" width="16" alt="" />';
             }
             if ($course->showreports) {
-                $this->content->items[]='<a href="user.php?id='.$this->instance->pageid.'&amp;user='.$USER->id.'">'.get_string('activityreport').'...</a>';
+                $this->content->items[]='<a href="user.php?id='.$this->instance->pageid.'&amp;user='.$USER->id.'">'.get_string('activityreport').'</a>';
                 $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/report.gif" height="16" width="16" alt="" />';
             }
+
+            $fullname = fullname($USER, true);
+            $editmyprofile = '<a title="'.$fullname.'" href="'.$CFG->wwwroot.'/user/edit.php?id='.
+                             $USER->id.'&amp;course='.$this->instance->pageid.'">'.get_string('editmyprofile').'</a>';
+            if (empty($USER->description)) {
+                $this->content->items[]= $editmyprofile." <blink>*</blink>";
+            } else {
+                $this->content->items[]= $editmyprofile;
+            }
+            $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" height="16" width="16" alt="" />';
+
             if (is_internal_auth()) {
-                $this->content->items[]='<a href="'.$CFG->wwwroot.'/login/change_password.php?id='.$this->instance->pageid.'">'.get_string('changepassword').'...</a>';
+                $this->content->items[]='<a href="'.$CFG->wwwroot.'/login/change_password.php?id='.$this->instance->pageid.'">'.get_string('changepassword').'</a>';
                 $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" height="16" width="16" alt="" />';
             } else if ($CFG->changepassword) {
-                $this->content->items[]='<a href="'.$CFG->changepassword.'">'.get_string('changepassword').'...</a>';
+                $this->content->items[]='<a href="'.$CFG->changepassword.'">'.get_string('changepassword').'</a>';
                 $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" height="16" width="16" alt="" />';
             }
             if ($CFG->allowunenroll) {
-                $this->content->items[]='<a href="unenrol.php?id='.$this->instance->pageid.'">'.get_string('unenrolme', '', $course->shortname).'...</a>';
+                $this->content->items[]='<a href="unenrol.php?id='.$this->instance->pageid.'">'.get_string('unenrolme', '', $course->shortname).'</a>';
                 $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" height="16" width="16" alt="" />';
             }
         }

blocks/calendar_upcoming/block_calendar_upcoming.php

@@ -63,7 +63,7 @@ class block_calendar_upcoming extends block_base {
         }
 
         if (empty($this->content->text)) {
-            $this->content->text = '<div style="font-size: 0.8em; text-align: center;">'.
+            $this->content->text = '<div class="post">'.
                                    get_string('noupcomingevents', 'calendar').'</div>';
         }
 

blocks/calendar_upcoming/styles.php

@@ -1,4 +1,3 @@
 .block_calendar_upcoming .event .date {
     text-align:right;
-    font-size:0.8em;
 }

blocks/course_list/block_course_list.php

@@ -77,9 +77,10 @@ class block_course_list extends block_list {
                 } else {
                     $this->content->items = array();
                     $this->content->icons = array();
-                    $this->content->footer = get_string('nocoursesyet').'<br /><br />'.
-                            '<a href="'.$CFG->wwwroot.'/course/edit.php?category='.$category->id.'">'.
-                            get_string("addnewcourse").'</a>...';
+                    $this->content->footer = get_string('nocoursesyet').'<br /><br />';
+                    if (iscreator()) {
+                        $this->content->footer .= '<a href="'.$CFG->wwwroot.'/course/edit.php?category='.$category->id.'">'.get_string("addnewcourse").'</a>...';
+                    }
                 }
                 $this->title = get_string('courses');
             }

blocks/db/mysql.php

@@ -130,6 +130,19 @@ global $CFG;
         execute_sql('UPDATE '.$CFG->prefix.'block_instance SET pagetype = \''.PAGE_COURSE_VIEW.'\' WHERE pagetype = \'\'');
     }
 
+    if ($oldversion < 2005043000 && $result) {
+        $records = get_records('block');
+        if(!empty($records)) {
+            foreach($records as $block) {
+                if(!block_is_compatible($block->name)) {
+                    $block->visible = 0;
+                    update_record('block', $block);
+                    notify('The '.$block->name.' block has been disabled because it is not compatible with Moodle 1.5 and needs to be updated by a programmer.');
+                }
+            }
+        }
+    }
+
     //Finally, return result
     return $result;
 }

blocks/db/postgres7.php

@@ -35,7 +35,7 @@ global $CFG;
   				                lastcron INT8  NOT NULL default '0',
   				                visible int NOT NULL default '1'
                                 )
-			                    ") ;
+        ") ;
 
     }
 
@@ -125,6 +125,19 @@ global $CFG;
         $result = $result && table_column('block_instance', 'position', 'position', 'varchar', '10', '');
     }
 
+    if ($oldversion < 2005043000 && $result) {
+        $records = get_records('block');
+        if(!empty($records)) {
+            foreach($records as $block) {
+                if(!block_is_compatible($block->name)) {
+                    $block->visible = 0;
+                    update_record('block', $block);
+                    notify('The '.$block->name.' block has been disabled because it is not compatible with Moodle 1.5 and needs to be updated by a programmer.');
+                }
+            }
+        }
+    }
+
     //Finally, return result
     return $result;
 }

blocks/glossary_random/block_glossary_random.php

@@ -69,16 +69,18 @@ class block_glossary_random extends block_base {
                     break;
             }
 
-            if ($entry = get_record_sql('  SELECT concept, definition, format '.
-                                        '    FROM '.$CFG->prefix.'glossary_entries'.
-                                        '   WHERE glossaryid = '.$this->config->glossary.
-                                        '     AND approved = 1 '.
-                                        'ORDER BY timemodified '.$SORT.' '.$LIMIT)) {
+            if ($entry = get_records_sql('  SELECT concept, definition, format '.
+                                         '    FROM '.$CFG->prefix.'glossary_entries'.
+                                         '   WHERE glossaryid = '.$this->config->glossary.
+                                         '     AND approved = 1 '.
+                                         'ORDER BY timemodified '.$SORT.' '.$LIMIT)) {
+
+                $entry = reset($entry);
 
                 if (empty($this->config->showconcept)) {
                     $text = '';
                 } else {
-                    $text = "<h2>$entry->concept</h2>";
+                    $text = "<h2>".format_string($entry->concept,true)."</h2>";
                 }  
                 $text .= format_text($entry->definition, $entry->format);
 
@@ -116,6 +118,10 @@ class block_glossary_random extends block_base {
 
         // select glossaries to put in dropdown box ...
         $glossaries = get_records_select_menu('glossary', 'course='.$this->course->id,'name','id,name');
+        //format menu texts to avoid html and to filter multilang values
+        foreach($glossaries as $key => $value) {
+            $glossaries[$key] = strip_tags(format_string($value,true));
+        }
 
         // and select quotetypes to put in dropdown box
         $type[0] = get_string('random','block_glossary_random');

blocks/glossary_random/config_instance.html

@@ -27,7 +27,7 @@
 <td><?php
      choose_from_menu($type, "type", $this->config->type, "");
      helpbutton("",get_string("type","block_glossary_random"),"moodle",true,false,get_string("typehelp","block_glossary_random"));
-		 ?></td>
+     ?></td>
 </tr> 
 
 <tr valign=top>	

blocks/html/block_html.php

@@ -24,10 +24,15 @@ class block_html extends block_base {
             return $this->content;
         }
 
+        $filteropt = new stdClass;
+        $filteropt->noclean = true;
+
         $this->content = new stdClass;
-        $this->content->text = isset($this->config->text) ? $this->config->text : '';
+        $this->content->text = isset($this->config->text) ? format_text($this->config->text, FORMAT_HTML, $filteropt) : '';
         $this->content->footer = '';
 
+        unset($filteropt); // memory footprint
+
         return $this->content;
     }
 }

blocks/login/block_login.php

@@ -27,49 +27,45 @@ class block_login extends block_base {
             $wwwroot = str_replace("http://", "https://", $CFG->wwwroot);
         }
 
-        switch ($CFG->auth) {
-            // I'm not sure if user can create an account
-            // him/her self when using ldap authentication.
-            // If true, then there should be a method for it.
-            case "email":
-                $signup = $wwwroot . '/login/signup.php';
-                break;
-            case "none":
-                // just for the user to see instructions!
-                $signup = $wwwroot . '/login/index.php';
-                break;
-            default:
-                $signup = '';
+        if (is_internal_auth()) {
+            $signup = $wwwroot . '/login/signup.php';
+            $forgot = $wwwroot . '/login/forgot_password.php';
+        } else {
+            if (!empty($CFG->changepassword)) {
+                $forgot = $CFG->changepassword;
+            } else {
+                $forgot = '';
+            }
+            $signup = $wwwroot . '/login/index.php';  // to see instructions!
         }
 
         $username = get_moodle_cookie() === 'nobody' ? '' : get_moodle_cookie();
 
-        if (empty($USER->loggedin)) {
-            $this->content->text  = "<form name=\"blocklogin\" method=\"post\"";
-            $this->content->text .= " action=\"". $wwwroot ."/login/index.php\">\n";
-            $this->content->text .= "<table border=\"0\" cellpadding=\"1\" cellspacing=\"1\"";
-            $this->content->text .= " width=\"100%\" style=\"font-size: small;\">\n";
-            $this->content->text .= "<tr>\n<td>". get_string("username") .":</td>\n</tr>\n";
-            $this->content->text .= "<tr>\n<td><input type=\"text\" name=\"username\" value=\"";
-            $this->content->text .=  $username . "\" /></td>\n</tr>\n";
-            $this->content->text .= "<tr>\n<td>". get_string("password") .":</td>\n</tr>\n";
-            $this->content->text .= "<tr>\n<td><input type=\"password\" name=\"password\" /></td>\n</tr>\n";
-            $this->content->text .= "<tr>\n<td align=\"center\"><input type=\"submit\" value=\"";
-            $this->content->text .= get_string("login");
-            $this->content->text .= "\" /></td>\n</tr>\n";
-            if (!empty($signup)) {
-                $this->content->text .= "<tr><td align=\"center\"><a href=\"". $signup ."\">";
-                $this->content->text .= get_string('startsignup');
-                $this->content->text .= "</a></td></tr>\n";
-            }
-            $this->content->text .= "</table>\n";
-            $this->content->text .= "</form>\n";
-        } else {
-            $this->content->text = ''; // It's time to dissapear!
-                                       // And keep the self test happy by
-                                       // passing empty string!
-        }
         $this->content->footer = '';
+        $this->content->text = '';
+
+        if (empty($USER->loggedin) or isguest()) {   // Show the block
+            $this->content->text .= '<form class="loginform" name="login" method="post" action="'.$wwwroot.'/login/index.php">';
+            $this->content->text .= '<table align="center" cellpadding="2" cellspacing="0" class="logintable">';
+
+            $this->content->text .= '<tr><td class="c0 r0" align="right">'.get_string('username').':</td>';
+            $this->content->text .= '<td class="c1 r0"><input type="text" name="username" size="10" value="'.$username.'" /></td></tr>';
+
+            $this->content->text .= '<tr><td class="c0 r1" align="right">'.get_string('password').':</td>';
+            $this->content->text .= '<td class="c1 r1"><input type="password" name="password" size="10" value="" /></td></tr>';
+
+            $this->content->text .= '<tr><td class="c0 r2">&nbsp;</td><td class="c1 r2" align="left"><input type="submit" value="'.get_string('login').'" /></td></tr>';
+
+            $this->content->text .= '</table></form>';
+
+            if (!empty($signup)) {
+                $this->content->footer .= '<div><a href="'.$signup.'">'.get_string('startsignup').'</a></div>';
+            }
+            if (!empty($forgot)) {
+                $this->content->footer .= '<div><a href="'.$forgot.'">'.get_string('forgotaccount').'</a></div>';
+            }
+        }
+
         return $this->content;
     }
 }

blocks/login/styles.php

@@ -0,0 +1,7 @@
+.block_login .logintable {
+  text-align:center;
+}
+
+.block_login .loginform {
+  display:inline;
+}

blocks/messages/block_messages.php

@@ -49,7 +49,7 @@ class block_messages extends block_base {
                 }
                 $timeago = format_time(time() - $user->lastaccess);
                 $this->content->text .= '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&amp;course='.$this->instance->pageid.'" title="'.$timeago.'">'.fullname($user).'</a>';
-                $this->content->text .= '&nbsp;<a target="message_'.$user->id.'" href="'.$CFG->wwwroot.'/message/user.php?id='.$user->id.'" onclick="return openpopup(\'/message/user.php?id='.$user->id.'\', \'message_'.$user->id.'\', \'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500\', 0);"><img height="11" width="11" src="'.$CFG->pixpath.'/t/message.gif" alt="" />&nbsp;'.$user->count.'</a>';
+                $this->content->text .= '&nbsp;<a target="message_'.$user->id.'" href="'.$CFG->wwwroot.'/message/discussion.php?id='.$user->id.'" onclick="return openpopup(\'/message/discussion.php?id='.$user->id.'\', \'message_'.$user->id.'\', \'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500\', 0);"><img height="11" width="11" src="'.$CFG->pixpath.'/t/message.gif" alt="" />&nbsp;'.$user->count.'</a>';
                 $this->content->text .= '</div>';
             }
         } else {

blocks/moodleblock.class.php

@@ -197,13 +197,6 @@ class block_base {
      * Display the block!
      */
     function _print_block() {
-        // Wrap the title in a floating DIV, in case we have edit controls to display
-        // These controls will always be wrapped on a right-floating DIV
-        $title = '<div class="title">'.$this->title.'</div>';
-        if ($this->edit_controls !== NULL) {
-            $title .= $this->edit_controls;
-        }
-
         // is_empty() includes a call to get_content()
         if ($this->is_empty()) {
             if (empty($this->edit_controls)) {
@@ -219,7 +212,7 @@ class block_base {
                 print_side_block(NULL, $this->content->text, NULL, NULL, $this->content->footer, $this->html_attributes());
             } else {
                 // The full treatment, please
-                print_side_block($title, $this->content->text, NULL, NULL, $this->content->footer, $this->html_attributes());
+                print_side_block($this->_title_html(), $this->content->text, NULL, NULL, $this->content->footer, $this->html_attributes());
             }
         }
     }
@@ -230,11 +223,28 @@ class block_base {
      * block is in place, even if empty.
      */
     function _print_shadow() {
-        $title = '<div class="title">'.$this->title.'</div>';
+        print_side_block($this->_title_html(), '&nbsp;', NULL, NULL, '', array('class' => 'hidden'));
+    }
+
+
+    function _title_html() {
+        global $CFG;
+
+        $title = '<div class="title">';
+        
+        if (!empty($CFG->allowuserblockhiding)) {
+            $title .= '<div class="hide-show"><a href="#" onclick="elementToggleHide(this, true, function(el) {return findParentNode(el, \'DIV\', \'sideblock\'); } ); return false;"><img src="'.$CFG->pixpath.'/spacer.gif" alt="" class="hide-show-image" /></a></div>';
+        }
+
+        $title .= $this->title;
+
         if ($this->edit_controls !== NULL) {
             $title .= $this->edit_controls;
         }
-        print_side_block($title, '&nbsp;', NULL, NULL, '');
+
+        $title .= '</div>';
+
+        return $title;
     }
 
     /**
@@ -552,13 +562,6 @@ class block_list extends block_base {
     }
 
     function _print_block() {
-        // Wrap the title in a floating DIV, in case we have edit controls to display
-        // These controls will always be wrapped on a right-floating DIV
-        $title = '<div class="title">'.$this->title.'</div>';
-        if ($this->edit_controls !== NULL) {
-            $title .= $this->edit_controls;
-        }
-
         // is_empty() includes a call to get_content()
         if ($this->is_empty()) {
             if (empty($this->edit_controls)) {
@@ -574,7 +577,7 @@ class block_list extends block_base {
                 print_side_block(NULL, '', $this->content->items, $this->content->icons, $this->content->footer, $this->html_attributes());
             } else {
                 // The full treatment, please
-                print_side_block($title, '', $this->content->items, $this->content->icons, $this->content->footer, $this->html_attributes());
+                print_side_block($this->_title_html(), '', $this->content->items, $this->content->icons, $this->content->footer, $this->html_attributes());
             }
         }
     }

blocks/news_items/block_news_items.php

@@ -7,7 +7,7 @@ class block_news_items extends block_base {
     }
 
     function get_content() {
-        global $CFG;
+        global $CFG, $USER;
 
         if ($this->content !== NULL) {
             return $this->content;
@@ -34,6 +34,7 @@ class block_news_items extends block_base {
                 return $this->content;
             }
 
+
         /// First work out whether we can post to this group and if so, include a link
 
             if (isteacheredit($course->id)) {     /// Teachers can always post
@@ -88,8 +89,8 @@ class block_news_items extends block_base {
 
                 $text .= '<div class="post">'.
                          '<div class="head">'.
-                         '<span class="date">'.userdate($discussion->modified, $strftimerecent).'</span><br />'.
-                         '<span class="name">'.fullname($discussion).'</span></div>'.
+                         '<div class="date">'.userdate($discussion->modified, $strftimerecent).'</div>'.
+                         '<div class="name">'.fullname($discussion).'</div></div>'.
                          '<div class="info">'.$discussion->subject.' '.
                          '<a href="'.$CFG->wwwroot.'/mod/forum/discuss.php?d='.$discussion->discussion.'">'.
                          $strmore.'...</a></div>'.
@@ -101,6 +102,23 @@ class block_news_items extends block_base {
             $this->content->footer = '<a href="'.$CFG->wwwroot.'/mod/forum/view.php?f='.$forum->id.'">'.
                                       get_string('oldertopics', 'forum').'</a> ...';
 
+        /// If RSS is activated at site and forum level and this forum has rss defined, show link
+            if (isset($CFG->enablerssfeeds) && isset($CFG->forum_enablerssfeeds) &&
+                $CFG->enablerssfeeds && $CFG->forum_enablerssfeeds && $forum->rsstype && $forum->rssarticles) {
+                require_once($CFG->dirroot.'/lib/rsslib.php');   // We'll need this
+                if ($forum->rsstype == 1) {
+                    $tooltiptext = get_string('rsssubscriberssdiscussions','forum',format_string($forum->name));
+                } else {
+                    $tooltiptext = get_string('rsssubscriberssposts','forum',format_string($forum->name));
+                }
+                if (empty($USER->id)) {
+                    $userid = 0;
+                } else {
+                    $userid = $USER->id;
+                }
+                $this->content->footer .= '<br />'.rss_get_link($course->id, $userid, 'forum', $forum->id, $tooltiptext);
+            }
+
         }
 
         return $this->content;

blocks/online_users/block_online_users.php

@@ -103,7 +103,7 @@ class block_online_users extends block_base {
         //Because they are online
         if (!empty($users)) {
             foreach ($users as $user) {
-                $this->content->text .= '<div style="text-align: left; font-size: 0.75em; padding-top: 5px;">';
+                $this->content->text .= '<div class="listentry">';
                 $timeago = format_time(time() - max($user->timeaccess, $user->lastaccess)); //bruno to calculate correctly on frontpage 
                 if ($user->picture) {
                     if ($CFG->slasharguments) {
@@ -117,7 +117,7 @@ class block_online_users extends block_base {
                 }
                 $this->content->text .= '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&amp;course='.$this->instance->pageid.'" title="'.$timeago.'">'.$user->fullname.'</a>';
                 if (!empty($USER->id) and ($USER->id != $user->id) and !empty($CFG->messaging) and !isguest()) {  // Only when logged in
-                    $this->content->text .= '&nbsp;<a target="message_'.$user->id.'" href="'.$CFG->wwwroot.'/message/user.php?id='.$user->id.'" onclick="return openpopup(\'/message/user.php?id='.$user->id.'\', \'message_'.$user->id.'\', \'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500\', 0);"><img height="11" width="11" src="'.$CFG->pixpath.'/t/message.gif" alt="" /></a>';
+                    $this->content->text .= '&nbsp;<a target="message_'.$user->id.'" href="'.$CFG->wwwroot.'/message/discussion.php?id='.$user->id.'" onclick="return openpopup(\'/message/discussion.php?id='.$user->id.'\', \'message_'.$user->id.'\', \'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500\', 0);"><img height="11" width="11" src="'.$CFG->pixpath.'/t/message.gif" alt="" /></a>';
                 }
                 $this->content->text .= '</div>';
             }

blocks/participants/block_participants.php

@@ -22,33 +22,18 @@ class block_participants extends block_list {
         $this->content->icons = array();
         $this->content->footer = '';
 
-        $strgroups   = get_string('groups');
-        $strgroupmy  = get_string('groupmy');
 
-        $course = get_record('course', 'id', $this->instance->pageid);
+        if ($this->instance->pageid != SITEID || 
+            $CFG->showsiteparticipantslist > 1 || 
+            ($CFG->showsiteparticipantslist == 1 && isteacherinanycourse()) || 
+            isteacher(SITEID)) {
+
+            $this->content->items[] = '<a title="'.get_string('listofallpeople').'" href="'.
+                                      $CFG->wwwroot.'/user/index.php?id='.$this->instance->pageid.'">'.get_string('participants').'</a>';
+            $this->content->icons[] = '<img src="'.$CFG->pixpath.'/i/users.gif" height="16" width="16" alt="" />';
 
-        if ($this->instance->pageid != SITEID || $CFG->showsiteparticipantslist > 1 || ($CFG->showsiteparticipantslist == 1 && isteacherinanycourse()) || isteacher(SITEID)) {
-            $this->content->items[]='<a title="'.get_string('listofallpeople').'" href="'.$CFG->wwwroot.'/user/index.php?id='.$this->instance->pageid.'">'.get_string('participants').'</a>';
-            $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/users.gif" height="16" width="16" alt="" />';
         }
 
-        if ($course->groupmode || !$course->groupmodeforce) {
-            if (isteacheredit($this->instance->pageid)) {
-                $this->content->items[]='<a title="'.$strgroups.'" href="'.$CFG->wwwroot.'/course/groups.php?id='.$this->instance->pageid.'">'.$strgroups.'</a>';
-                $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/group.gif" height="16" width="16" alt="" />';
-            }
-        }
-
-        if (!empty($USER->id) and !isguest()) {
-            $fullname = fullname($USER, true);
-            $editmyprofile = '<a title="'.$fullname.'" href="'.$CFG->wwwroot.'/user/edit.php?id='.$USER->id.'&amp;course='.$this->instance->pageid.'">'.get_string('editmyprofile').'</a>';
-            if ($USER->description) {
-                $this->content->items[]= $editmyprofile;
-            } else {
-                $this->content->items[]= $editmyprofile." <blink>*</blink>";
-            }
-            $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" height="16" width="16" alt="" />';
-        }
 
         return $this->content;
     }

blocks/quiz_results/block_quiz_results.php

@@ -298,7 +298,11 @@ class block_quiz_results extends block_base {
                         break;
                         default:
                         case GRADE_FORMAT_PCT:
-                            $this->content->text .= round((float)$grades[$gradeid]->grade / (float)$quiz->grade * 100).'%';
+                            if ($quiz->grade) {
+                                $this->content->text .= round((float)$grades[$gradeid]->grade / (float)$quiz->grade * 100).'%';
+                            } else {
+                                $this->content->text .= '--%';
+                            }
                         break;
                     }
                     $this->content->text .= '</td></tr>';

blocks/rss_client/block_rss_client.php

@@ -7,10 +7,14 @@ define('BLOCK_RSS_SECONDARY_CACHE_ENABLED', true);
 class block_rss_client extends block_base {
 
     function init() {
-        $this->title = get_string('block_rss_feeds_title', 'block_rss_client');
+        $this->title = get_string('feedstitle', 'block_rss_client');
         $this->version = 2004112000;
     }
 
+    function preferred_width() {
+        return 210;
+    }
+
     function specialization() {
         // After the block has been loaded we customize the block's title display
         if (!empty($this->config) && !empty($this->config->title)) {
@@ -18,7 +22,7 @@ class block_rss_client extends block_base {
             $this->title = $this->config->title;
         } else {
             // No customized block title, use localized remote news feed string
-            $this->title = get_string('block_rss_remote_news_feed', 'block_rss_client');
+            $this->title = get_string('remotenewsfeed', 'block_rss_client');
         }
     }
     
@@ -81,8 +85,18 @@ class block_rss_client extends block_base {
         if (isset($USER) && isset($USER->id) && $USER->id && !isguest()) {
             $userisloggedin = true;
         }
-        if ( $userisloggedin && (isadmin() ||  $submitters == SUBMITTERS_ALL_ACCOUNT_HOLDERS || ($submitters == SUBMITTERS_ADMIN_AND_TEACHER && $isteacher)) ) {
-            $output .= '<div align="center"><a href="'. $CFG->wwwroot .'/blocks/rss_client/block_rss_client_action.php?courseid='. $this->courseid .'">'. get_string('block_rss_feeds_add_edit', 'block_rss_client') .'</a></div><br />';
+        if ( $userisloggedin && ($submitters == SUBMITTERS_ALL_ACCOUNT_HOLDERS || ($submitters == SUBMITTERS_ADMIN_AND_TEACHER && $isteacher)) ) {
+
+            $page = page_create_object($this->instance->pagetype, $this->instance->pageid);
+            if (isset($this->config)) {
+                // this instance is configured - show Add/Edit feeds link
+                $script = $page->url_get_full(array('instanceid' => $this->instance->id, 'sesskey' => $USER->sesskey, 'blockaction' => 'config', 'currentaction' => 'managefeeds'));
+                $output .= '<div align="center"><a title="'. get_string('feedsaddedit', 'block_rss_client') .'" href="'. $script .'">'. get_string('feedsaddedit', 'block_rss_client') .'</a></div>';
+            } else {
+                // this instance has not been configured yet - show configure link
+                $script = $page->url_get_full(array('instanceid' => $this->instance->id, 'sesskey' => $USER->sesskey, 'blockaction' => 'config', 'currentaction' => 'configblock'));
+                $output .= '<div align="center"><a title="'. get_string('feedsconfigurenewinstance', 'block_rss_client') .'" href="'. $script.'">'. get_string('feedsconfigurenewinstance', 'block_rss_client') .'</a></div>';
+            }
         }
 
         // Daryl Hawes note: if count of rssidarray is greater than 1 
@@ -92,7 +106,7 @@ class block_rss_client extends block_base {
             $numids = count($rssidarray);
             $count = 0;
             foreach ($rssidarray as $rssid) {
-                $output =  $this->get_rss_by_id($rssid, $display_description, $shownumentries, ($numids > 1) ? true : false);
+                $output .=  $this->get_rss_by_id($rssid, $display_description, $shownumentries, ($numids > 1) ? true : false);
                 if ($numids > 1 && $count != $numids -1 && !empty($rssfeedstring)) {
                     $output .= '<hr width="80%" />';
                 }
@@ -129,6 +143,9 @@ class block_rss_client extends block_base {
         $now = time();
         require_once($CFG->libdir .'/rsslib.php');
         require_once(MAGPIE_DIR .'rss_fetch.inc');
+        if (!defined('MAGPIE_OUTPUT_ENCODING')) {
+            define('MAGPIE_OUTPUT_ENCODING', get_string('thischarset'));  // see bug 3107
+        }
         
         // Check if there is a cached string which has not timed out.
         if (BLOCK_RSS_SECONDARY_CACHE_ENABLED &&
@@ -163,7 +180,7 @@ class block_rss_client extends block_base {
             }
 
             if (empty($rss_record->preferredtitle)) {
-                $feedtitle =  stripslashes_safe(rss_unhtmlentities($rss->channel['title']));
+                $feedtitle = stripslashes_safe(rss_unhtmlentities($rss->channel['title']));
             } else {
                 $feedtitle = stripslashes_safe($rss_record->preferredtitle);
             }
@@ -172,11 +189,11 @@ class block_rss_client extends block_base {
                     isset($this->config->block_rss_client_show_channel_image) && 
                         $this->config->block_rss_client_show_channel_image &&
                             isset($rss->image) && isset($rss->image['link']) && isset($rss->image['title']) && isset($rss->image['url']) ) {
-                $returnstring .= '<div class="image"><a href="'. $rss->image['link'] .'"><img src="'. $rss->image['url'] .'" title="'. $rss->image['title'] .'" alt="'. $rss->image['title'] .'"/></a></div><br />';
+                $returnstring .= '<div class="image"><a href="'. $rss->image['link'] .'"><img src="'. $rss->image['url'] .'" title="'. $rss->image['title'] .'" alt="'. $rss->image['title'] .'"/></a></div>';
             }
 
             if ($showtitle) {
-                $returnstring .= '<div class="title">'. $feedtitle .'</div><br />';
+                $returnstring .= '<div class="title">'. $feedtitle .'</div>';
             } 
 
             $formatoptions->para = false;
@@ -187,6 +204,8 @@ class block_rss_client extends block_base {
                 if ($item['title'] == '') {
                     // no title present, use portion of description
                     $item['title'] = substr(strip_tags($item['description']), 0, 20) . '...';
+                } else {
+                    $item['title'] = break_up_long_words($item['title'], 30);
                 }
         
                 if ($item['link'] == '') {
@@ -195,10 +214,11 @@ class block_rss_client extends block_base {
 
                 $item['link'] = str_replace('&', '&amp;', $item['link']);
 
-                $returnstring .= '<div class="link"><a href="'. $item['link'] .'" target="_new">'. $item['title'] . '</a></div>' ."\n";
+                $returnstring .= '<div class="link"><a href="'. $item['link'] .'" target="_blank">'. $item['title'] . '</a></div>' ."\n";
 
                 
-                if ($display_description && !empty($item['description'])){
+                if ($display_description && !empty($item['description'])) {
+                    $item['description'] = break_up_long_words($item['description'], 30);
                     $returnstring .= '<div class="description">'.
                                      format_text($item['description'], FORMAT_MOODLE, $formatoptions, $this->courseid) . 
                                      '</div>' ."\n";
@@ -207,7 +227,7 @@ class block_rss_client extends block_base {
 
             if (!empty($rss->channel['link'])) {
                 if (!empty($this->config) && isset($this->config->block_rss_client_show_channel_link) && $this->config->block_rss_client_show_channel_link) {
-                    $returnstring .=  '<div class="channellink"><br /><a href="'. $rss->channel['link'] .'">'. get_string('block_rss_client_channel_link', 'block_rss_client') .'</a></div>';
+                    $this->content->footer =  '<a href="'. $rss->channel['link'] .'">'. get_string('clientchannellink', 'block_rss_client') .'</a>';
                 } 
                 if (!empty($feedtitle) ) {
                     $feedtitle = '<a href="'. $rss->channel['link'] .'">'. $feedtitle .'</a>';
@@ -215,8 +235,13 @@ class block_rss_client extends block_base {
             }
         }
 
-        if (!empty($feedtitle) and ($feedtitle != '<a href="'. $rss->channel['link'] .'"></a>')) {
-            $this->title = $feedtitle;
+        // if block has no custom title
+        if (empty($this->config) || (!empty($this->config) && empty($this->config->title))) {
+            // if the feed has a title
+            if (!empty($feedtitle) and ($feedtitle != '<a href="'. $rss->channel['link'] .'"></a>')) {
+                // set the block's title to the feed's title
+                $this->title = $feedtitle;
+            }
         }
         
         // store config setting for this rssid so we do not need to read from file each time

blocks/rss_client/block_rss_client_action.php

@@ -5,9 +5,10 @@
     require_once(MAGPIE_DIR .'rss_fetch.inc');
 
     require_login();
+    global $USER;
     
     //ensure that the logged in user is not using the guest account
-    if (isset($_SERVER['HTTP_REFERER'])){
+    if (isset($_SERVER['HTTP_REFERER'])) {
         $referrer = $_SERVER['HTTP_REFERER'];
     } else {
         $referrer = $CFG->wwwroot;
@@ -18,31 +19,35 @@
     
     optional_variable($act, 'none');
     optional_variable($rssid, 'none');
-    optional_variable($courseid, 'none');
+    optional_variable($courseid, '');
     optional_variable($url);
     optional_variable($preferredtitle, '');
     optional_variable($item);
+
+    if (!defined('MAGPIE_OUTPUT_ENCODING')) {
+        define('MAGPIE_OUTPUT_ENCODING', get_string('thischarset'));  // see bug 3107
+    }
     
-    $straddedit = get_string('block_rss_feeds_add_edit', 'block_rss_client');
+    $straddedit = get_string('feedsaddedit', 'block_rss_client');
     if ( isadmin() ) {
         $stradmin = get_string('administration');
         $strconfiguration = get_string('configuration');
         $navigation = "<a href=\"$CFG->wwwroot/$CFG->admin/index.php\">$stradmin</a> -> ".
         "<a href=\"$CFG->wwwroot/$CFG->admin/configure.php\">$strconfiguration</a> -> $straddedit";
-    } else if ($courseid != 'none' && $course = get_record('course', 'id', $courseid) ) {
-        $navigation = "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> -> $straddedit";
+    } else if (is_numeric($courseid) && $course = get_record('course', 'id', $courseid, '', '', '', '', 'shortname') ) {
+        $navigation = "<a href=\"$CFG->wwwroot/course/view.php?id=$courseid\">$course->shortname</a> -> $straddedit";
     } else {
         $navigation = $straddedit;
     }
     
-    print_header(get_string('block_rss_feeds_add_edit', 'block_rss_client'), 
-                 get_string('block_rss_feeds_add_edit', 'block_rss_client'), 
+    print_header(get_string('feedsaddedit', 'block_rss_client'), 
+                 get_string('feedsaddedit', 'block_rss_client'), 
                  $navigation );
 
     //check to make sure that the user is allowed to post new feeds
     $submitters = $CFG->block_rss_client_submitters;
     $isteacher = false;
-    if ($courseid != 'none'){
+    if (is_numeric($courseid)) {
         $isteacher = isteacher($courseid);
     }
     
@@ -83,11 +88,10 @@
             error('There was an error trying to update rss feed with id:'. $rssid);
         }
 
-//        rss_display_feeds($rssid);
-        rss_display_feeds();
-        print '<strong>'. get_string('block_rss_feed_updated', 'block_rss_client') .'</strong>';                
+        redirect($referrer, get_string('feedupdated', 'block_rss_client'));
+/*        rss_display_feeds();
         rss_get_form($act, $dataobject->url, $rssid, $dataobject->preferredtitle);
-
+*/
     } else if ($act == 'addfeed' ) {
 
         require_variable($url);            
@@ -98,7 +102,7 @@
         $dataobject->preferredtitle = addslashes($preferredtitle);
 
         $rssid = insert_record('block_rss_client', $dataobject);
-        if (!$rssid){
+        if (!$rssid) {
             error('There was an error trying to add a new rss feed:'. $url);
         }
 
@@ -111,7 +115,7 @@
         ob_end_clean();
         
         if ($rss === false) {
-            print 'There was an error loading this rss feed. You may want to verify the url you have specified before using it.'; //Daryl Hawes note: localize this line
+            $message = 'There was an error loading this rss feed. You may want to verify the url you have specified before using it.'; //Daryl Hawes note: localize this line
         } else {
 
             $dataobject->id = $rssid;
@@ -124,11 +128,13 @@
             if (!update_record('block_rss_client', $dataobject)) {
                 error('There was an error trying to update rss feed with id:'. $rssid);
             }
-            print '<strong>'. get_string('block_rss_feed_added', 'block_rss_client') .'</strong>';
+            $message = get_string('feedadded', 'block_rss_client');
         }
+        redirect($referrer, $message);
+/*
         rss_display_feeds();
         rss_get_form($act, $dataobject->url, $dataobject->id, $dataobject->preferredtitle);
-
+*/
     } else if ( $act == 'rss_edit') {
         
         $rss_record = get_record('block_rss_client', 'id', $rssid);
@@ -137,7 +143,7 @@
             $preferredtitle = stripslashes_safe($rss_record->title);
         }
         $url = stripslashes_safe($rss_record->url);
-        rss_display_feeds($rssid);
+        rss_display_feeds('', $rssid);
         rss_get_form($act, $url, $rssid, $preferredtitle);
 
     } else if ($act == 'delfeed') {
@@ -152,16 +158,17 @@
         $sql = 'DELETE FROM '. $CFG->prefix .'block_rss_client WHERE id='. $rssid;
         $res= $db->Execute($sql);
 
-        rss_display_feeds();
-        print '<strong>'. get_string('block_rss_feed_deleted', 'block_rss_client') .'</strong>';
-        rss_get_form($act, $url, $rssid, $preferredtitle);
+        redirect($referrer, get_string('feeddeleted', 'block_rss_client') );
 
+/*        rss_display_feeds();
+        rss_get_form($act, $url, $rssid, $preferredtitle);
+*/
     } else if ($act == 'view') {
         //              echo $sql; //debug
         //              print_object($res); //debug
         $rss_record = get_record('block_rss_client', 'id', $rssid);
-        if (!$rss_record->id){
-            print '<strong>'. get_string('block_rss_could_not_find_feed', 'block_rss_client') .': '. $rssid .'</strong>';
+        if (!$rss_record->id) {
+            print '<strong>'. get_string('couldnotfindfeed', 'block_rss_client') .': '. $rssid .'</strong>';
         } else {
             // By capturing the output from fetch_rss this way
             // error messages do not display and clutter up the moodle interface
@@ -190,14 +197,14 @@
                 }
 
                 print '<tr><td valign="middle">'."\n";
-                print '<a href="'. $rss->items[$y]['link'] .'" target=_new><strong>'. $rss->items[$y]['title'];
+                print '<a href="'. $rss->items[$y]['link'] .'" target="_blank"><strong>'. $rss->items[$y]['title'];
                 print '</strong></a>'."\n";
                 print '</td>'."\n";
                 if (file_exists($CFG->dirroot .'/blog/lib.php')) {
                     //Blog module is installed - provide "blog this" link
                     print '<td align="right">'."\n";
-                    print '<img src="'. $CFG->pixpath .'/blog/blog.gif" alt="'. get_string('blog_blog_this', 'blog').'" title="'. get_string('blog_blog_this', 'blog') .'" border="0" align="middle" />'."\n";
-                    print '<a href="'. $CFG->wwwroot .'/blog/blogthis.php?blogid='. $blogid .'&act=use&item='. $y .'&rssid='. $rssid .'"><small><strong>'. get_string('blog_blog_this', 'blog') .'</strong></small></a>'."\n";
+                    print '<img src="'. $CFG->pixpath .'/blog/blog.gif" alt="'. get_string('blogthis', 'blog').'" title="'. get_string('blogthis', 'blog') .'" border="0" align="middle" />'."\n";
+                    print '<a href="'. $CFG->wwwroot .'/blog/blogthis.php?blogid='. $blogid .'&act=use&item='. $y .'&rssid='. $rssid .'"><small><strong>'. get_string('blogthis', 'blog') .'</strong></small></a>'."\n";
                 } else {
                     print '<td>&nbsp;';
                 }
@@ -213,66 +220,4 @@
     }
 
     print_footer();
-
-/**
- * @param string $act .
- * @param string $url .
- * @param int $rssid .
- * @param bool $printnow True if the generated form should be printed out, false if the string should be returned from this function quietly
- */
-function rss_get_form($act, $url, $rssid, $preferredtitle, $printnow=true) {
-    global $USER, $CFG, $_SERVER, $blockid, $blockaction;
-    global $blogid; //hackish, but if there is a blogid it would be good to preserve it
-    $stredit = get_string('edit');
-    $stradd = get_string('add');
-    $strupdatefeed = get_string('block_rss_update_feed', 'block_rss_client');
-    $straddfeed = get_string('block_rss_add_feed', 'block_rss_client');
-    
-    $returnstring = '<table align="center"><tbody><tr><td>'."\n";
-    
-    $returnstring .= '<form action="'. $_SERVER['PHP_SELF'] .'" method="POST" name="block_rss">'."\n";
-    if ($act == 'rss_edit') {
-        $returnstring .= $strupdatefeed; 
-    } else { 
-        $returnstring .= $straddfeed; 
-    }
-    $returnstring .= "\n".'<br /><input type="text" size="60" maxlength="256" name="url" value="';
-    if ($act == 'rss_edit') { 
-        $returnstring .= $url; 
-    }
-    $returnstring .= '" />'."\n";
-    $returnstring .= '<br />'. get_string('block_rss_custom_title_label', 'block_rss_client');
-    $returnstring .= '<br /><input type="text" size="60" maxlength="64" name="preferredtitle" value="';
-    if ($act == 'rss_edit') { 
-        $returnstring .= $preferredtitle; 
-    }
-    $returnstring .= '" />'."\n";
-
-    $returnstring .= '<input type="hidden" name="act" value="';
-    if ($act == 'rss_edit') {
-        $returnstring .= 'updfeed';
-    } else {
-        $returnstring .= 'addfeed';
-    }
-    $returnstring .= '" />'."\n";
-    if ($act == 'rss_edit') { 
-        $returnstring .= '<input type="hidden" name="rssid" value="'. $rssid .'" />'. "\n"; 
-    }
-    $returnstring .= '<input type="hidden" name="blogid" value="'. $blogid .'" />'."\n";
-    $returnstring .= '<input type="hidden" name="user" value="'. $USER->id .'" />'."\n";
-    $returnstring .= '<br /><input type="submit" value="';
-    $validatestring = "<a href=\"#\" onClick=\"window.open('http://feedvalidator.org/check.cgi?url='+document.block_rss.elements['url'].value,'validate','width=640,height=480,scrollbars=yes,status=yes,resizable=yes');return true;\">". get_string('validate_feed', 'block_rss_client')."</a>";
-    if ($act == 'rss_edit') {
-        $returnstring .= $stredit;
-    } else {
-        $returnstring .= $stradd;
-    }
-    $returnstring .= '" />&nbsp;'. $validatestring .'</form>'."\n";
-    $returnstring .= '</td></tr></tbody></table>'."\n";
-
-    if ($printnow){
-        print $returnstring;
-    }
-    return $returnstring;
-}
-?>
+?>

blocks/rss_client/config_global.html

@@ -14,7 +14,7 @@
         } ?>" />
     </td>
     <td>
-        <?php print_string('block_rss_client_num_entries', 'block_rss_client') ?>
+        <?php print_string('clientnumentries', 'block_rss_client') ?>
     </td>
 </tr>
 <tr valign="top">
@@ -28,7 +28,7 @@
         } ?>" />
     </td>
     <td>
-        <?php print_string('block_rss_timeout', 'block_rss_client') ?>
+        <?php print_string('timeout', 'block_rss_client') ?>
     </td>
 </tr>
 <tr valign="top">
@@ -40,15 +40,19 @@
                        $selected = '0';
                        $CFG->block_rss_client_submitters = 0;
                 }
-                $options = array ( SUBMITTERS_ALL_ACCOUNT_HOLDERS => get_string('everybody'),
-                      SUBMITTERS_ADMIN_ONLY => get_string('administrators'),
+                // SUBMITTERS_ALL_ACCOUNT_HOLDERS => get_string('everybody')
+                // removed everybody option for 1.5 beta
+                // things are not quite working yet to allow this - revisit later
+                // also 'everybody' should be 'site members' or something clearer since
+                // it does not include guests
+                $options = array ( SUBMITTERS_ADMIN_ONLY => get_string('administrators'),
                       SUBMITTERS_ADMIN_AND_TEACHER => get_string('administratorsandteachers') );
 
                 choose_from_menu ($options, 'block_rss_client_submitters', $selected);
         ?>
     </td>
     <td>
-        <?php print_string('block_rss_submitters', 'block_rss_client') ?>
+        <?php print_string('submitters', 'block_rss_client') ?>
     </td>
 </tr>
 
@@ -59,6 +63,6 @@
 </tr>
 <tr>
     
-    <td colspan="3" align="center"><a href=" <?php echo $CFG->wwwroot; ?>/blocks/rss_client/block_rss_client_action.php?courseid=<?php echo $courseid; ?>"><?php print_string('block_rss_feeds_add_edit', 'block_rss_client')?></a></center><br /><br />
+    <td colspan="3" align="center"><a href=" <?php echo $CFG->wwwroot; ?>/blocks/rss_client/block_rss_client_action.php?courseid=<?php echo $courseid; ?>"><?php print_string('feedsaddedit', 'block_rss_client')?></a></center><br /><br />
     </td>
 </table>

blocks/rss_client/config_instance.html

@@ -1,9 +1,27 @@
-<table cellpadding="9" cellspacing="0">
+<?php 
+require_once($CFG->libdir .'/rsslib.php');
+
+//create a page object for url_get_full()
+$page = page_create_object($this->instance->pagetype, $this->instance->pageid);
+
+/// Print tabs at top
+global $currentaction;
+if (empty($currentaction) || $currentaction == 'configblock') {
+    $currentaction = 'configblock';
+} else {
+    $currentaction = 'managefeeds';
+}
+
+include('config_instance_tabs.php');
+
+if ($currentaction == 'configblock') {
+?>
+<table cellpadding="9" cellspacing="0" class="blockconfigtable">
 <tr valign="top">
-    <td align="right">
-        <?php print_string('block_rss_display_description_label', 'block_rss_client') ?>
+    <td align="right" width="50%">
+        <?php print_string('displaydescriptionlabel', 'block_rss_client') ?>
     </td>
-    <td>
+    <td width="50%">
             <?php 
                 if(! isset($CFG->block_rss_client_display_description) ) {
                     $CFG->block_rss_client_display_description = '0';
@@ -19,10 +37,10 @@
     </td>
 </tr>
 <tr valign="top">
-    <td align="right">
-        <?php print_string('block_rss_shownumentries_label', 'block_rss_client') ?>
+    <td align="right" width="50%">
+        <?php print_string('shownumentrieslabel', 'block_rss_client') ?>
     </td>
-    <td>
+    <td width="50%">
         <input name="shownumentries" type="text" size="5" value="<?php
             if(! isset($CFG->block_rss_client_num_entries) ) {
                 $CFG->block_rss_client_num_entries = '5';
@@ -37,10 +55,10 @@
     </td>
 </tr>
 <tr valign="top">
-    <td align="right">
-        <?php print_string('block_rss_choose_feed_label', 'block_rss_client') ?>
+    <td align="right" width="50%">
+        <?php print_string('choosefeedlabel', 'block_rss_client') ?>
     </td>
-    <td>
+    <td width="50%">
         <?php 
             $selectedarray = array();
             if (isset($this->config) && isset($this->config->rssid)) {
@@ -53,56 +71,42 @@
                 }
             }
             if ($rssfeeds = get_records('block_rss_client')) {
-                foreach($rssfeeds as $rssfeed){
+                foreach($rssfeeds as $rssfeed) {
                     if (!empty($rssfeed->preferredtitle)) {
                         $feedtitle = stripslashes_safe($rssfeed->preferredtitle);
                     } else {
                         $feedtitle = stripslashes_safe($rssfeed->title);
                     } 
-                    $feedoptions[$rssfeed->id] = $feedtitle;
-                }
-                $dropdownmenustring = choose_from_menu($feedoptions, 'rssid[]', '', '', '', '0', true);
-
-                //Daryl Hawes note:
-                // moodle's choose_from_menu() function does not support
-                // the "multiple" or "size" options, so before printing out the
-                // calculated drop down menu we insert the keyword "multiple"
-                $dropdownmenustring = preg_replace("|\"rssid\[\]\" >*|","\"rssid[]\" multiple>", $dropdownmenustring);
-
-                // since there may be multiple rssids to select
-                // we need to check for each
-                if (!empty($selectedarray)) {
-                    foreach ($selectedarray as $selected) {
-                        $selected = intval($selected);
-                        $dropdownmenustring = preg_replace("|\"$selected\">*|","\"$selected\" selected>", $dropdownmenustring);
+                    $checked = '';
+                    if (in_array($rssfeed->id, $selectedarray)) {
+                        $checked = 'checked';
                     }
+                    $checkbox =  '<input type="checkbox" name="rssid[]" id="rssid[]" value="'. $rssfeed->id .'" '. $checked .' />';
+                    print $checkbox . $feedtitle .'<br />'."\n";
                 }
-
-                print $dropdownmenustring;
-
             } else {
-                print_string('block_rss_no_feeds', 'block_rss_client');
-                if ( isadmin() ){
-                    print '&nbsp;<a href="'. $CFG->wwwroot .'/blocks/rss_client/block_rss_client_action.php"> '. get_string('block_rss_edit_news_feeds', 'block_rss_client') .'</a><br />';
+                print_string('nofeeds', 'block_rss_client');
+                if ( isadmin() ) {
+                    print '&nbsp;<a href="'. $CFG->wwwroot .'/blocks/rss_client/block_rss_client_action.php"> '. get_string('editnewsfeeds', 'block_rss_client') .'</a><br />';
                 }
             }
         ?>
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><?php print_string('uploadlabel'); ?></td>
+    <td align="right" width="50%"><?php print_string('uploadlabel'); ?></td>
     <?php 
         $title = '';
         if (!empty($this->config) && !empty($this->config->title)) {
             $title = $this->config->title;
         }
     ?>
-    <td><input type="text" name="title" size="30" value="<?php echo $title; ?>" />
+    <td width="50%"><input type="text" name="title" size="30" value="<?php echo $title; ?>" />
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><?php print_string('block_rss_client_show_channel_link_label', 'block_rss_client'); ?></td>
-    <td>
+    <td align="right" width="50%"><?php print_string('clientshowchannellinklabel', 'block_rss_client'); ?></td>
+    <td width="50%">
         <?php 
                 if (isset($this->config) && isset($this->config->block_rss_client_show_channel_link)) {
                         $selected = $this->config->block_rss_client_show_channel_link;
@@ -117,8 +121,8 @@
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><?php print_string('block_rss_client_show_image_label', 'block_rss_client'); ?></td>
-    <td>
+    <td align="right" width="50%"><?php print_string('clientshowimagelabel', 'block_rss_client'); ?></td>
+    <td width="50%">
         <?php 
                 if (isset($this->config) && isset($this->config->block_rss_client_show_channel_image)) {
                         $selected = $this->config->block_rss_client_show_channel_image;
@@ -138,3 +142,13 @@
     </td>
 </tr>
 </table>
+<?php
+} else {
+    global $act, $url, $rssid, $preferredtitle;
+    print '<table cellpadding="9" cellspacing="0" class="blockconfigtable">';
+    print '<tr valign="top"><td>';
+    rss_display_feeds();
+    print '</form>'; //not sure that this is needed
+    rss_get_form($act, $url, $rssid, $preferredtitle); 
+    print '</td></tr></table>';
+} ?>

blocks/rss_client/config_instance_tabs.php

@@ -0,0 +1,22 @@
+<?php  // $Id$
+/// This file to be included so we can assume config.php has already been included.
+/// We also assume that $inactive, $activetab and $currentaction have been set
+
+    global $USER;
+    $tabs = $row = array();
+
+    $script = $page->url_get_full(array('instanceid' => $this->instance->id, 'sesskey' => $USER->sesskey, 'blockaction' => 'config', 'currentaction' => 'configblock'));
+    $row[] = new tabobject('configblock', $script, 
+                get_string('configblock', 'block_rss_client'));
+
+    $script = $page->url_get_full(array('instanceid' => $this->instance->id, 'sesskey' => $USER->sesskey, 'blockaction' => 'config', 'currentaction' => 'managefeeds'));
+    $row[] = new tabobject('managefeeds', $script, 
+                get_string('managefeeds', 'block_rss_client'));
+
+    $tabs[] = $row;
+
+    /// Print out the tabs and continue!
+    print '<div align="center">';
+    print_tabs($tabs, $currentaction);
+    print '</div>';
+?>

blocks/rss_client/styles.php

@@ -1,22 +1,53 @@
 .block_rss_client .link {
-    border-top:1px solid;
-    border-top-color:#DDDDDD;
-    padding-bottom:5px;
-    font-size:0.7em;
+  border-top:1px solid;
+  border-top-color:#DDDDDD;
+  padding-bottom:5px;
+  font-size:0.82em;
 }
 
 .block_rss_client .description {
-    color:#555555;
-    font-size:0.7em;
-    padding-left:10px;
-    padding-bottom:8px;
+  color:#555555;
+  font-size:0.78em;
+  padding-left:10px;
+  padding-bottom:8px;
 }
 
 .block_rss_client .title {
+  padding-top:10px;
+  font-size:1.0em;
 }
 
 .block_rss_client .image {
 }
 
-.block_rss_client .channellink {
+.blockconfigtable #rssfeeds {
+    width: 100%;
+}
+
+.blockconfigtable #rssfeeds td.actions {
+    text-align: center;
+    vertical-align: middle;
+    padding: 10px;
+}
+
+.blockconfigtable #rssfeeds td.feed {
+    vertical-align: middle;
+    padding: 5px;
+}
+
+.blockconfigtable #rssfeeds .title {
+    font-weight: bold;
+    margin-bottom: 2px;
+}
+
+.blockconfigtable #rssfeeds .url, .blockconfigtable #rssfeeds .description {
+    font-size: 0.8em;
+}
+
+.blockconfigtable #rssfeeds tr.r0 {
+  background-color: #ffffff;
+}
+
+.blockconfigtable #rssfeeds tr.r1 {
+  background-color: #f0f0f0;
 }

blocks/search_forums/block_search_forums.php

@@ -2,7 +2,7 @@
 
 class block_search_forums extends block_base {
     function init() {
-        $this->title = get_string('search', 'forum');
+        $this->title = get_string('blocktitle', 'block_search_forums');
         $this->version = 2005030900;
     }
 
@@ -21,12 +21,15 @@ class block_search_forums extends block_base {
             return $this->content;
         }
 
+        $advancedsearch = get_string('advancedsearch', 'block_search_forums');
+
         $this->content->text  = '<div class="searchform">';
         $this->content->text .= '<form name="search" action="'.$CFG->wwwroot.'/mod/forum/search.php" style="display:inline">';
-        $this->content->text .= '<input name="search" type="text" size="18" value="" alt="search" /> ';
-        $this->content->text .= '<input value="'.get_string('searchforums', 'forum').'" type="submit" />';
-        $this->content->text .= helpbutton('search', get_string('search'), 'moodle', true, false, '', true);
-        $this->content->text .= '<input name="id" type="hidden" value="'.$this->instance->pageid.'" />';
+        $this->content->text .= '<input name="id" type="hidden" value="'.$this->instance->pageid.'" />';  // course
+        $this->content->text .= '<input name="search" type="text" size="16" value="" alt="search" />';
+        $this->content->text .= '<input value=">" type="submit" /><br />';
+        $this->content->text .= '<a href="'.$CFG->wwwroot.'/mod/forum/search.php?id='.$this->instance->pageid.'">'.$advancedsearch.'</a>';
+        $this->content->text .= helpbutton('search', $advancedsearch, 'moodle', true, false, '', true);
         $this->content->text .= '</form></div>';
 
         return $this->content;

blocks/site_main_menu/block_site_main_menu.php

@@ -123,8 +123,7 @@ class block_site_main_menu extends block_list {
         }
 
         if ($isediting && $modnames) {
-            $this->content->footer = '<div style="text-align: right;">'.
-                print_section_add_menus($course, 0, $modnames, true, true).'</div>';
+            $this->content->footer = print_section_add_menus($course, 0, $modnames, true, true);
         } else {
             $this->content->footer = '';
         }

blocks/social_activities/block_social_activities.php

@@ -116,8 +116,7 @@ class block_social_activities extends block_list {
         }
 
         if ($isediting && $modnames) {
-            $this->content->footer = '<div style="text-align: right;">'.
-                print_section_add_menus($course, 0, $modnames, true, true).'</div>';
+            $this->content->footer = print_section_add_menus($course, 0, $modnames, true, true);
         } else {
             $this->content->footer = '';
         }

calendar/event.php

@@ -102,6 +102,8 @@
         case 'edit':
             $title = get_string('editevent', 'calendar');
             $event = get_record('event', 'id', $eventid);
+            $repeats = optional_param('repeats', 0, PARAM_INT);
+
             if($event === false) {
                 error('Invalid event');
             }
@@ -126,14 +128,41 @@
                 else {
                     $form->timeduration = 0;
                 }
-                validate_form($form, $err);
-                if (count($err) == 0) {
-                    $form->timemodified = time();
-                    update_record('event', $form);
 
-                    /// Log the event update.
-                    $form->name = stripslashes($form->name);  //To avoid double-slashes
-                    add_to_log($form->courseid, 'calendar', 'edit', 'event.php?action=edit&id='.$form->id, $form->name);
+                validate_form($form, $err);
+
+                if (count($err) == 0) {
+
+                    if($event->repeatid && $repeats) {
+                        // Update all
+                        if($form->timestart >= $event->timestart) {
+                            $timestartoffset = 'timestart + '.($form->timestart - $event->timestart);
+                        }
+                        else {
+                            $timestartoffset = 'timestart - '.($event->timestart - $form->timestart);
+                        }
+
+                        execute_sql('UPDATE '.$CFG->prefix.'event SET '.
+                            'name = '.$db->qstr($form->name).','.
+                            'description = '.$db->qstr($form->description).','.
+                            'timestart = '.$timestartoffset.','.
+                            'timeduration = '.$form->timeduration.','.
+                            'timemodified = '.time().' WHERE repeatid = '.$event->repeatid);
+                            
+                        /// Log the event update.
+                        $form->name = stripslashes($form->name);  //To avoid double-slashes
+                        add_to_log($form->courseid, 'calendar', 'edit all', 'event.php?action=edit&id='.$form->id, $form->name);
+                    }
+
+                    else {
+                        // Update this
+                        $form->timemodified = time();
+                        update_record('event', $form);
+    
+                        /// Log the event update.
+                        $form->name = stripslashes($form->name);  //To avoid double-slashes
+                        add_to_log($form->courseid, 'calendar', 'edit', 'event.php?action=edit&id='.$form->id, $form->name);
+                    }
 
                     // OK, now redirect to day view
                     redirect(CALENDAR_URL.'view.php?view=day&cal_d='.$form->startday.'&cal_m='.$form->startmon.'&cal_y='.$form->startyr);
@@ -173,6 +202,11 @@
                 if (count($err) == 0) {
                     $form->timemodified = time();
 
+                    if ($form->repeat) {
+                        $fetch = get_record_sql('SELECT 1, MAX(repeatid) AS repeatid FROM '.$CFG->prefix.'event');
+                        $form->repeatid = empty($fetch) ? 1 : $fetch->repeatid + 1;
+                    }
+
                     /// Get the event id for the log record.
                     $eventid = insert_record('event', $form, true);
 
@@ -198,7 +232,7 @@
                 }
                 else {
                     foreach ($err as $key => $value) {
-                        $focus = 'form'.$key;
+                        $focus = 'form.'.$key;
                     }
                 }
             }
@@ -214,6 +248,13 @@
         $nav = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$SESSION->cal_course_referer.'">'.$shortname.'</a> -> '.$nav;
     }
 
+    if (!empty($SESSION->cal_course_referer)) {
+        // TODO: This is part of the Great $course Hack in Moodle. Replace it at some point.
+        $course = get_record('course', 'id', $SESSION->cal_course_referer);
+    } else {
+        $course = $site;
+    }
+
     print_header($site->shortname.': '.$strcalendar.': '.$title, $strcalendar, $nav.' -> '.$title,
                  $focus, '', true, '', user_login_string($site));
 
@@ -225,16 +266,19 @@
     switch($action) {
         case 'delete':
             $confirm = optional_param('confirm', 0, PARAM_INT);
+            $repeats = optional_param('repeats', 0, PARAM_INT);
             if($confirm) {
                 // Kill it and redirect to day view
                 if(($event = get_record('event', 'id', $eventid)) !== false) {
-                    /// Log the event delete.
 
-                    delete_records('event', 'id', $eventid);
-
-                    // pj - fixed the course id problem, but now we have another one:
-                    // what to do with the URL?
-                    add_to_log($event->courseid, 'calendar', 'delete', '', $event->name);
+                    if($event->repeatid && $repeats) {
+                        delete_records('event', 'repeatid', $event->repeatid);
+                        add_to_log($event->courseid, 'calendar', 'delete all', '', $event->name);
+                    }
+                    else {
+                        delete_records('event', 'id', $eventid);
+                        add_to_log($event->courseid, 'calendar', 'delete', '', $event->name);
+                    }
                 }
 
                 redirect(CALENDAR_URL.'view.php?view=day&cal_d='.$_REQUEST['d'].'&cal_m='.$_REQUEST['m'].'&cal_y='.$_REQUEST['y']);
@@ -245,9 +289,21 @@
                 $m = $eventtime['mon'];
                 $d = $eventtime['mday'];
                 $y = $eventtime['year'];
+
+                if($event->repeatid) {
+                    $fetch = get_record_sql('SELECT 1, COUNT(id) AS repeatcount FROM '.$CFG->prefix.'event WHERE repeatid = '.$event->repeatid);
+                    $repeatcount = $fetch->repeatcount;
+                }
+                else {
+                    $repeatcount = 0;
+                }
+                
                 // Display confirmation form
                 echo '<div class="header">'.get_string('deleteevent', 'calendar').': '.$event->name.'</div>';
                 echo '<h2>'.get_string('confirmeventdelete', 'calendar').'</h2>';
+                if($repeatcount > 1) {
+                    echo '<p>'.get_string('youcandeleteallrepeats', 'calendar', $repeatcount).'</p>';
+                }
                 echo '<div class="eventlist">';
                 $event->time = calendar_format_event_time($event, time(), '', false);
                 calendar_print_event($event);
@@ -281,12 +337,22 @@
                     $form->minutes = '';
                 }
             }
-            if (!empty($form->courseid)) {       // Fixes bug 1488
+
+            if (!empty($form->courseid)) {
+                // TODO: This is part of the Great $course Hack in Moodle. Replace it at some point.
                 $course = get_record('course', 'id', $form->courseid);
             } else {
                 $course = $site;
             }
 
+            if($event->repeatid) {
+                $fetch = get_record_sql('SELECT 1, COUNT(id) AS repeatcount FROM '.$CFG->prefix.'event WHERE repeatid = '.$event->repeatid);
+                $repeatcount = $fetch->repeatcount;
+            }
+            else {
+                $repeatcount = 0;
+            }
+
             echo '<div class="header">'.get_string('editevent', 'calendar').'</div>';
             include('event_edit.html');
             if ($usehtmleditor) {
@@ -419,12 +485,12 @@
             if($eventtype == 'select') {
                 $defaultcourse = $SESSION->cal_course_referer;
                 if(isteacheredit($defaultcourse, $USER->id)) {
-                    $defaultgroup = 0;
+                    $defaultgroup = $groupid = 0;
                 }
                 else {
                     $defaultgroup = user_group($defaultcourse, $USER->id);
+                    $groupid      = optional_param('groupid',  $defaultgroup->id, PARAM_INT);
                 }
-                $groupid  = optional_param('groupid',  $defaultgroup->id, PARAM_INT);
                 $courseid = optional_param('courseid', $defaultcourse, PARAM_INT);
                 echo '<h2>'.get_string('eventkind', 'calendar').':</h2>';
                 echo '<div id="selecteventtype">';
@@ -455,13 +521,13 @@
     echo calendar_filter_controls('event', 'action='.$action.'&amp;type='.$eventtype.'&amp;id='.$eventid);
     echo '</div>';
     
-    echo '<div>';
+    echo '<div class="minicalendarblock">';
     echo calendar_top_controls('display', array('m' => $prevmon, 'y' => $prevyr));
     echo calendar_get_mini($courses, $groups, $users, $prevmon, $prevyr);
-    echo '</div><div>';
+    echo '</div><div class="minicalendarblock">';
     echo calendar_top_controls('display', array('m' => $mon, 'y' => $yr));
     echo calendar_get_mini($courses, $groups, $users, $mon, $yr);
-    echo '</div><div>';
+    echo '</div><div class="minicalendarblock">';
     echo calendar_top_controls('display', array('m' => $nextmon, 'y' => $nextyr));
     echo calendar_get_mini($courses, $groups, $users, $nextmon, $nextyr);
     echo '</div>';
@@ -516,7 +582,14 @@ function calendar_add_event_allowed($courseid, $groupid, $userid) {
     else if($courseid == 0 && $groupid == 0 && $userid == $USER->id) {
         return true;
     }
-    else if($courseid != 0 && isteacheredit($courseid)) {
+    else if($courseid == 0 && $groupid != 0) {
+        $group = get_record('groups', 'id', $groupid);
+        if($group === false) {
+            return false;
+        }
+        return isteacheredit($group->courseid) || isteacher($group->courseid) && ismember($groupid);
+    }
+    else if($courseid != 0 && isteacher($courseid)) {
         return true;
     }
 
@@ -529,11 +602,16 @@ function calendar_get_allowed_types(&$allowed) {
     $allowed->user = true; // User events always allowed
     $allowed->groups = false; // This may change just below
     $allowed->courses = false; // This may change just below
-    $allowed->site = isteacheredit(SITEID);
+    $allowed->site = isteacher(SITEID);
 
-    if(!empty($SESSION->cal_course_referer) && $SESSION->cal_course_referer != SITEID && isteacheredit($SESSION->cal_course_referer, $USER->id)) {
-        $allowed->courses = array($SESSION->cal_course_referer => 1);
-        $allowed->groups = get_groups($SESSION->cal_course_referer);
+    if(!empty($SESSION->cal_course_referer) && $SESSION->cal_course_referer != SITEID && isteacher($SESSION->cal_course_referer, $USER->id)) {
+        $course = get_record('course', 'id', $SESSION->cal_course_referer);
+
+        $allowed->courses = array($course->id => 1);
+
+        if($course->groupmode != NOGROUPS || !$course->groupmodeforce) {
+            $allowed->groups = get_groups($SESSION->cal_course_referer);
+        }
     }
 }
 

calendar/event_delete.html

@@ -4,22 +4,41 @@
       <form method="get" action="event.php" name="delete">
       <p>
       &nbsp;
-      <input type="submit" value=" <?php print_string('yes') ?> " />
+      <input type="submit" value=" <?php print_string('delete') ?> " />
       <input type="hidden" name="id" value="<?php echo $event->id?>" />
       <input type="hidden" name="action" value="delete" />
       <input type="hidden" name="m" value="<?php echo $m; ?>" />
       <input type="hidden" name="d" value="<?php echo $d; ?>" />
       <input type="hidden" name="y" value="<?php echo $y; ?>" />
       <input type="hidden" name="confirm" value="1" />
+      <input type="hidden" name="repeats" value="0" />
       &nbsp;
       </p>
       </form>
     </td>
+    <?php if($repeatcount > 1) { ?>
+    <td>
+      <form method="get" action="event.php" name="delete">
+      <p>
+      &nbsp;
+      <input type="submit" value=" <?php print_string('deleteall') ?> " />
+      <input type="hidden" name="id" value="<?php echo $event->id?>" />
+      <input type="hidden" name="action" value="delete" />
+      <input type="hidden" name="m" value="<?php echo $m; ?>" />
+      <input type="hidden" name="d" value="<?php echo $d; ?>" />
+      <input type="hidden" name="y" value="<?php echo $y; ?>" />
+      <input type="hidden" name="confirm" value="1" />
+      <input type="hidden" name="repeats" value="1" />
+      &nbsp;
+      </p>
+      </form>
+    </td>
+    <?php } ?>
     <td>
       <form method="get" action="view.php" name="cancel">
       <p>
       &nbsp;
-      <input type="submit" value=" <?php print_string('no') ?> ">
+      <input type="submit" value=" <?php print_string('cancel') ?> ">
       <input type="hidden" name="view" value="day" />
       <input type="hidden" name="cal_m" value="<?php echo $m; ?>" />
       <input type="hidden" name="cal_d" value="<?php echo $d; ?>" />

calendar/event_edit.html

@@ -1,5 +1,5 @@
 <form method="post" action="event.php" name="edit">
-<table cellpadding="5">
+<table cellpadding="5" cellspacing="0">
   <tr>
     <td style="vertical-align: top; text-align: right;">
       <?php print_string('eventname', 'calendar'); ?>:
@@ -58,6 +58,27 @@
       </div>
     </td>
   </tr>
+  <?php if($repeatcount > 1) { ?>
+  <tr>
+    <td style="vertical-align: top; text-align: right;">
+      <?php print_string('eventrepeat', 'calendar'); ?>:
+    </td>
+    <td>
+      <div>
+        <input type="radio" name="repeats" value="1" id="edit_all" checked="checked" />
+        <label for="edit_all">
+          <?php print_string('repeateditall', 'calendar', $repeatcount); ?>
+        </label>
+      </div>
+      <div>
+        <input type="radio" name="repeats" value="0" id="edit_this" />
+        <label for="edit_this">
+          <?php print_string('repeateditthis', 'calendar'); ?>
+        </label>
+      </div>
+    </td>
+  </tr>
+  <?php } ?>
   <tr>
     <td align="center" colspan="2"><p><input type="submit" value="<?php print_string('savechanges') ?>" /></p></td>
   </tr>

calendar/lib.php

@@ -62,6 +62,8 @@ define ('CALENDAR_URL', $CFG->wwwroot.'/calendar/');
 define ('CALENDAR_TF_24', '%H:%M');
 define ('CALENDAR_TF_12', '%I:%M %p');
 
+$CALENDARDAYS = array('sunday','monday','tuesday','wednesday','thursday','friday','saturday');
+
 // Initialize the session variables here to be sure
 calendar_session_vars();
 
@@ -115,8 +117,10 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y
     }
 
     // Get the events matching our criteria. Don't forget to offset the timestamps for the user's TZ!
-    // TODO: usertime() doesn't compensate for DST. Thus the line below is wrong.
-    $whereclause = calendar_sql_where(usertime($display->tstart), usertime($display->tend), $users, $groups, $courses);
+    $whereclause = calendar_sql_where(
+        usertime($display->tstart) - dst_offset_on($display->tstart),
+        usertime($display->tend) - dst_offset_on($display->tend),
+        $users, $groups, $courses);
 
     if($whereclause === false) {
         $events = array();
@@ -387,7 +391,7 @@ function calendar_print_event($event) {
     static $strftimetime;
 
     $event = calendar_add_event_metadata($event);
-    echo '<table class="event">';
+    echo '<table class="event" cellspacing="0">';
     echo '<tr><td class="picture">';
     if (!empty($event->icon)) {
         echo $event->icon;
@@ -534,7 +538,7 @@ function calendar_sql_where($tstart, $tend, $users, $groups, $courses, $withdura
 }
 
 function calendar_top_controls($type, $data) {
-    global $CFG;
+    global $CFG, $CALENDARDAYS;
     $content = '';
     if(!isset($data['d'])) {
         $data['d'] = 1;
@@ -593,11 +597,10 @@ function calendar_top_controls($type, $data) {
         break;
         case 'day':
             $data['d'] = $date['mday']; // Just for convenience
-            $dayname = calendar_wday_name($date['weekday']);
             $prevdate = usergetdate(make_timestamp($data['y'], $data['m'], $data['d'] - 1));
             $nextdate = usergetdate(make_timestamp($data['y'], $data['m'], $data['d'] + 1));
-            $prevname = calendar_wday_name($prevdate['weekday']);
-            $nextname = calendar_wday_name($nextdate['weekday']);
+            $prevname = calendar_wday_name($CALENDARDAYS[$prevdate['wday']]);
+            $nextname = calendar_wday_name($CALENDARDAYS[$nextdate['wday']]);
             $content .= '<table class="calendar-controls"><tr>';
             $content .= '<td class="previous"><a href="'.calendar_get_link_href('view.php?view=day&amp;', $prevdate['mday'], $prevdate['mon'], $prevdate['year']).'">&lt;&lt; '.$prevname."</a></td>\n";
 
@@ -639,7 +642,7 @@ function calendar_filter_controls($type, $vars = NULL, $course = NULL) {
             } else {
                 $getvars = '&amp;from=course';
             }
-            if (isset($course->groupmode) and !$course->groupmode and $course->groupmodeforce) {
+            if (isset($course->groupmode) and $course->groupmode == NOGROUPS and $course->groupmodeforce) {
                 $groupevents = false;
             }
         break;
@@ -982,8 +985,6 @@ function calendar_set_referring_course($courseid) {
 function calendar_set_filters(&$courses, &$group, &$user, $courseeventsfrom = NULL, $groupeventsfrom = NULL, $ignorefilters = false) {
     global $SESSION, $USER, $CFG;
 
-    //$GLOBALS['db']->debug = true;
-
     // Insidious bug-wannabe: setting $SESSION->cal_courses_shown to $course->id would cause
     // the code to function incorrectly UNLESS we convert it to an integer. One case where
     // PHP's loose type system works against us.
@@ -1043,18 +1044,27 @@ function calendar_set_filters(&$courses, &$group, &$user, $courseeventsfrom = NU
         }
         else {
             $grouparray = array();
-    
+            $groupmodes = NULL;
+
             // We already have the courses to examine in $courses
             // For each course...
             foreach($groupcourses as $courseid) {
+
                 // If the user is an editing teacher in there,
                 if(!empty($USER->id) && isteacheredit($courseid, $USER->id)) {
-                    // Show events from all groups
-                    if(($grouprecords = get_groups($courseid)) !== false) {
+
+                    // The first time we get in here, retrieve all groupmodes at once
+                    if($groupmodes === NULL) {
+                        $groupmodes = get_records_list('course', 'id', implode(',', $groupcourses), '', 'id, groupmode, groupmodeforce');
+                    }
+
+                    // If this course has groups, show events from all of them
+                    if(isset($groupmodes[$courseid]) && ($groupmodes[$courseid]->groupmode != NOGROUPS || !$groupmodes[$courseid]->groupmodeforce) && ($grouprecords = get_groups($courseid)) !== false) {
                         $grouparray = array_merge($grouparray, array_keys($grouprecords));
                     }
                 }
-                // Otherwise show events from the group he is a member of
+
+                // Otherwise (not editing teacher) show events from the group he is a member of
                 else if(isset($USER->groupmember[$courseid])) {
                     $grouparray[] = $USER->groupmember[$courseid];
                 }
@@ -1071,8 +1081,6 @@ function calendar_set_filters(&$courses, &$group, &$user, $courseeventsfrom = NU
     else {
         $group = false;
     }
-
-    $GLOBALS['db']->debug = false;
 }
 
 function calendar_edit_event_allowed($event) {
@@ -1092,10 +1100,7 @@ function calendar_edit_event_allowed($event) {
         if($group === false) {
             return false;
         }
-        if(isteacher($group->courseid)) {
-            return true;
-        }
-
+        return isteacheredit($group->courseid) || isteacher($group->courseid) && ismember($event->groupid);
     } else if($event->courseid == 0 && $event->groupid == 0 && $event->userid == $USER->id) {
         // User event, owned by this user
         return true;
@@ -1206,23 +1211,6 @@ function calendar_format_event_time($event, $now, $morehref, $usecommonwords = t
     return $eventtime;
 }
 
-function calendar_human_readable_dst($preset) {
-    $weekdays = array('sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday');
-
-    $options = new stdClass;
-    $options->activate_index     = ($preset->activate_index == -1) ? get_string('last', 'calendar') : get_string('nth', 'calendar', $preset->activate_index);
-    $options->activate_weekday   = ($preset->activate_day < 0) ? get_string('day', 'calendar') : get_string($weekdays[$preset->activate_day], 'calendar');
-    $options->activate_month     = date('F', mktime(0, 0, 0, $preset->activate_month, 1, 2000));
-    $options->offset             = abs($preset->apply_offset);
-    //$options->direction          = $preset->apply_offset > 0 ? get_string('timeforward', 'calendar') : get_string('timerewind', 'calendar');
-    $options->direction          = get_string('timeforward', 'calendar');
-    $options->deactivate_index   = ($preset->deactivate_index == -1) ? get_string('last', 'calendar') : get_string('nth', 'calendar', $preset->deactivate_index);
-    $options->deactivate_weekday = ($preset->deactivate_day < 0) ? get_string('day', 'calendar') : get_string($weekdays[$preset->deactivate_day], 'calendar');
-    $options->deactivate_month   = date('F', mktime(0, 0, 0, $preset->deactivate_month, 1, 2000));
-
-    return get_string('dsthumanreadable', 'calendar', $options);
-}
-
 function calendar_print_month_selector($name, $selected) {
     
     $months = array();