Index: temp_moodle_dev/build.properties
===================================================================
diff -u -r33d78407b791ef9f2c48036098186a4d596ef155 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/build.properties	(.../build.properties)	(revision 33d78407b791ef9f2c48036098186a4d596ef155)
+++ temp_moodle_dev/build.properties	(.../build.properties)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -1,3 +1,3 @@
-moodle_dir=/var/www/moodle193
-moodle_db_name=moodle193
+moodle_dir=/var/www/moodle-soe
+moodle_db_name=moodle-soe
 mysql_binary=/usr/bin/mysql
\ No newline at end of file
Index: temp_moodle_dev/moodle/lib/datalib.php
===================================================================
diff -u -r3af3eb545df98ae2c84a96bd2fce2bfedc95860b -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/lib/datalib.php	(.../datalib.php)	(revision 3af3eb545df98ae2c84a96bd2fce2bfedc95860b)
+++ temp_moodle_dev/moodle/lib/datalib.php	(.../datalib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -210,11 +210,14 @@
  * @uses SITEID
  * @deprecated Use {@link get_course_users()} instead.
  * @param string $fields A comma separated list of fields to be returned from the chosen table.
+ * @param string $exceptions A comma separated list of user->id to be skiped in the result returned by the function
+ * @param int $limitfrom return a subset of records, starting at this point (optional, required if $limitnum is set).
+ * @param int $limitnum return a subset comprising this many records (optional, required if $limitfrom is set).
  * @return object|false  {@link $USER} records or false if error.
  */
-function get_site_users($sort='u.lastaccess DESC', $fields='*', $exceptions='') {
+function get_site_users($sort='u.lastaccess DESC', $fields='*', $exceptions='', $limitfrom='', $limitnum='') {
 
-    return get_course_users(SITEID, $sort, $exceptions, $fields);
+    return get_course_users(SITEID, $sort, $exceptions, $fields, $limitfrom, $limitnum);
 }
 
 
@@ -1017,14 +1020,14 @@
 
             //
             // Perhaps it's actually visible to $USER
-            // check moodle/category:visibility
+            // check moodle/category:viewhiddencategories
             //
             // The name isn't obvious, but the description says
             // "See hidden categories" so the user shall see...
             // But also check if the allowvisiblecoursesinhiddencategories setting is true, and check for course visibility
             if ($viscat === false) {
                 $catctx = $cats[$courses[$n]->category]->context;
-                if (has_capability('moodle/category:visibility', $catctx, $USER->id)) {
+                if (has_capability('moodle/category:viewhiddencategories', $catctx, $USER->id)) {
                     $vcatpaths[$courses[$n]->categorypath] = true;
                     $viscat = true;
                 } elseif ($CFG->allowvisiblecoursesinhiddencategories && $courses[$n]->visible == true) {
@@ -1235,7 +1238,7 @@
     if( $rs = get_recordset_sql($sql) ){
         while ($cat = rs_fetch_next_record($rs)) {
             $cat = make_context_subobj($cat);
-            if ($cat->visible || has_capability('moodle/category:visibility',$cat->context)) {
+            if ($cat->visible || has_capability('moodle/category:viewhiddencategories',$cat->context)) {
                 $categories[$cat->id] = $cat;
             }
         }
@@ -1461,7 +1464,7 @@
         $userid = $USER->id;
     }
 
-    $sql = "SELECT c.remoteid, c.shortname, c.fullname,
+    $sql = "SELECT c.id, c.remoteid, c.shortname, c.fullname,
                    c.hostid, c.summary, c.cat_name,
                    h.name AS hostname
             FROM   {$CFG->prefix}mnet_enrol_course c
@@ -1613,7 +1616,7 @@
                             FROM {$CFG->prefix}modules m,
                                  {$CFG->prefix}course_modules cm
                             WHERE cm.course = ".intval($courseid)."
-                            AND cm.module = m.id AND m.visible = 1 AND cm.is_lams=0"); // no disabled mods
+			    AND cm.module = m.id AND m.visible = 1 AND cm.is_lams=0"); // no disabled mods
 }
 
 
@@ -1689,7 +1692,6 @@
                                    cm.instance = m.id AND
                                    md.name = '$modulename' AND
                                    md.id = cm.module".(($modulename=="assignment")?" AND m.is_lams = 0":"")); // to show just activities that are created outside Lams (in that case assignments)
-                                   //old md.id = cm.module");
 }
 
 /**
@@ -1727,7 +1729,6 @@
                                             cm.section = cw.id AND
                                             md.name = '$modulename' AND
                                             md.id = cm.module".(($modulename=="quiz"||$modulename=="choice"||$modulename=="glossary"||$modulename=="wiki"||$modulename=="lesson"||$modulename=="scorm"||$modulename=="chat")?" AND m.is_lams = 0":""))) { // to show just activities that are created outside Lams
-										    //old md.id = cm.module")) { 
         return $outputarray;
     }
 
@@ -1882,6 +1883,9 @@
     }
 
     $REMOTE_ADDR = getremoteaddr();
+    if (empty($REMOTE_ADDR)) {
+        $REMOTE_ADDR = '0.0.0.0';
+    }
 
     $timenow = time();
     $info = addslashes($info);
@@ -2174,7 +2178,7 @@
  *   we'll save a dbquery
  *
  * - If we return false, you'll still need to check if
- *   the user can has the 'moodle/category:visibility'
+ *   the user can has the 'moodle/category:viewhiddencategories'
  *   capability...
  *
  * - Will generate 2 DB calls.
@@ -2255,27 +2259,15 @@
 
     if (has_capability('moodle/course:create', get_context_instance(CONTEXT_SYSTEM))) {
         return true;
-    } else {
-        return (bool) count(get_creatable_categories());
     }
-
-}
-
-/**
- * get the list of categories the current user can create courses in
- * @return array
- */
-function get_creatable_categories() {
-
-    $creatablecats = array();
     if ($cats = get_records('course_categories')) {
         foreach ($cats as $cat) {
             if (has_capability('moodle/course:create', get_context_instance(CONTEXT_COURSECAT, $cat->id))) {
-                $creatablecats[$cat->id] = $cat->name;
+                return true;
             }
         }
     }
-    return $creatablecats;
+    return false;
 }
 
 // vim:autoindent:expandtab:shiftwidth=4:tabstop=4:tw=140:
Index: temp_moodle_dev/moodle/lib/pagelib.php
===================================================================
diff -u -r5330c13e294f86a39f3e83ac52fbbe0e5ef2c593 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/lib/pagelib.php	(.../pagelib.php)	(revision 5330c13e294f86a39f3e83ac52fbbe0e5ef2c593)
+++ temp_moodle_dev/moodle/lib/pagelib.php	(.../pagelib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -633,7 +633,7 @@
     function blocks_default_position() {
         return BLOCK_POS_LEFT;
     }
-    //lams: add a new parameter so we can display or not the header depending on if is in a lams sequence or not
+    
     function print_header($title, $morenavlinks = NULL, $bodytags = '', $meta = '',$is_lams=null) {
         global $USER, $CFG;
     
@@ -662,11 +662,11 @@
             $morenavlinks = array();
         }
         $navigation = build_navigation($morenavlinks, $this->modulerecord);
-        if($is_lams==0){
-        	print_header($title, $this->courserecord->fullname, $navigation, '', $meta, true, $buttons, navmenu($this->courserecord, $this->modulerecord), false, $bodytags);
-        }else{
-        	print_header();
-        }
+	if($is_lams==0){
+	  print_header($title, $this->courserecord->fullname, $navigation, '', $meta, true, $buttons, navmenu($this->courserecord, $this->modulerecord), false, $bodytags);
+	} else {
+	  print_header();
+	}
     }
     
 }
Index: temp_moodle_dev/moodle/lib/weblib.php
===================================================================
diff -u -r90883bda4ec71884bf3ff3d18ec7952b70e6af22 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/lib/weblib.php	(.../weblib.php)	(revision 90883bda4ec71884bf3ff3d18ec7952b70e6af22)
+++ temp_moodle_dev/moodle/lib/weblib.php	(.../weblib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -101,7 +101,7 @@
  */
 $ALLOWED_PROTOCOLS = array('http', 'https', 'ftp', 'news', 'mailto', 'rtsp', 'teamspeak', 'gopher', 'mms',
                            'color', 'callto', 'cursor', 'text-align', 'font-size', 'font-weight', 'font-style', 'font-family',
-                           'border', 'margin', 'padding', 'background', 'text-decoration');   // CSS as well to get through kses
+                           'border', 'margin', 'padding', 'background', 'background-color', 'text-decoration');   // CSS as well to get through kses
 
 
 /// Functions
@@ -848,7 +848,6 @@
     die;
 }
 
-
 /**
  * Given an array of values, output the HTML for a select element with those options.
  * Normally, you only need to use the first few parameters.
@@ -867,9 +866,17 @@
  * @param int $tabindex if give, sets the tabindex attribute on the <select> element. Default none.
  * @param string $id value to use for the id attribute of the <select> element. If none is given,
  *      then a suitable one is constructed.
+ * @param mixed $listbox if false, display as a dropdown menu. If true, display as a list box.
+ *      By default, the list box will have a number of rows equal to min(10, count($options)), but if
+ *      $listbox is an integer, that number is used for size instead.
+ * @param boolean $multiple if true, enable multiple selections, else only 1 item can be selected. Used
+ *      when $listbox display is enabled
+ * @param string $class value to use for the class attribute of the <select> element. If none is given,
+ *      then a suitable one is constructed.
  */
 function choose_from_menu ($options, $name, $selected='', $nothing='choose', $script='',
-                           $nothingvalue='0', $return=false, $disabled=false, $tabindex=0, $id='') {
+                           $nothingvalue='0', $return=false, $disabled=false, $tabindex=0,
+                           $id='', $listbox=false, $multiple=false, $class='') {
 
     if ($nothing == 'choose') {
         $nothing = get_string('choose') .'...';
@@ -886,23 +893,49 @@
 
     if ($id ==='') {
         $id = 'menu'.$name;
-         // name may contaion [], which would make an invalid id. e.g. numeric question type editing form, assignment quickgrading
+        // name may contaion [], which would make an invalid id. e.g. numeric question type editing form, assignment quickgrading
         $id = str_replace('[', '', $id);
         $id = str_replace(']', '', $id);
     }
 
-    $output = '<select id="'.$id.'" name="'. $name .'" '. $attributes .'>' . "\n";
+    if ($class ==='') {
+        $class = 'menu'.$name;
+        // name may contaion [], which would make an invalid class. e.g. numeric question type editing form, assignment quickgrading
+        $class = str_replace('[', '', $class);
+        $class = str_replace(']', '', $class);
+    }
+    $class = 'select ' . $class; /// Add 'select' selector always
+
+    if ($listbox) {
+        if (is_integer($listbox)) {
+            $size = $listbox;
+        } else {
+            $numchoices = count($options);
+            if ($nothing) {
+                $numchoices += 1;
+            }
+            $size = min(10, $numchoices);
+        }
+        $attributes .= ' size="' . $size . '"';
+        if ($multiple) {
+            $attributes .= ' multiple="multiple"';
+        }
+    }
+
+    $output = '<select id="'. $id .'" class="'. $class .'" name="'. $name .'" '. $attributes .'>' . "\n";
     if ($nothing) {
         $output .= '   <option value="'. s($nothingvalue) .'"'. "\n";
         if ($nothingvalue === $selected) {
             $output .= ' selected="selected"';
         }
         $output .= '>'. $nothing .'</option>' . "\n";
     }
+
     if (!empty($options)) {
         foreach ($options as $value => $label) {
             $output .= '   <option value="'. s($value) .'"';
-            if ((string)$value == (string)$selected) {
+            if ((string)$value == (string)$selected ||
+                    (is_array($selected) && in_array($value, $selected))) {
                 $output .= ' selected="selected"';
             }
             if ($label === '') {
@@ -1135,11 +1168,14 @@
  * @param string $targetwindow The name of the target page to open the linked page in.
  * @param string $selectlabel Text to place in a [label] element - preferred for accessibility.
  * @param array $optionsextra TODO, an array?
+ * @param mixed $gobutton If set, this turns off the JavaScript and uses a 'go'
+ *   button instead (as is always included for JS-disabled users). Set to true
+ *   for a literal 'Go' button, or to a string to change the name of the button.
  * @return string If $return is true then the entire form is returned as a string.
  * @todo Finish documenting this function<br>
  */
 function popup_form($common, $options, $formid, $selected='', $nothing='choose', $help='', $helptext='', $return=false,
-$targetwindow='self', $selectlabel='', $optionsextra=NULL) {
+$targetwindow='self', $selectlabel='', $optionsextra=NULL, $gobutton=NULL) {
 
     global $CFG;
     static $go, $choose;   /// Locally cached, in case there's lots on a page
@@ -1176,18 +1212,25 @@
         $selectlabel = '<label for="'.$formid.'_jump">'.$selectlabel.'</label>';
     }
 
-    //IE and Opera fire the onchange when ever you move into a dropdwown list with the keyboard.
-    //onfocus will call a function inside dropdown.js. It fixes this IE/Opera behavior.
-    //Note: There is a bug on Opera+Linux with the javascript code (first mouse selection is inactive),
-    //so we do not fix the Opera behavior on Linux
-    if (check_browser_version('MSIE') || (check_browser_version('Opera') && !check_browser_operating_system("Linux"))) {
-        $output .= '<div>'.$selectlabel.$button.'<select id="'.$formid.'_jump" onfocus="initSelect(\''.$formid.'\','.$targetwindow.')" name="jump">'."\n";
-    }
-    //Other browser
-    else {
-        $output .= '<div>'.$selectlabel.$button.'<select id="'.$formid.'_jump" name="jump" onchange="'.$targetwindow.'.location=document.getElementById(\''.$formid.'\').jump.options[document.getElementById(\''.$formid.'\').jump.selectedIndex].value;">'."\n";
-    }
+    if ($gobutton) {
+        // Using the no-JavaScript version
+        $javascript = '';
+    } else if (check_browser_version('MSIE') || (check_browser_version('Opera') && !check_browser_operating_system("Linux"))) {
+        //IE and Opera fire the onchange when ever you move into a dropdown list with the keyboard.
+        //onfocus will call a function inside dropdown.js. It fixes this IE/Opera behavior.
+        //Note: There is a bug on Opera+Linux with the javascript code (first mouse selection is inactive),
+        //so we do not fix the Opera behavior on Linux
+        $javascript = ' onfocus="initSelect(\''.$formid.'\','.$targetwindow.')"';
+    } else {
+        //Other browser
+        $javascript = ' onchange="'.$targetwindow.
+          '.location=document.getElementById(\''.$formid.
+          '\').jump.options[document.getElementById(\''.
+          $formid.'\').jump.selectedIndex].value;"';
+    }    
 
+    $output .= '<div>'.$selectlabel.$button.'<select id="'.$formid.'_jump" name="jump"'.$javascript.'>'."\n";
+
     if ($nothing != '') {
         $output .= "   <option value=\"javascript:void(0)\">$nothing</option>\n";
     }
@@ -1264,14 +1307,18 @@
 
     $output .= '</select>';
     $output .= '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
-    $output .= '<div id="noscript'.$formid.'" style="display: inline;">';
-    $output .= '<input type="submit" value="'.$go.'" /></div>';
-    $output .= '<script type="text/javascript">'.
-               "\n//<![CDATA[\n".
-               'document.getElementById("noscript'.$formid.'").style.display = "none";'.
-               "\n//]]>\n".'</script>';
-    $output .= '</div>';
-    $output .= '</form>';
+    if ($gobutton) {
+        $output .= '<input type="submit" value="'.
+            ($gobutton===true ? $go : $gobutton).'" />';
+    } else {
+        $output .= '<div id="noscript'.$formid.'" style="display: inline;">';
+        $output .= '<input type="submit" value="'.$go.'" /></div>';
+        $output .= '<script type="text/javascript">'.
+                   "\n//<![CDATA[\n".
+                   'document.getElementById("noscript'.$formid.'").style.display = "none";'.
+                   "\n//]]>\n".'</script>';
+    }
+    $output .= '</div></form>';
 
     if ($return) {
         return $output;
@@ -2084,7 +2131,7 @@
             $arreach['value'] = preg_replace("/b\s*i\s*n\s*d\s*i\s*n\s*g/i", "Xbinding", $arreach['value']);
         } else if ($arreach['name'] == 'href') {
             //Adobe Acrobat Reader XSS protection
-            $arreach['value'] = preg_replace('/(\.(pdf|fdf|xfdf|xdp|xfd))[^a-z0-9_\.\-].*$/i', '$1', $arreach['value']);
+            $arreach['value'] = preg_replace('/(\.(pdf|fdf|xfdf|xdp|xfd)[^#]*)#.*$/i', '$1', $arreach['value']);
         }
         $attStr .=  ' '.$arreach['name'].'="'.$arreach['value'].'"';
     }
@@ -2134,6 +2181,7 @@
         $img[$lang] = array();
         foreach ($emoticons as $emoticon => $image){
             $alttext = get_string($image, 'pix');
+            $alttext = preg_replace('/^\[\[(.*)\]\]$/', '$1', $alttext); /// Clean alttext in case there isn't lang string for it.
             $e[$lang][] = $emoticon;
             $img[$lang][] = '<img alt="'. $alttext .'" width="15" height="15" src="'. $CFG->pixpath .'/s/'. $image .'.gif" />';
         }
@@ -2237,11 +2285,11 @@
 
     require_once($CFG->libdir .'/html2text.php');
 
-    $result = html2text($html);
+    $h2t = new html2text($html);
+    $result = $h2t->get_text();
 
-    // html2text does not fix numerical entities so handle those here.
-    $tl=textlib_get_instance();
-    $result = $tl->entities_to_utf8($result,false);
+    // html2text does not fix HTML entities so handle those here.
+    $result = html_entity_decode($result, ENT_NOQUOTES, 'UTF-8');
 
     return $result;
 }
@@ -2265,62 +2313,60 @@
  * This function will highlight search words in a given string
  * It cares about HTML and will not ruin links.  It's best to use
  * this function after performing any conversions to HTML.
- * Function found here: http://forums.devshed.com/t67822/scdaa2d1c3d4bacb4671d075ad41f0854.html
  *
- * @param string $needle The string to search for
- * @param string $haystack The string to search for $needle in
- * @param int $case whether to do case-sensitive or insensitive matching.
- * @return string
- * @todo Finish documenting this function
+ * @param string $needle The search string. Syntax like "word1 +word2 -word3" is dealt with correctly.
+ * @param string $haystack The string (HTML) within which to highlight the search terms.
+ * @param boolean $matchcase whether to do case-sensitive. Default case-insensitive.
+ * @param string $prefix the string to put before each search term found.
+ * @param string $suffix the string to put after each search term found.
+ * @return string The highlighted HTML.
  */
-function highlight($needle, $haystack, $case=0,
-                    $left_string='<span class="highlight">', $right_string='</span>') {
+function highlight($needle, $haystack, $matchcase = false,
+        $prefix = '<span class="highlight">', $suffix = '</span>') {
 
+/// Quick bail-out in trivial cases.
     if (empty($needle) or empty($haystack)) {
         return $haystack;
     }
 
-    //$list_of_words = eregi_replace("[^-a-zA-Z0-9&.']", " ", $needle);  // bug 3101
-    $list_of_words = $needle;
-    $list_array = explode(' ', $list_of_words);
-    for ($i=0; $i<sizeof($list_array); $i++) {
-        if (strlen($list_array[$i]) == 1) {
-            $list_array[$i] = '';
+/// Break up the search term into words, discard any -words and build a regexp.
+    $words = preg_split('/ +/', trim($needle));
+    foreach ($words as $index => $word) {
+        if (strpos($word, '-') === 0) {
+            unset($words[$index]);
+        } else if (strpos($word, '+') === 0) {
+            $words[$index] = '\b' . preg_quote(ltrim($word, '+'), '/') . '\b'; // Match only as a complete word.
+        } else {
+            $words[$index] = preg_quote($word, '/');
         }
     }
-    $list_of_words = implode(' ', $list_array);
-    $list_of_words_cp = $list_of_words;
-    $final = array();
-    preg_match_all('/<(.+?)>/is',$haystack,$list_of_words);
+    $regexp = '/(' . implode('|', $words) . ')/u'; // u is do UTF-8 matching.
+    if (!$matchcase) {
+        $regexp .= 'i';
+    }
 
-    foreach (array_unique($list_of_words[0]) as $key=>$value) {
-        $final['<|'.$key.'|>'] = $value;
+/// Another chance to bail-out if $search was only -words
+    if (empty($words)) {
+        return $haystack;
     }
 
-    $haystack = str_replace($final,array_keys($final),$haystack);
-    $list_of_words_cp = eregi_replace(' +', '|', $list_of_words_cp);
-
-    if ($list_of_words_cp{0}=='|') {
-        $list_of_words_cp{0} = '';
+/// Find all the HTML tags in the input, and store them in a placeholders array.
+    $placeholders = array();
+    $matches = array();
+    preg_match_all('/<[^>]*>/', $haystack, $matches);
+    foreach (array_unique($matches[0]) as $key => $htmltag) {
+        $placeholders['<|' . $key . '|>'] = $htmltag;
     }
-    if ($list_of_words_cp{strlen($list_of_words_cp)-1}=='|') {
-        $list_of_words_cp{strlen($list_of_words_cp)-1}='';
-    }
 
-    $list_of_words_cp = trim($list_of_words_cp);
+/// In $hastack, replace each HTML tag with the corresponding placeholder.
+    $haystack = str_replace($placeholders, array_keys($placeholders), $haystack);
 
-    if ($list_of_words_cp) {
+/// In the resulting string, Do the highlighting.
+    $haystack = preg_replace($regexp, $prefix . '$1' . $suffix, $haystack);
 
-      $list_of_words_cp = "(". $list_of_words_cp .")";
+/// Turn the placeholders back into HTML tags.
+    $haystack = str_replace(array_keys($placeholders), $placeholders, $haystack);
 
-      if (!$case){
-        $haystack = eregi_replace("$list_of_words_cp", "$left_string"."\\1"."$right_string", $haystack);
-      } else {
-        $haystack = ereg_replace("$list_of_words_cp", "$left_string"."\\1"."$right_string", $haystack);
-      }
-    }
-    $haystack = str_replace(array_keys($final),$final,$haystack);
-
     return $haystack;
 }
 
@@ -2498,7 +2544,7 @@
     }
 
     if (file_exists($CFG->dataroot.'/'.SITEID.'/maintenance.html')) {
-        $button = '<a href="'.$CFG->wwwroot.'/admin/maintenance.php">'.get_string('maintenancemode', 'admin').'</a> '.$button;
+        $button = '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/maintenance.php">'.get_string('maintenancemode', 'admin').'</a> '.$button;
         if(!empty($title)) {
             $title .= ' - ';
         }
@@ -2526,7 +2572,7 @@
                     } else {
                         $menu .= get_string('failedloginattemptsall', '', $count);
                     }
-                    if (has_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM))) {
+                    if (has_capability('coursereport/log:view', get_context_instance(CONTEXT_SYSTEM))) {
                         $menu .= ' (<a href="'.$CFG->wwwroot.'/course/report/log/index.php'.
                                              '?chooselog=1&amp;id=1&amp;modid=site_errors">'.get_string('logs').'</a>)';
                     }
@@ -2837,36 +2883,38 @@
  */
 //we pass a new parameter (is_lams) so it will be useful for lams navigation
 function print_header_simple($title='', $heading='', $navigation='', $focus='', $meta='',
-                       $cache=true, $button='&nbsp;', $menu='', $usexml=false, $bodytags='', $return=false,$is_lams=null) {
+			     $cache=true, $button='&nbsp;', $menu='', $usexml=false, $bodytags='', $return=false, $is_lams=null) {
 
     global $COURSE, $CFG;
+
     //If is lams don't print top navigation menu (just let the header be blank)
     if($is_lams==1){
-        	print_header();
-    }else{ // print the header normally
-	    // if we have no navigation specified, build it
-	    if( empty($navigation) ){
-	       $navigation = build_navigation('');
-	    }
-	
-	    // If old style nav prepend course short name otherwise leave $navigation object alone
-	    if (!is_newnav($navigation)) {
-	        if ($COURSE->id != SITEID) {
-	            $shortname = '<a href="'.$CFG->wwwroot.'/course/view.php?id='. $COURSE->id .'">'. $COURSE->shortname .'</a> ->';
-	            $navigation = $shortname.' '.$navigation;
-	        }
-	    }
-	
-	   $output = print_header($COURSE->shortname .': '. $title, $COURSE->fullname .' '. $heading, $navigation, $focus, $meta,
-	                           $cache, $button, $menu, $usexml, $bodytags, true);
-	
-	
-	    if ($return) {
-	        return $output;
-	    } else {
-	        echo $output;
-	    }
-  }
+      print_header();
+    } else { // print the header normally
+
+      // if we have no navigation specified, build it
+
+      if( empty($navigation) ){
+	$navigation = build_navigation('');
+      }
+
+      // If old style nav prepend course short name otherwise leave $navigation object alone
+      if (!is_newnav($navigation)) {
+        if ($COURSE->id != SITEID) {
+	  $shortname = '<a href="'.$CFG->wwwroot.'/course/view.php?id='. $COURSE->id .'">'. $COURSE->shortname .'</a> ->';
+	  $navigation = $shortname.' '.$navigation;
+        }
+      }
+
+      $output = print_header($COURSE->shortname .': '. $title, $COURSE->fullname .' '. $heading, $navigation, $focus, $meta,
+                           $cache, $button, $menu, $usexml, $bodytags, true);
+
+      if ($return) {
+	  return $output;
+      } else {
+         echo $output;
+      }
+    }
 }
 
 
@@ -2882,113 +2930,113 @@
  * @param boolean $return output as string
  * @return mixed string or void
  */
-//we pass a new parameter (is_lams) so it will be useful for lams navigation
 function print_footer($course=NULL, $usercourse=NULL, $return=false,$is_lams=null) {
-//If is lams don't print bottom navigation menu, else, print it normally
- if($is_lams!=1){
-	    global $USER, $CFG, $THEME, $COURSE;
-	    if (defined('ADMIN_EXT_HEADER_PRINTED') and !defined('ADMIN_EXT_FOOTER_PRINTED')) {
-	        admin_externalpage_print_footer();
-	        return;
-	    }
-	
-	/// Course links or special footer
-	    if ($course) {
-	        if ($course === 'empty') {
-	            // special hack - sometimes we do not want even the docs link in footer
-	            $output = '';
-	            if (!empty($THEME->open_header_containers)) {
-	                for ($i=0; $i<$THEME->open_header_containers; $i++) {
-	                    $output .= print_container_end_all(); // containers opened from header
-	                }
-	            } else {
-	                //1.8 theme compatibility
-	                $output .= "\n</div>"; // content div
-	            }
-	            $output .= "\n</div>\n</body>\n</html>"; // close page div started in header
-	            if ($return) {
-	                return $output;
-	            } else {
-	                echo $output;
-	                return;
-	            }
-	
-	        } else if ($course === 'none') {          // Don't print any links etc
-	            $homelink = '';
-	            $loggedinas = '';
-	            $home  = false;
-	
-	        } else if ($course === 'home') {   // special case for site home page - please do not remove
-	            $course = get_site();
-	            $homelink  = '<div class="sitelink">'.
-	               '<a title="Moodle '. $CFG->release .'" href="http://moodle.org/">'.
-	               '<img style="width:100px;height:30px" src="pix/moodlelogo.gif" alt="moodlelogo" /></a></div>';
-	            $home  = true;
-	
-	        } else {
-	            $homelink = '<div class="homelink"><a '.$CFG->frametarget.' href="'.$CFG->wwwroot.
-	                        '/course/view.php?id='.$course->id.'">'.format_string($course->shortname).'</a></div>';
-	            $home  = false;
-	        }
-	
-	    } else {
-	        $course = get_site();  // Set course as site course by default
-	        $homelink = '<div class="homelink"><a '.$CFG->frametarget.' href="'.$CFG->wwwroot.'/">'.get_string('home').'</a></div>';
-	        $home  = false;
-	    }
-	
-	/// Set up some other navigation links (passed from print_header by ugly hack)
-	    $menu        = isset($THEME->menu) ? str_replace('navmenu', 'navmenufooter', $THEME->menu) : '';
-	    $title       = isset($THEME->title) ? $THEME->title : '';
-	    $button      = isset($THEME->button) ? $THEME->button : '';
-	    $heading     = isset($THEME->heading) ? $THEME->heading : '';
-	    $navigation  = isset($THEME->navigation) ? $THEME->navigation : '';
-	    $navmenulist = isset($THEME->navmenulist) ? $THEME->navmenulist : '';
-	
-	
-	/// Set the user link if necessary
-	    if (!$usercourse and is_object($course)) {
-	        $usercourse = $course;
-	    }
-	
-	    if (!isset($loggedinas)) {
-	        $loggedinas = user_login_string($usercourse, $USER);
-	    }
-	
-	    if ($loggedinas == $menu) {
-	        $menu = '';
-	    }
-	
-	/// there should be exactly the same number of open containers as after the header
-	    if ($THEME->open_header_containers != open_containers()) {
-	        debugging('Unexpected number of open containers: '.open_containers().', expecting '.$THEME->open_header_containers, DEBUG_DEVELOPER);
-	    }
-	
-	/// Provide some performance info if required
-	    $performanceinfo = '';
-	    if (defined('MDL_PERF') || (!empty($CFG->perfdebug) and $CFG->perfdebug > 7)) {
-	        $perf = get_performance_info();
-	        if (defined('MDL_PERFTOLOG') && !function_exists('register_shutdown_function')) {
-	            error_log("PERF: " . $perf['txt']);
-	        }
-	        if (defined('MDL_PERFTOFOOT') || debugging() || $CFG->perfdebug > 7) {
-	            $performanceinfo = $perf['html'];
-	        }
-	    }
-	
-	/// Include the actual footer file
-	
-	    ob_start();
-	    include($CFG->footer);
-	    $output = ob_get_contents();
-	    ob_end_clean();
-	
-	    if ($return) {
-	        return $output;
-	    } else {
-	        echo $output;
-	    }
-	}
+
+  if($is_lams!=1){
+    global $USER, $CFG, $THEME, $COURSE;
+
+    if (defined('ADMIN_EXT_HEADER_PRINTED') and !defined('ADMIN_EXT_FOOTER_PRINTED')) {
+        admin_externalpage_print_footer();
+        return;
+    }
+
+/// Course links or special footer
+    if ($course) {
+        if ($course === 'empty') {
+            // special hack - sometimes we do not want even the docs link in footer
+            $output = '';
+            if (!empty($THEME->open_header_containers)) {
+                for ($i=0; $i<$THEME->open_header_containers; $i++) {
+                    $output .= print_container_end_all(); // containers opened from header
+                }
+            } else {
+                //1.8 theme compatibility
+                $output .= "\n</div>"; // content div
+            }
+            $output .= "\n</div>\n</body>\n</html>"; // close page div started in header
+            if ($return) {
+                return $output;
+            } else {
+                echo $output;
+                return;
+            }
+
+        } else if ($course === 'none') {          // Don't print any links etc
+            $homelink = '';
+            $loggedinas = '';
+            $home  = false;
+
+        } else if ($course === 'home') {   // special case for site home page - please do not remove
+            $course = get_site();
+            $homelink  = '<div class="sitelink">'.
+               '<a title="Moodle '. $CFG->release .'" href="http://moodle.org/">'.
+               '<img style="width:100px;height:30px" src="pix/moodlelogo.gif" alt="moodlelogo" /></a></div>';
+            $home  = true;
+
+        } else {
+            $homelink = '<div class="homelink"><a '.$CFG->frametarget.' href="'.$CFG->wwwroot.
+                        '/course/view.php?id='.$course->id.'">'.format_string($course->shortname).'</a></div>';
+            $home  = false;
+        }
+
+    } else {
+        $course = get_site();  // Set course as site course by default
+        $homelink = '<div class="homelink"><a '.$CFG->frametarget.' href="'.$CFG->wwwroot.'/">'.get_string('home').'</a></div>';
+        $home  = false;
+    }
+
+/// Set up some other navigation links (passed from print_header by ugly hack)
+    $menu        = isset($THEME->menu) ? str_replace('navmenu', 'navmenufooter', $THEME->menu) : '';
+    $title       = isset($THEME->title) ? $THEME->title : '';
+    $button      = isset($THEME->button) ? $THEME->button : '';
+    $heading     = isset($THEME->heading) ? $THEME->heading : '';
+    $navigation  = isset($THEME->navigation) ? $THEME->navigation : '';
+    $navmenulist = isset($THEME->navmenulist) ? $THEME->navmenulist : '';
+
+
+/// Set the user link if necessary
+    if (!$usercourse and is_object($course)) {
+        $usercourse = $course;
+    }
+
+    if (!isset($loggedinas)) {
+        $loggedinas = user_login_string($usercourse, $USER);
+    }
+
+    if ($loggedinas == $menu) {
+        $menu = '';
+    }
+
+/// there should be exactly the same number of open containers as after the header
+    if ($THEME->open_header_containers != open_containers()) {
+        debugging('Unexpected number of open containers: '.open_containers().', expecting '.$THEME->open_header_containers, DEBUG_DEVELOPER);
+    }
+
+/// Provide some performance info if required
+    $performanceinfo = '';
+    if (defined('MDL_PERF') || (!empty($CFG->perfdebug) and $CFG->perfdebug > 7)) {
+        $perf = get_performance_info();
+        if (defined('MDL_PERFTOLOG') && !function_exists('register_shutdown_function')) {
+            error_log("PERF: " . $perf['txt']);
+        }
+        if (defined('MDL_PERFTOFOOT') || debugging() || $CFG->perfdebug > 7) {
+            $performanceinfo = $perf['html'];
+        }
+    }
+
+/// Include the actual footer file
+
+    ob_start();
+    include($CFG->footer);
+    $output = ob_get_contents();
+    ob_end_clean();
+
+    if ($return) {
+        return $output;
+    } else {
+        echo $output;
+    }
+  }
 }
 
 /**
@@ -3604,9 +3652,9 @@
  *
  * @uses $CFG
  * @param mixed $navigation The breadcrumb navigation string to be printed
- * @param string $separator The breadcrumb trail separator. The default 0 leads to the use
- *  of $THEME->rarrow, themes could use '&rarr;', '/', or '' for a style-sheet solution.
+ * @param string $separator OBSOLETE, mostly not used any more. See build_navigation instead.
  * @param boolean $return False to echo the breadcrumb string (default), true to return it.
+ * @return string or null, depending on $return.
  */
 function print_navigation ($navigation, $separator=0, $return=false) {
     global $CFG, $THEME;
@@ -3666,9 +3714,9 @@
             $url   = $navitem['url'];
 
             if (empty($url)) {
-                $output .= '<li class="first">'."$separator $title</li>\n";
+                $output .= '<li>'."$separator $title</li>\n";
             } else {
-                $output .= '<li class="first">'."$separator\n<a ".$CFG->frametarget.' onclick="this.target=\''.$CFG->framename.'\'" href="'
+                $output .= '<li>'."$separator\n<a ".$CFG->frametarget.' onclick="this.target=\''.$CFG->framename.'\'" href="'
                            .$url.'">'."$title</a>\n</li>\n";
             }
         }
@@ -3821,7 +3869,7 @@
         if (!is_array($navlink)) {
             continue;
         }
-        if ($navlink['type'] == 'activity' && !$last && $hideactivitylink) {
+        if (!empty($navlink['type']) && $navlink['type'] == 'activity' && !$last && $hideactivitylink) {
             continue;
         }
         $navigation .= '<li class="first">';
@@ -4240,7 +4288,7 @@
     $output .= '<div>';
     if ($options) {
         foreach ($options as $name => $value) {
-            $output .= '<input type="hidden" name="'. $name .'" value="'. s($value).'" />';
+            $output .= '<input type="hidden" name="'. $name .'" value="'. s($value) .'" />';
         }
     }
     if ($tooltip) {
@@ -4340,19 +4388,18 @@
 /**
  * Print the specified user's avatar.
  *
- * If you pass a $user object that has id, picture, imagealt, firstname, lastname
- * you save a DB query.
- *
- * @param int $user takes a userid, or a userobj
- * @param int $courseid ?
- * @param boolean $picture Print the user picture?
- * @param int $size Size in pixels.  Special values are (true/1 = 100px) and (false/0 = 35px) for backward compatability
+ * @param mixed $user Should be a $user object with at least fields id, picture, imagealt, firstname, lastname
+ *      If any of these are missing, or if a userid is passed, the the database is queried. Avoid this
+ *      if at all possible, particularly for reports. It is very bad for performance.
+ * @param int $courseid The course id. Used when constructing the link to the user's profile.
+ * @param boolean $picture The picture to print. By default (or if NULL is passed) $user->picture is used.
+ * @param int $size Size in pixels. Special values are (true/1 = 100px) and (false/0 = 35px) for backward compatability
  * @param boolean $return If false print picture to current page, otherwise return the output as string
- * @param boolean $link Enclose printed image in a link to view specified course?
- * @param string $target link target attribute
- * @param boolean $alttext use username or userspecified text in image alt attribute
- * return string
- * @todo Finish documenting this function
+ * @param boolean $link enclose printed image in a link the user's profile (default true).
+ * @param string $target link target attribute. Makes the profile open in a popup window.
+ * @param boolean $alttext add non-blank alt-text to the image. (Default true, set to false for purely
+ *      decorative images, or where the username will be printed anyway.)
+ * @return string or nothing, depending on $return.
  */
 function print_user_picture($user, $courseid, $picture=NULL, $size=0, $return=false, $link=true, $target='', $alttext=true) {
     global $CFG;
@@ -4411,7 +4458,7 @@
     }
     $class = "userpicture";
 
-    if (is_null($picture)) {
+    if (is_null($picture) and !empty($user->picture)) {
         $picture = $user->picture;
     }
 
@@ -4463,7 +4510,9 @@
 
     $context = get_context_instance(CONTEXT_COURSE, $course->id);
     if (isset($user->context->id)) {
-        $usercontext = get_context_instance_by_id($user->context->id);
+        $usercontext = $user->context;
+    } else {
+        $usercontext = get_context_instance(CONTEXT_USER, $user->id);
     }
 
     if (empty($string)) {     // Cache all the strings for the rest of the page
@@ -4543,12 +4592,11 @@
         $output .= '<a href="'.$CFG->wwwroot.'/blog/index.php?userid='.$user->id.'">'.get_string('blogs','blog').'</a><br />';
     }
     //link to notes
-    if (has_capability('moodle/notes:manage', $context) || has_capability('moodle/notes:view', $context)) {
+    if (!empty($CFG->enablenotes) and (has_capability('moodle/notes:manage', $context) || has_capability('moodle/notes:view', $context))) {
         $output .= '<a href="'.$CFG->wwwroot.'/notes/index.php?course=' . $course->id. '&amp;user='.$user->id.'">'.get_string('notes','notes').'</a><br />';
     }
 
-    if (has_capability('moodle/user:viewuseractivitiesreport', $context) || (isset($usercontext) && has_capability('moodle/user:viewuseractivitiesreport', $usercontext))) {
-        $timemidnight = usergetmidnight(time());
+    if (has_capability('moodle/site:viewreports', $context) or has_capability('moodle/user:viewuseractivitiesreport', $usercontext)) {
         $output .= '<a href="'. $CFG->wwwroot .'/course/user.php?id='. $course->id .'&amp;user='. $user->id .'">'. $string->activity .'</a><br />';
     }
     if (has_capability('moodle/role:assign', $context) and get_user_roles($context, $user->id, false)) {  // I can unassing and user has some role
@@ -4899,7 +4947,7 @@
 
             }
             $str .= ($scriptcount < 1) ? '<script type="text/javascript" src="'.
-                    $CFG->httpswwwroot .'/lib/editor/htmlarea/lang/en.php"></script>'."\n" : '';
+                    $CFG->httpswwwroot .'/lib/editor/htmlarea/lang/en.php?id='.$courseid.'"></script>'."\n" : '';
             $scriptcount++;
 
             if ($height) {    // Usually with legacy calls
@@ -5184,63 +5232,6 @@
 }
 
 /**
- * Prints the editing button on a category page
- *
- * @uses $CFG
- * @uses $USER
- * @param int $categoryid ?
- * @return string
- * @todo Finish documenting this function
- */
-function update_category_button($categoryid) {
-    global $CFG, $USER;
-
-    if (has_capability('moodle/category:update', get_context_instance(CONTEXT_COURSECAT, $categoryid))) {
-        if (!empty($USER->categoryediting)) {
-            $string = get_string('turneditingoff');
-            $edit = 'off';
-        } else {
-            $string = get_string('turneditingon');
-            $edit = 'on';
-        }
-
-        return "<form $CFG->frametarget method=\"get\" action=\"$CFG->wwwroot/course/category.php\">".
-               '<div>'.
-               "<input type=\"hidden\" name=\"id\" value=\"$categoryid\" />".
-               "<input type=\"hidden\" name=\"categoryedit\" value=\"$edit\" />".
-               "<input type=\"hidden\" name=\"sesskey\" value=\"$USER->sesskey\" />".
-               "<input type=\"submit\" value=\"$string\" /></div></form>";
-    }
-}
-
-/**
- * Prints the editing button on categories listing
- *
- * @uses $CFG
- * @uses $USER
- * @return string
- */
-function update_categories_button() {
-    global $CFG, $USER;
-
-    if (has_capability('moodle/category:update', get_context_instance(CONTEXT_SYSTEM))) {
-        if (!empty($USER->categoryediting)) {
-            $string = get_string('turneditingoff');
-            $categoryedit = 'off';
-        } else {
-            $string = get_string('turneditingon');
-            $categoryedit = 'on';
-        }
-
-        return "<form $CFG->frametarget method=\"get\" action=\"$CFG->wwwroot/course/index.php\">".
-               '<div>'.
-               '<input type="hidden" name="categoryedit" value="'. $categoryedit .'" />'.
-               '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />'.
-               '<input type="submit" value="'. $string .'" /></div></form>';
-    }
-}
-
-/**
  * Prints the editing button on search results listing
  * For bulk move courses to another category
  */
@@ -5249,7 +5240,7 @@
     global $CFG, $USER;
 
     // not sure if this capability is the best  here
-    if (has_capability('moodle/category:update', get_context_instance(CONTEXT_SYSTEM))) {
+    if (has_capability('moodle/category:manage', get_context_instance(CONTEXT_SYSTEM))) {
         if (!empty($USER->categoryediting)) {
             $string = get_string("turneditingoff");
             $edit = "off";
@@ -5391,7 +5382,7 @@
     }
     //Accessibility: added Alt text, replaced &gt; &lt; with 'silent' character and 'accesshide' text.
 
-    if ($selectmod and has_capability('moodle/site:viewreports', $context)) {
+    if ($selectmod and has_capability('coursereport/log:view', $context)) {
         $logstext = get_string('alllogs');
         $logslink = '<li>'."\n".'<a title="'.$logstext.'" '.
                     $CFG->frametarget.'onclick="this.target=\''.$CFG->framename.'\';"'.' href="'.
@@ -5498,7 +5489,7 @@
             $mod->name = '('.$mod->name.')';
         }
         $class = 'activity '.$mod->modname;
-        $class .= ($cmid == $mod->cm) ? ' selected' : '';
+        $class .= ($cmid == $mod->id) ? ' selected' : '';
         $menu[] = '<li class="'.$class.'">'.
                   '<img src="'.$CFG->modpixpath.'/'.$mod->modname.'/icon.gif" alt="" />'.
                   '<a href="'.$CFG->wwwroot.'/mod/'.$url.'">'.$mod->name.'</a></li>';
@@ -5537,10 +5528,24 @@
     for ($i=1970; $i<=2020; $i++) {
         $years[$i] = $i;
     }
-    return choose_from_menu($days,   $day,   $currentdate['mday'], '', '', '0', $return)
-          .choose_from_menu($months, $month, $currentdate['mon'],  '', '', '0', $return)
-          .choose_from_menu($years,  $year,  $currentdate['year'], '', '', '0', $return);
 
+    // Build or print result
+    $result='';
+    // Note: There should probably be a fieldset around these fields as they are
+    // clearly grouped. However this causes problems with display. See Mozilla
+    // bug 474415
+    $result.='<label class="accesshide" for="menu'.$day.'">'.get_string('day','form').'</label>';
+    $result.=choose_from_menu($days,   $day,   $currentdate['mday'], '', '', '0', true);
+    $result.='<label class="accesshide" for="menu'.$month.'">'.get_string('month','form').'</label>';
+    $result.=choose_from_menu($months, $month, $currentdate['mon'],  '', '', '0', true);
+    $result.='<label class="accesshide" for="menu'.$year.'">'.get_string('year','form').'</label>';
+    $result.=choose_from_menu($years,  $year,  $currentdate['year'], '', '', '0', true);
+
+    if ($return) {
+        return $result;
+    } else {
+        echo $result;
+    }
 }
 
 /**
@@ -5568,8 +5573,21 @@
         $minutes[$i] = sprintf("%02d",$i);
     }
 
-    return choose_from_menu($hours,   $hour,   $currentdate['hours'],   '','','0',$return)
-          .choose_from_menu($minutes, $minute, $currentdate['minutes'], '','','0',$return);
+    // Build or print result
+    $result='';
+    // Note: There should probably be a fieldset around these fields as they are
+    // clearly grouped. However this causes problems with display. See Mozilla
+    // bug 474415
+    $result.='<label class="accesshide" for="menu'.$hour.'">'.get_string('hour','form').'</label>';
+    $result.=choose_from_menu($hours,   $hour,   $currentdate['hours'],   '','','0',true);
+    $result.='<label class="accesshide" for="menu'.$minute.'">'.get_string('minute','form').'</label>';
+    $result.=choose_from_menu($minutes, $minute, $currentdate['minutes'], '','','0',true);
+
+    if ($return) {
+        return $result;
+    } else {
+        echo $result;
+    }
 }
 
 /**
@@ -6296,9 +6314,9 @@
         if ($page > 0) {
             $pagenum = $page - 1;
             if (!is_a($baseurl, 'moodle_url')){
-                $output .= '&nbsp;(<a href="'. $baseurl . $pagevar .'='. $pagenum .'">'. get_string('previous') .'</a>)&nbsp;';
+                $output .= '&nbsp;(<a class="previous" href="'. $baseurl . $pagevar .'='. $pagenum .'">'. get_string('previous') .'</a>)&nbsp;';
             } else {
-                $output .= '&nbsp;(<a href="'. $baseurl->out(false, array($pagevar => $pagenum)).'">'. get_string('previous') .'</a>)&nbsp;';
+                $output .= '&nbsp;(<a class="previous" href="'. $baseurl->out(false, array($pagevar => $pagenum)).'">'. get_string('previous') .'</a>)&nbsp;';
             }
         }
         if ($perpage > 0) {
@@ -6344,9 +6362,9 @@
         $pagenum = $page + 1;
         if ($pagenum != $displaypage) {
             if (!is_a($baseurl, 'moodle_url')){
-                $output .= '&nbsp;&nbsp;(<a href="'. $baseurl . $pagevar .'='. $pagenum .'">'. get_string('next') .'</a>)';
+                $output .= '&nbsp;&nbsp;(<a class="next" href="'. $baseurl . $pagevar .'='. $pagenum .'">'. get_string('next') .'</a>)';
             } else {
-                $output .= '&nbsp;&nbsp;(<a href="'. $baseurl->out(false, array($pagevar => $pagenum)) .'">'. get_string('next') .'</a>)';
+                $output .= '&nbsp;&nbsp;(<a class="next" href="'. $baseurl->out(false, array($pagevar => $pagenum)) .'">'. get_string('next') .'</a>)';
             }
         }
         $output .= '</div>';
@@ -6627,7 +6645,7 @@
     global $CFG, $SITE;
 
     $CFG->pagepath = "index.php";
-    print_er(strip_tags($SITE->fullname), $SITE->fullname, 'home');
+    print_header(strip_tags($SITE->fullname), $SITE->fullname, 'home');
     print_box_start();
     print_heading(get_string('sitemaintenance', 'admin'));
     @include($CFG->dataroot.'/1/maintenance.html');
@@ -6760,7 +6778,6 @@
 
         $str .= ' </li>'."\n";
     }
-
     $str .= '</ul>'."\n";
 
     return $str;
@@ -7075,6 +7092,18 @@
     return ($inpopup);
 }
 
+/**
+ * Return the authentication plugin title
+ * @param string $authtype plugin type
+ * @return string
+ */
+function auth_get_plugin_title ($authtype) {
+    $authtitle = get_string("auth_{$authtype}title", "auth");
+    if ($authtitle == "[[auth_{$authtype}title]]") {
+        $authtitle = get_string("auth_{$authtype}title", "auth_{$authtype}");
+    }
+    return $authtitle;
+}
 
 // vim:autoindent:expandtab:shiftwidth=4:tabstop=4:tw=140:
 ?>
Index: temp_moodle_dev/moodle/mod/assignment/db/install.xml
===================================================================
diff -u -ra946025b26bf52fbe48ccea47512518c75ca949d -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/assignment/db/install.xml	(.../install.xml)	(revision a946025b26bf52fbe48ccea47512518c75ca949d)
+++ temp_moodle_dev/moodle/mod/assignment/db/install.xml	(.../install.xml)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -25,7 +25,7 @@
         <FIELD NAME="timeavailable" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="timedue" NEXT="grade"/>
         <FIELD NAME="grade" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="false" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="timeavailable" NEXT="timemodified"/>
         <FIELD NAME="timemodified" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="grade" NEXT="is_lams"/>
-		<FIELD NAME="is_lams" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="timemodified" />
+        <FIELD NAME="is_lams" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="timemodified" />
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" />
Index: temp_moodle_dev/moodle/mod/assignment/lib.php
===================================================================
diff -u -r131131dc3214e15aed22c1940965e7ccdbfc05ce -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/assignment/lib.php	(.../lib.php)	(revision 131131dc3214e15aed22c1940965e7ccdbfc05ce)
+++ temp_moodle_dev/moodle/mod/assignment/lib.php	(.../lib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -97,22 +97,22 @@
      * This in turn calls the methods producing individual parts of the page
      */
     function view() {
+
         $context = get_context_instance(CONTEXT_MODULE,$this->cm->id);
         require_capability('mod/assignment:view', $context);
 
         add_to_log($this->course->id, "assignment", "view", "view.php?id={$this->cm->id}",
                    $this->assignment->id, $this->cm->id);
-		
-	    $this->view_header();
-	
-	    $this->view_intro();
-	
-	    $this->view_dates();
-	
-	    $this->view_feedback();
-	
-	    $this->view_footer();
-		
+
+        $this->view_header();
+
+        $this->view_intro();
+
+        $this->view_dates();
+
+        $this->view_feedback();
+
+        $this->view_footer();
     }
 
     /**
@@ -126,29 +126,35 @@
      * @param $subpage string Description of subpage to be used in navigation trail
      */
     function view_header($subpage='') {
-		
+
         global $CFG;
-		
+
+
         if ($subpage) {
             $navigation = build_navigation($subpage, $this->cm);
         } else {
             $navigation = build_navigation('', $this->cm);
         }
-        //lams: if is a lams sequence don't display the moodle's navigation menus
-		if($this->cm->is_lams==1){
-			 print_header($this->pagetitle, '', '', '', '',
-	                     true, update_module_button($this->cm->id, $this->course->id, $this->strassignment));
-		}else{
-	        print_header($this->pagetitle, $this->course->fullname, $navigation, '', '',
-	                     true, update_module_button($this->cm->id, $this->course->id, $this->strassignment),
-	                     navmenu($this->course, $this->cm));
-		}
-		
+
+	//lams: if is a lams sequence don't display the moodle's navigation menus
+	if($this->cm->is_lams==1){
+		print_header($this->pagetitle, '', '', '', '',
+			true, update_module_button($this->cm->id, $this->course->id, $this->strassignment));
+	}else{
+		print_header($this->pagetitle, $this->course->fullname, $navigation, '', '',
+		true, update_module_button($this->cm->id, $this->course->id, $this->strassignment),
+		navmenu($this->course, $this->cm));
+	}
+	
+
+        print_header($this->pagetitle, $this->course->fullname, $navigation, '', '',
+                     true, update_module_button($this->cm->id, $this->course->id, $this->strassignment),
+                     navmenu($this->course, $this->cm));
+
         groups_print_activity_menu($this->cm, 'view.php?id=' . $this->cm->id);
 
         echo '<div class="reportlink">'.$this->submittedlink().'</div>';
         echo '<div class="clearer"></div>';
-        
     }
 
 
@@ -199,8 +205,8 @@
      * This will be suitable for most assignment types
      */
     function view_footer() {
-        //we pass a new parameter to the function so it won't we printed if is_lams=1
-        print_footer($this->course,null, false,$this->cm->is_lams);
+	//we pass a new parameter to the function so it won't we printed if is_lams=1
+	print_footer($this->course,null, false,$this->cm->is_lams);
     }
 
     /**
@@ -2853,6 +2859,8 @@
         return;
     }
 
+    $assignmentids = array();
+
     // Do assignment_base::isopen() here without loading the whole thing for speed
     foreach ($assignments as $key => $assignment) {
         $time = time();
@@ -2865,9 +2873,16 @@
         }
         if (empty($isopen) || empty($assignment->timedue)) {
             unset($assignments[$key]);
+        }else{
+            $assignmentids[] = $assignment->id;
         }
     }
 
+    if(empty($assignmentids)){
+        // no assigments to look at - we're done
+        return true;
+    }
+
     $strduedate = get_string('duedate', 'assignment');
     $strduedateno = get_string('duedateno', 'assignment');
     $strgraded = get_string('graded', 'assignment');
@@ -2877,6 +2892,29 @@
     $strassignment = get_string('modulename', 'assignment');
     $strreviewed = get_string('reviewed','assignment');
 
+
+    // NOTE: we do all possible database work here *outside* of the loop to ensure this scales 
+    
+    // build up and array of unmarked submissions indexed by assigment id/ userid
+    // for use where the user has grading rights on assigment
+    $rs = get_recordset_sql("SELECT id, assignment, userid 
+                            FROM {$CFG->prefix}assignment_submissions
+                            WHERE teacher = 0 AND timemarked = 0
+                            AND assignment IN (". implode(',', $assignmentids).")");
+
+    $unmarkedsubmissions = array();
+    while ($ra = rs_fetch_next_record($rs)) {
+        $unmarkedsubmissions[$ra->assignment][$ra->userid] = $ra->id;
+    }
+    rs_close($rs);
+
+
+    // get all user submissions, indexed by assigment id
+    $mysubmissions = get_records_sql("SELECT assignment, timemarked, teacher, grade
+                                      FROM {$CFG->prefix}assignment_submissions 
+                                      WHERE userid = {$USER->id} AND 
+                                      assignment IN (".implode(',', $assignmentids).")");
+
     foreach ($assignments as $assignment) {
         $str = '<div class="assignment overview"><div class="name">'.$strassignment. ': '.
                '<a '.($assignment->visible ? '':' class="dimmed"').
@@ -2893,13 +2931,9 @@
 
             // count how many people can submit
             $submissions = 0; // init
-            if ($students = get_users_by_capability($context, 'mod/assignment:submit', '', '', '', '', 0, '', false)) {
-                 foreach ($students as $student) {
-                    if (record_exists_sql("SELECT id FROM {$CFG->prefix}assignment_submissions
-                                           WHERE assignment = $assignment->id AND
-                                               userid = $student->id AND
-                                               teacher = 0 AND
-                                               timemarked = 0")) {
+            if ($students = get_users_by_capability($context, 'mod/assignment:submit', 'u.id', '', '', '', 0, '', false)) {
+                foreach($students as $student){
+                    if(isset($unmarkedsubmissions[$assignment->id][$student->id])){
                         $submissions++;
                     }
                 }
@@ -2909,11 +2943,10 @@
                 $str .= get_string('submissionsnotgraded', 'assignment', $submissions);
             }
         } else {
-            $sql = "SELECT *
-                      FROM {$CFG->prefix}assignment_submissions
-                     WHERE userid = '$USER->id'
-                       AND assignment = '{$assignment->id}'";
-            if ($submission = get_record_sql($sql)) {
+            if(isset($mysubmissions[$assignment->id])){
+
+                $submission = $mysubmissions[$assignment->id];
+
                 if ($submission->teacher == 0 && $submission->timemarked == 0) {
                     $str .= $strsubmitted . ', ' . $strnotgradedyet;
                 } else if ($submission->grade <= 0) {
Index: temp_moodle_dev/moodle/mod/assignment/type/upload/assignment.class.php
===================================================================
diff -u -rb23a5fa240830bd2c8926c09a902e37397c721b2 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/assignment/type/upload/assignment.class.php	(.../assignment.class.php)	(revision b23a5fa240830bd2c8926c09a902e37397c721b2)
+++ temp_moodle_dev/moodle/mod/assignment/type/upload/assignment.class.php	(.../assignment.class.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -17,7 +17,7 @@
 
     function view() {
         global $USER;
-   
+
         require_capability('mod/assignment:view', $this->context);
 
         add_to_log($this->course->id, 'assignment', 'view', "view.php?id={$this->cm->id}", $this->assignment->id, $this->cm->id);
@@ -50,7 +50,6 @@
 
             if ($filecount and $submission) {
                 print_simple_box($this->print_user_files($USER->id, true), 'center');
-
             } else {
                 if (!$this->isopen() or $this->is_finalized($submission)) {
                     print_simple_box(get_string('nofiles', 'assignment'), 'center');
@@ -59,7 +58,8 @@
                 }
             }
 
-            $saved=$this->view_upload_form();
+            $this->view_upload_form();
+	    $saved=$this->view_upload_form();
 
             if ($this->notes_allowed()) {
                 print_heading(get_string('notes', 'assignment'), '', 3);
@@ -68,15 +68,14 @@
 
             $this->view_final_submission();
         }
-  
         $this->view_footer();
     }
 
 
     function view_feedback($submission=NULL) {
         global $USER, $CFG;
         require_once($CFG->libdir.'/gradelib.php');
-		
+
         if (!$submission) { /// Get submission for this assignment
             $submission = $this->get_submission($USER->id);
         }
@@ -181,7 +180,7 @@
             echo '</div>';
             echo '<br />';
         }
-    
+
     }
 
     function view_notes() {
@@ -205,6 +204,7 @@
         global $CFG, $USER;
 
         $submission = $this->get_submission($USER->id);
+
         if ($this->isopen() and $this->can_finalize($submission)) {
             //print final submit button
             print_heading(get_string('submitformarking','assignment'), '', 3);
@@ -247,7 +247,7 @@
         $mode         = optional_param('mode', '', PARAM_ALPHA);
         $offset       = optional_param('offset', 0, PARAM_INT);
         $forcerefresh = optional_param('forcerefresh', 0, PARAM_BOOL);
-		
+
         $output = get_string('responsefiles', 'assignment').': ';
 
         $output .= '<form enctype="multipart/form-data" method="post" '.
@@ -283,7 +283,7 @@
 
     function print_student_answer($userid, $return=false){
         global $CFG;
-   
+
         $filearea = $this->file_area_name($userid);
         $submission = $this->get_submission($userid);
 
@@ -328,7 +328,7 @@
 
         $mode    = optional_param('mode', '', PARAM_ALPHA);
         $offset  = optional_param('offset', 0, PARAM_INT);
-     
+
         if (!$userid) {
             if (!isloggedin()) {
                 return '';
@@ -447,6 +447,7 @@
 
     function upload() {
         $action = required_param('action', PARAM_ALPHA);
+
         switch ($action) {
             case 'finalize':
                 $this->finalize();
@@ -458,7 +459,7 @@
                 $this->unfinalize();
                 break;
             case 'uploadresponse':
-                $this->upload_responsefile();	
+                $this->upload_responsefile();
                 break;
             case 'uploadfile':
                 $this->upload_file();
@@ -571,7 +572,7 @@
 
         $returnurl = 'view.php?id='.$this->cm->id;
 
-        //$filecount = $this->count_user_files($USER->id);
+	// $filecount = $this->count_user_files($USER->id);
         $submission = $this->get_submission($USER->id);
 
         if (!$this->can_upload_file($submission)) {
@@ -587,19 +588,19 @@
 
         require_once($CFG->dirroot.'/lib/uploadlib.php');
         $um = new upload_manager('newfile',false,true,$this->course,false,$this->assignment->maxbytes,true);
-		
+
         if ($um->process_file_uploads($dir)) {
             $submission = $this->get_submission($USER->id, true); //create new submission if needed
             $updated = new object();
             $updated->id           = $submission->id;
-            //lams: store in the database the number of files submitted
+	    //lams: store in the database the number of files submitted
             $filecount = $this->count_user_files($USER->id);
-            $updated->numfiles = $filecount;
+	    $updated->numfiles = $filecount;
             $updated->timemodified = time();
 
             if (update_record('assignment_submissions', $updated)) {
-	            //lams: add 'saved' variable so lams can recognize if the student have uploaded a file	
-	            $saved=1;
+		//lams: add 'saved' variable so lams can recognize if the student have uploaded a file 
+		$saved=1;
                 add_to_log($this->course->id, 'assignment', 'upload',
                         'view.php?a='.$this->assignment->id, $this->assignment->id, $this->cm->id);
                 $submission = $this->get_submission($USER->id);
@@ -615,8 +616,9 @@
                 $this->view_footer();
                 die;
             }
-             //lams: add 'saved' variable so lams can recognize if the student have uploaded a file	
-            redirect('view.php?id='.$this->cm->id.'&saved='.$saved);
+            redirect('view.php?id='.$this->cm->id);
+	    //lams: add 'saved' variable so lams can recognize if the student have uploaded a file   
+	    redirect('view.php?id='.$this->cm->id.'&saved='.$saved);
         }
         $this->view_header(get_string('upload'));
         notify(get_string('uploaderror', 'assignment'));
@@ -628,6 +630,7 @@
 
     function finalize() {
         global $USER;
+
         $confirm    = optional_param('confirm', 0, PARAM_BOOL);
         $returnurl  = 'view.php?id='.$this->cm->id;
         $submission = $this->get_submission($USER->id);
Index: temp_moodle_dev/moodle/mod/assignment/type/uploadsingle/assignment.class.php
===================================================================
diff -u -rb56427b1b10e42af5de611ed2950e111a3c2581d -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/assignment/type/uploadsingle/assignment.class.php	(.../assignment.class.php)	(revision b56427b1b10e42af5de611ed2950e111a3c2581d)
+++ temp_moodle_dev/moodle/mod/assignment/type/uploadsingle/assignment.class.php	(.../assignment.class.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -126,8 +126,8 @@
                     unset($submission->data1);  // Don't need to update this.
                     unset($submission->data2);  // Don't need to update this.
                     if (update_record("assignment_submissions", $submission)) {
-                     	//lams: add 'saved' variable so lams can recognize if the student have uploaded a file	
-	            		$saved=1;
+			//lams: add 'saved' variable so lams can recognize if the student have uploaded a file  
+			$saved=1;
                         add_to_log($this->course->id, 'assignment', 'upload',
                                 'view.php?a='.$this->assignment->id, $this->assignment->id, $this->cm->id);
                         $submission = $this->get_submission($USER->id);
@@ -142,8 +142,8 @@
                     $newsubmission->timemodified = time();
                     $newsubmission->numfiles = 1;
                     if (insert_record('assignment_submissions', $newsubmission)) {
-                    	//lams: add 'saved' variable so lams can recognize if the student have uploaded a file	
-	            		$saved=1;
+			//lams: add 'saved' variable so lams can recognize if the student have uploaded a file  
+			$saved=1;
                         add_to_log($this->course->id, 'assignment', 'upload',
                                 'view.php?a='.$this->assignment->id, $this->assignment->id, $this->cm->id);
                         $submission = $this->get_submission($USER->id);
@@ -159,8 +159,8 @@
             notify(get_string("uploaderror", "assignment")); //submitting not allowed!
         }
 
-        //lams: add 'saved' variable so lams can recognize if the student have uploaded a file	
-        redirect('view.php?id='.$this->cm->id.'&saved='.$saved);
+	//lams: add 'saved' variable so lams can recognize if the student have uploaded a file 
+	redirect('view.php?id='.$this->cm->id.'&saved='.$saved);
 
         $this->view_footer();
     }
Index: temp_moodle_dev/moodle/mod/assignment/view.php
===================================================================
diff -u -re201d0e72a54b3259cc499ad2f6f00c33eba7de0 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/assignment/view.php	(.../view.php)	(revision e201d0e72a54b3259cc499ad2f6f00c33eba7de0)
+++ temp_moodle_dev/moodle/mod/assignment/view.php	(.../view.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -5,16 +5,14 @@
  
     $id = optional_param('id', 0, PARAM_INT);  // Course Module ID
     $a  = optional_param('a', 0, PARAM_INT);   // Assignment ID
-	$editing  = optional_param('editing', 0, PARAM_INT); // 1 if editing in Lams
-	$saved  = optional_param('saved', 0, PARAM_INT); 
-	
-	
+    $editing  = optional_param('editing', 0, PARAM_INT); // 1 if editing in Lams
+    $saved  = optional_param('saved', 0, PARAM_INT); 
+
     if ($id) {
-        
         if (! $cm = get_coursemodule_from_id('assignment', $id)) {
             error("Course Module ID was incorrect");
         }
-       
+
         if (! $assignment = get_record("assignment", "id", $cm->instance)) {
             error("assignment ID was incorrect");
         }
@@ -32,25 +30,25 @@
         if (! $cm = get_coursemodule_from_instance("assignment", $assignment->id, $course->id)) {
             error("Course Module ID was incorrect");
         }
-	    
     }
+
     //if is lams display navigation buttons so you can finish uploading or go to next activity
-	if($cm->is_lams==1){
-    		if($editing==1){
-				include('showlamsfinish.php');
-			}else{
-		     	$isteacher = has_capability('mod/assignment:preview', get_context_instance(CONTEXT_MODULE, $cm->id)); // indicates if is a teacher, useful in lams
-				if($isteacher||$saved==1||$assignment->assignmenttype=="offline"){
-				       include('showlamsnext.php');
-				}
-			}
+    if($cm->is_lams==1){
+    	if($editing==1){
+		include('showlamsfinish.php');
+	}else{
+		$isteacher = has_capability('mod/assignment:preview', get_context_instance(CONTEXT_MODULE, $cm->id)); // indicates if is a teacher, useful in lams
+		if($isteacher||$saved==1||$assignment->assignmenttype=="offline"){
+			include('showlamsnext.php');
+		}
 	}
+    }
 
     require_login($course, true, $cm);
-
     require ("$CFG->dirroot/mod/assignment/type/$assignment->assignmenttype/assignment.class.php");
     $assignmentclass = "assignment_$assignment->assignmenttype";
     $assignmentinstance = new $assignmentclass($cm->id, $assignment, $cm, $course);
-    $assignmentinstance->view();   // Actually display the assignment! 
 
+    $assignmentinstance->view();   // Actually display the assignment!
+
 ?>
Index: temp_moodle_dev/moodle/mod/chat/gui_basic/index.php
===================================================================
diff -u -rdc0555177f50b0cad67cf8baec260106e770f648 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/chat/gui_basic/index.php	(.../index.php)	(revision dc0555177f50b0cad67cf8baec260106e770f648)
+++ temp_moodle_dev/moodle/mod/chat/gui_basic/index.php	(.../index.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -168,8 +168,7 @@
 
     echo '</div></div>';
 
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
-	print_footer($course,null, false,$cm->is_lams);
+    print_footer('none');
 
 
 
Index: temp_moodle_dev/moodle/mod/chat/gui_header_js/chatinput.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/chat/gui_header_js/chatinput.php	(.../chatinput.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/chat/gui_header_js/chatinput.php	(.../chatinput.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -6,11 +6,26 @@
     require('../lib.php');
 
     $chat_sid = required_param('chat_sid', PARAM_ALPHANUM);
+    $chatid   = required_param('chat_id', PARAM_INT);
 
     if (!$chatuser = get_record('chat_users', 'sid', $chat_sid)) {
         error('Not logged in!');
     }
+    if (!$chat = get_record('chat', 'id', $chatid)) {
+        error('Could not find that chat room!');
+    }
 
+    if (!$course = get_record('course', 'id', $chat->course)) {
+        error('Could not find the course this belongs to!');
+    }
+
+    if (!$cm = get_coursemodule_from_instance('chat', $chat->id, $course->id)) {
+        error('Course Module ID was incorrect');
+    }
+    
+    $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+    
+
     //Get the user theme
     $USER = get_record('user', 'id', $chatuser->userid);
 
Index: temp_moodle_dev/moodle/mod/chat/gui_header_js/index.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/chat/gui_header_js/index.php	(.../index.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/chat/gui_header_js/index.php	(.../index.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -50,7 +50,7 @@
         error('Could not log in to chat room!!');
     }
 
-    $params = "chat_sid=$chat_sid";
+    $params = "chat_id=$id&chat_sid={$chat_sid}";
 
     // fallback to the old jsupdate, but allow other update modes
     $updatemode = 'jsupdate';
Index: temp_moodle_dev/moodle/mod/chat/index.php
===================================================================
diff -u -r7a87ac7addfde23c9309be978384cc3a61f561db -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/chat/index.php	(.../index.php)	(revision 7a87ac7addfde23c9309be978384cc3a61f561db)
+++ temp_moodle_dev/moodle/mod/chat/index.php	(.../index.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -25,7 +25,7 @@
     $navlinks = array();
     $navlinks[] = array('name' => $strchats, 'link' => '', 'type' => 'activity');
     $navigation = build_navigation($navlinks);
-	//we pass a new parameter to the function so it won't we printed if is_lams=1
+
     print_header_simple($strchats, '', $navigation, '', '', true, '', navmenu($course),false,'',false,$cm->is_lams);
 
 /// Get all the appropriate data
@@ -85,7 +85,6 @@
 
 /// Finish the page
 
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
-	print_footer($course,null, false,$chat->is_lams);
+    print_footer($course,null, false,$chat->is_lams);
 
 ?>
Index: temp_moodle_dev/moodle/mod/chat/lib.php
===================================================================
diff -u -re5c2680d009c7515dc207bd000fe67ec4fc3348d -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/chat/lib.php	(.../lib.php)	(revision e5c2680d009c7515dc207bd000fe67ec4fc3348d)
+++ temp_moodle_dev/moodle/mod/chat/lib.php	(.../lib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -126,7 +126,7 @@
 
     $pagetypes = page_import_types('mod/chat/');
     foreach($pagetypes as $pagetype) {
-        if(!delete_records('block_instance', 'pageid', $chat->id, 'pagetype', $pagetype)) {
+        if(!blocks_delete_all_on_page($pagetype, $chat->id)) {
             $result = false;
         }
     }
@@ -822,6 +822,7 @@
     return array('moodle/site:accessallgroups', 'moodle/site:viewfullnames');
 }
 
+
 /**
  * LAMS Function
  * This function clones an existing instance of Moodle chat
@@ -976,4 +977,5 @@
 
 }
 
+
 ?>
Index: temp_moodle_dev/moodle/mod/chat/report.php
===================================================================
diff -u -rc19f1e00280a849c8cec7f9c2405000d54ecef28 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/chat/report.php	(.../report.php)	(revision c19f1e00280a849c8cec7f9c2405000d54ecef28)
+++ temp_moodle_dev/moodle/mod/chat/report.php	(.../report.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -40,9 +40,8 @@
 
     if ($start and $end and !$confirmdelete) {   // Show a full transcript
         $navigation = build_navigation($strchatreport, $cm);
-         //we pass a new parameter to the function so it won't we printed if is_lams=1
         print_header_simple(format_string($chat->name).": $strchatreport", '', $navigation,
-                      '', '', true, '', navmenu($course, $cm),false,'',false,$cm->is_lams);
+			    '', '', true, '', navmenu($course, $cm),false,'',false,$cm->is_lams);
 
     /// Check to see if groups are being used here
         $groupmode = groups_get_activity_groupmode($cm);
@@ -84,17 +83,15 @@
             print_continue("report.php?id=$cm->id");
         }
 
-        //we pass a new parameter to the function so it won't we printed if is_lams=1
-		print_footer($course,null, false,$cm->is_lams);
+        print_footer($course,null, false,$cm->is_lams);
         exit;
     }
 
 
 /// Print the Sessions display
     $navigation = build_navigation($strchatreport, $cm);
-     //we pass a new parameter to the function so it won't we printed if is_lams=1
     print_header_simple(format_string($chat->name).": $strchatreport", '', $navigation,
-                  '', '', true, '', navmenu($course, $cm),false,'',false,$cm->is_lams);
+			'', '', true, '', navmenu($course, $cm),false,'',false,$cm->is_lams);
 
     print_heading(format_string($chat->name).': '.get_string('sessions', 'chat'));
 
@@ -130,8 +127,7 @@
     if (empty($messages)) {   /// May have already got them above
         if (!$messages = get_records_select('chat_messages', "chatid = '$chat->id' $groupselect", "timestamp DESC")) {
             print_heading(get_string('nomessages', 'chat'));
-            //we pass a new parameter to the function so it won't we printed if is_lams=1
-			print_footer($course,null, false,$chat->is_lams);
+            print_footer($course,null, false,$chat->is_lams);
             exit;
         }
     }
@@ -199,7 +195,6 @@
     }
 
 /// Finish the page
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
-	print_footer($course,null, false,$cm->is_lams);
+     print_footer($course,null, false,$cm->is_lams);
 
 ?>
Index: temp_moodle_dev/moodle/mod/chat/version.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/chat/version.php	(.../version.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/chat/version.php	(.../version.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -5,7 +5,7 @@
 ///  This fragment is called by moodle_needs_upgrading() and /admin/index.php
 /////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2007101509;   // The (date) version of this module
+$module->version  = 2009031100;   // The (date) version of this module
 $module->requires = 2007101509;  // Requires this Moodle version
 $module->cron     = 300;          // How often should cron check this module (seconds)?
 
Index: temp_moodle_dev/moodle/mod/chat/view.php
===================================================================
diff -u -rc7ec6c7533cf6f3be7a96c2e25a063175d6af347 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/chat/view.php	(.../view.php)	(revision c7ec6c7533cf6f3be7a96c2e25a063175d6af347)
+++ temp_moodle_dev/moodle/mod/chat/view.php	(.../view.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -49,9 +49,8 @@
     // show some info for guests
     if (isguestuser()) {
         $navigation = build_navigation('', $cm);
-         //we pass a new parameter to the function so it won't we printed if is_lams=1
         print_header_simple(format_string($chat->name), '', $navigation,
-                      '', '', true, '', navmenu($course, $cm),false,'',false,$cm->is_lams);
+			    '', '', true, '', navmenu($course, $cm),false,'',false,$cm->is_lams);
         $wwwroot = $CFG->wwwroot.'/login/index.php';
         if (!empty($CFG->loginhttps)) {
             $wwwroot = str_replace('http:','https:', $wwwroot);
@@ -60,12 +59,9 @@
         notice_yesno(get_string('noguests', 'chat').'<br /><br />'.get_string('liketologin'),
                 $wwwroot, $CFG->wwwroot.'/course/view.php?id='.$course->id);
 
-        //we pass a new parameter to the function so it won't we printed if is_lams=1
-		print_footer($course,null, false,$chat->is_lams);
+        print_footer($course,null, false,$chat->is_lams);
         exit;
 
-    } else {
-        require_capability('mod/chat:chat', $context);
     }
 
     add_to_log($course->id, 'chat', 'view', "view.php?id=$cm->id", $chat->id, $cm->id);
@@ -86,9 +82,9 @@
     if (($edit != -1) and $PAGE->user_allowed_editing()) {
         $USER->editing = $edit;
     }
-	//add a new parameter for lams for not to display moodle's headers
+
     $PAGE->print_header($course->shortname.': %fullname%',NULL,'','',$cm->is_lams);
-	
+
     echo '<table id="layout-table"><tr>';
 
     $lt = (empty($THEME->layouttable)) ? array('left', 'middle', 'right') : $THEME->layouttable;
@@ -135,32 +131,38 @@
 
                 print_heading(format_string($chat->name));
 
-                /// Print the main part of the page
-                print_box_start('generalbox', 'enterlink');
-                // users with screenreader set, will only see 1 link, to the manual refresh page
-                // for better accessibility
-                if (!empty($USER->screenreader)) {
-                    $chattarget = "/mod/chat/gui_basic/index.php?id=$chat->id$groupparam";
-                } else {
-                    $chattarget = "/mod/chat/gui_$CFG->chat_method/index.php?id=$chat->id$groupparam"; 
-                }
+                if (has_capability('mod/chat:chat',$context)) {
+                    /// Print the main part of the page
+                    print_box_start('generalbox', 'enterlink');
+                    // users with screenreader set, will only see 1 link, to the manual refresh page
+                    // for better accessibility
+                    if (!empty($USER->screenreader)) {
+                        $chattarget = "/mod/chat/gui_basic/index.php?id=$chat->id$groupparam";
+                    } else {
+                        $chattarget = "/mod/chat/gui_$CFG->chat_method/index.php?id=$chat->id$groupparam"; 
+                    }
 
-                echo '<p>';
-                link_to_popup_window ($chattarget,
-                        "chat$course->id$chat->id$groupparam", "$strenterchat", 500, 700, get_string('modulename', 'chat'));
-                echo '</p>';
+                    echo '<p>';
+                    link_to_popup_window ($chattarget,
+                            "chat$course->id$chat->id$groupparam", "$strenterchat", 500, 700, get_string('modulename', 'chat'));
+                    echo '</p>';
 
-                // if user is using screen reader, then there is no need to display this link again
-                if ($CFG->chat_method == 'header_js' && empty($USER->screenreader)) {
-                    // show frame/js-less alternative
-                    echo '<p>(';
-                            link_to_popup_window ("/mod/chat/gui_basic/index.php?id=$chat->id$groupparam",
-                                "chat$course->id$chat->id$groupparam", get_string('noframesjs', 'message'), 500, 700, get_string('modulename', 'chat'));
-                            echo ')</p>';
-                }
+                    // if user is using screen reader, then there is no need to display this link again
+                    if ($CFG->chat_method == 'header_js' && empty($USER->screenreader)) {
+                        // show frame/js-less alternative
+                        echo '<p>(';
+                                link_to_popup_window ("/mod/chat/gui_basic/index.php?id=$chat->id$groupparam",
+                                    "chat$course->id$chat->id$groupparam", get_string('noframesjs', 'message'), 500, 700, get_string('modulename', 'chat'));
+                                echo ')</p>';
+                    }
 
-                print_box_end();
+                    print_box_end();
 
+                } else {
+                    print_box_start('generalbox', 'notallowenter');
+                    echo '<p>'.get_string('notallowenter', 'chat').'</p>';
+                    print_box_end();
+                }
 
                 if ($chat->chattime and $chat->schedule) {  // A chat is scheduled
                     echo "<p class=\"nextchatsession\">$strnextsession: ".userdate($chat->chattime).' ('.usertimezone($USER->timezone).')</p>';
@@ -204,16 +206,14 @@
     
     echo '</tr></table>';
 
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
-	print_footer($course,null, false,$cm->is_lams);
-	//if is lams display navigation buttons so you can finish uploading or go to next activity
-	if($cm->is_lams==1){
-    		if($editing==1){
-				include('showlamsfinish.php');
-			}else{
-				include('showlamsnext.php');
-			}
+    print_footer($course,null, false,$cm->is_lams);
 
-	}
+    if($cm->is_lams==1){
+      if($editing==1){
+	include('showlamsfinish.php');
+      } else {
+	include('showlamsnext.php');
+      }
+    }
 
 ?>
Index: temp_moodle_dev/moodle/mod/choice/db/install.xml
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/choice/db/install.xml	(.../install.xml)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/choice/db/install.xml	(.../install.xml)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -17,7 +17,7 @@
         <FIELD NAME="timeopen" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="limitanswers" NEXT="timeclose"/>
         <FIELD NAME="timeclose" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="timeopen" NEXT="timemodified"/>
         <FIELD NAME="timemodified" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="timeclose" NEXT="is_lams"/>
-		<FIELD NAME="is_lams" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="timemodified"/>
+	<FIELD NAME="is_lams" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="timemodified"/>
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" />
Index: temp_moodle_dev/moodle/mod/choice/index.php
===================================================================
diff -u -r232e629e5780aff8414775cfa330c0b0410b353a -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/choice/index.php	(.../index.php)	(revision 232e629e5780aff8414775cfa330c0b0410b353a)
+++ temp_moodle_dev/moodle/mod/choice/index.php	(.../index.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -21,6 +21,7 @@
 
     print_header_simple("$strchoices", "", $navigation, "", "", true, "", navmenu($course));
 
+
     if (! $choices = get_all_instances_in_course("choice", $course)) {
         notice(get_string('thereareno', 'moodle', $strchoices), "../../course/view.php?id=$course->id");
     }
Index: temp_moodle_dev/moodle/mod/choice/lib.php
===================================================================
diff -u -r8f9656622d74eae9e5a336a7cd99ab2f9f5d6c14 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/choice/lib.php	(.../lib.php)	(revision 8f9656622d74eae9e5a336a7cd99ab2f9f5d6c14)
+++ temp_moodle_dev/moodle/mod/choice/lib.php	(.../lib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -328,8 +328,9 @@
         $forcepublish = $choice->publish;
     }
 
-    if (!$allresponses) {
+    if (empty($allresponses)) {
         print_heading(get_string("nousersyet"));
+        return false;
     }
 
     $totalresponsecount = 0;
@@ -380,15 +381,17 @@
                 // we do not get <table></table> erro from w3c validator
                 // MDL-7861
                 echo "<table class=\"choiceresponse\"><tr><td></td></tr>";
-                foreach ($allresponses[0] as $user) {
-                    echo "<tr>";
-                    echo "<td class=\"picture\">";
-                    print_user_picture($user->id, $course->id, $user->picture);
-                    echo "</td><td class=\"fullname\">";
-                    echo "<a href=\"$CFG->wwwroot/user/view.php?id=$user->id&amp;course=$course->id\">";
-                    echo fullname($user, $hascapfullnames);
-                    echo "</a>";
-                    echo "</td></tr>";
+                if (!empty($allresponses[0])) {
+                    foreach ($allresponses[0] as $user) {
+                        echo "<tr>";
+                        echo "<td class=\"picture\">";
+                        print_user_picture($user->id, $course->id, $user->picture);
+                        echo "</td><td class=\"fullname\">";
+                        echo "<a href=\"$CFG->wwwroot/user/view.php?id=$user->id&amp;course=$course->id\">";
+                        echo fullname($user, $hascapfullnames);
+                        echo "</a>";
+                        echo "</td></tr>";
+                    }
                 }
                 echo "</table></td>";
             }
@@ -717,7 +720,7 @@
 
 /// First get all the users who have access here
 /// To start with we assume they are all "unanswered" then move them later
-    $allresponses[0] = get_users_by_capability($context, 'mod/choice:choose', 'u.id, u.picture, u.firstname, u.lastname, u.idnumber', 'u.firstname ASC', '', '', $currentgroup, '', false, true);
+    $allresponses[0] = get_users_by_capability($context, 'mod/choice:choose', 'u.id, u.picture, u.firstname, u.lastname, u.idnumber', 'u.lastname ASC,u.firstname ASC', '', '', $currentgroup, '', false, true);
 
 /// Get all the recorded responses for this choice
     $rawresponses = get_records('choice_answers', 'choiceid', $choice->id);
@@ -733,7 +736,9 @@
             }
         }
     }
-
+    if (empty($allresponses[0])) {
+        unset($allresponses[0]);
+    }
     return $allresponses;
 }
 
@@ -743,8 +748,8 @@
 function choice_get_extra_capabilities() {
     return array('moodle/site:accessallgroups');
 }
-//m new
 
+
 /**
  * LAMS Function
  * This function clones an existing instance of Moodle choice
@@ -945,5 +950,5 @@
 
 }
 
-//fi new
+
 ?>
Index: temp_moodle_dev/moodle/mod/choice/report.php
===================================================================
diff -u -rd48971ad235d741d5584ea54abefc1e9fc23e0e7 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/choice/report.php	(.../report.php)	(revision d48971ad235d741d5584ea54abefc1e9fc23e0e7)
+++ temp_moodle_dev/moodle/mod/choice/report.php	(.../report.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -3,10 +3,11 @@
     require_once("../../config.php");
     require_once("lib.php");
 
-    $id       = required_param('id', PARAM_INT);   //moduleid
-    $format   = optional_param('format', CHOICE_PUBLISH_NAMES, PARAM_INT);
-    $download = optional_param('download', '', PARAM_ALPHA);
-    $action   = optional_param('action', '', PARAM_ALPHA);
+    $id         = required_param('id', PARAM_INT);   //moduleid
+    $format     = optional_param('format', CHOICE_PUBLISH_NAMES, PARAM_INT);
+    $download   = optional_param('download', '', PARAM_ALPHA);
+    $action     = optional_param('action', '', PARAM_ALPHA);
+    $attemptids = optional_param('attemptid', array(), PARAM_INT); //get array of responses to delete.
 
     if (! $cm = get_coursemodule_from_id('choice', $id)) {
         error("Course Module ID was incorrect");
@@ -33,22 +34,21 @@
     add_to_log($course->id, "choice", "report", "report.php?id=$cm->id", "$choice->id",$cm->id);
       
     if ($action == 'delete' && has_capability('mod/choice:deleteresponses',$context)) {
-        $attemptids = isset($_POST['attemptid']) ? $_POST['attemptid'] : array(); //get array of repsonses to delete.
         choice_delete_responses($attemptids, $choice->id); //delete responses.
         redirect("report.php?id=$cm->id");
     }
         
     if (!$download) {
 
         $navigation = build_navigation($strresponses, $cm);
-         //we pass a new parameter to the function so it won't we printed if is_lams=1
         print_header_simple(format_string($choice->name).": $strresponses", "", $navigation, "", '', true,
-                  update_module_button($cm->id, $course->id, $strchoice), navmenu($course, $cm),false,'',false,$cm->is_lams);
-
+                  update_module_button($cm->id, $course->id, $strchoice), navmenu($course, $cm));
         /// Check to see if groups are being used in this choice
         $groupmode = groups_get_activity_groupmode($cm);
-        groups_get_activity_group($cm, true);
-        groups_print_activity_menu($cm, 'report.php?id='.$id);
+        if ($groupmode) {
+            groups_get_activity_group($cm, true);
+            groups_print_activity_menu($cm, 'report.php?id='.$id);
+        }
     } else {
         $groupmode = groups_get_activity_groupmode($cm);
     }
@@ -93,7 +93,7 @@
                     $myxls->write_string($row,3,$ug2);
 
                     if (isset($option_text)) {
-                        $myxls->write_string($row,4,format_string($useroption,true));
+                        $myxls->write_string($row,4,format_string($option_text,true));
                     }
                     $row++;
                     $pos=4;
@@ -206,7 +206,7 @@
     choice_show_results($choice, $course, $cm, $users, $format); //show table with students responses.
 
    //now give links for downloading spreadsheets. 
-    if (has_capability('mod/choice:downloadresponses',$context)) {
+    if (!empty($users) && has_capability('mod/choice:downloadresponses',$context)) {
         echo "<br />\n";
         echo "<table class=\"downloadreport\"><tr>\n";
         echo "<td>";
@@ -223,6 +223,6 @@
 
         echo "</td></tr></table>";
     }
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
-	print_footer($course,null, false,$choice->is_lams);
-?>
+    print_footer($course,null, false,$choice->is_lams);
+
+?>
\ No newline at end of file
Index: temp_moodle_dev/moodle/mod/choice/view.php
===================================================================
diff -u -rd5ca907709f53a4fce5e4f3059737ae830553509 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/choice/view.php	(.../view.php)	(revision d5ca907709f53a4fce5e4f3059737ae830553509)
+++ temp_moodle_dev/moodle/mod/choice/view.php	(.../view.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -1,7 +1,7 @@
 <?php  // $Id$
 
     require_once("../../config.php");
-    require_once("lib.php");//add  new library so Lams can use their functions
+    require_once("lib.php");
     require_once($CFG->libdir.'/weblib.php');
 
     $id         = required_param('id', PARAM_INT);                 // Course Module ID
@@ -10,7 +10,7 @@
     $returnurl   = optional_param('returnUrl', '', PARAM_TEXT);  // lams url to proceed to next in sequence
     $editing  = optional_param('editing', 0, PARAM_INT); // 1 if editing in Lams
     $lamsupdateurl = optional_param('lamsUpdateURL', PARAM_TEXT); //get lamsupdateurl variable if coming from a Lams activity
-    
+
     if (! $cm = get_coursemodule_from_id('choice', $id)) {
         error("Course Module ID was incorrect");
     }
@@ -38,9 +38,17 @@
             delete_records('choice_answers', 'id', $answer->id);
         }
     }
+    $navigation = build_navigation('', $cm);
 
-/// Submit any new data if there is any
+    $isteacher = has_capability('mod/choice:preview', get_context_instance(CONTEXT_MODULE, $cm->id)); // indicates if is a teacher, useful in lams
+       if($isteacher&&$editing==0&&$cm->is_lams==1){//lams: if the teachers view the choice as a learner, display the next activity button so he hasn't to attempt the choice if he don't want to
+	 include('showlamsnext.php');
+       }
 
+    print_header_simple(format_string($choice->name), "", $navigation, "", "", true,
+			update_module_button($cm->id, $course->id, $strchoice), navmenu($course, $cm),false,'',false,$cm->is_lams);
+
+/// Submit any new data if there is any
     if ($form = data_submitted() && has_capability('mod/choice:choose', $context)) {
         $timenow = time();
         if (has_capability('mod/choice:deleteresponses', $context)) {
@@ -56,24 +64,11 @@
         } else {
             choice_user_submit_response($answer, $choice, $USER->id, $course->id, $cm);
         }
-        redirect("view.php?id=$cm->id");
-        exit;
+        notify(get_string('choicesaved','choice'),'notifysuccess');
     }
 
 
 /// Display the choice and possibly results
-    $navigation = build_navigation('', $cm);
-    
-    
-    
-    $isteacher = has_capability('mod/choice:preview', get_context_instance(CONTEXT_MODULE, $cm->id)); // indicates if is a teacher, useful in lams
-	if($isteacher&&$editing==0&&$cm->is_lams==1){//lams: if the teachers view the choice as a learner, display the next activity button so he hasn't to attempt the choice if he don't want to
-	       include('showlamsnext.php');
-	}
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
-    print_header_simple(format_string($choice->name), "", $navigation, "", "", true,
-                  update_module_button($cm->id, $course->id, $strchoice), navmenu($course, $cm),false,'',false,$cm->is_lams);
-                     
     add_to_log($course->id, "choice", "view", "view.php?id=$cm->id", $choice->id, $cm->id);
 
     /// Check to see if groups are being used in this choice
@@ -100,10 +95,10 @@
     //if user has already made a selection, and they are not allowed to update it, show their selected answer.
     if (!empty($USER->id) && ($current = get_record('choice_answers', 'choiceid', $choice->id, 'userid', $USER->id)) &&
         empty($choice->allowupdate) ) {
-        	// lams: if you have submited an option then you can go to next activity (shows button)
-        	if($cm->is_lams==1&&$editing==0){
-        		include('showlamsnext.php');
-        	}
+         // lams: if you have submited an option then you can go to next activity (shows button)
+         if($cm->is_lams==1&&$editing==0){
+	   include('showlamsnext.php');
+	 }
         print_simple_box(get_string("yourselection", "choice", userdate($choice->timeopen)).": ".format_string(choice_get_option_text($choice, $current->optionid)), "center");
     }
 
@@ -113,9 +108,7 @@
     if ($choice->timeclose !=0) {
         if ($choice->timeopen > $timenow ) {
             print_simple_box(get_string("notopenyet", "choice", userdate($choice->timeopen)), "center");
-            
-            //we pass a new parameter to the function so it won't we printed if is_lams=1
-			print_footer($course,null, false,$choice->is_lams);
+            print_footer($course,null, false,$choice->is_lams);
             exit;
         } else if ($timenow > $choice->timeclose) {
             print_simple_box(get_string("expired", "choice", userdate($choice->timeclose)), "center");
@@ -125,7 +118,7 @@
 
     if ( (!$current or $choice->allowupdate) and $choiceopen and
           has_capability('mod/choice:choose', $context) ) {
-    	// They haven't made their choice yet or updates allowed and choice is open
+    // They haven't made their choice yet or updates allowed and choice is open
 
         echo '<form id="form" method="post" action="view.php">';        
 
@@ -179,15 +172,14 @@
         print_simple_box(get_string('noresultsviewable', 'choice'), 'center');
     } 
     if ($choice->is_lams) {
-    		//print buttons to return to lams if you are editing
-    		if($editing==1){
-    			include('showlamsfinish.php');
-    		}
-    		
+      //print buttons to return to lams if you are editing
+      if($editing==1){
+	include('showlamsfinish.php');
+      }
     }
 
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
-	print_footer($course,null, false,$choice->is_lams);
 
+    print_footer($course,null, false,$choice->is_lams);
 
+
 ?>
Index: temp_moodle_dev/moodle/mod/forum/db/upgrade.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/forum/db/upgrade.php	(.../upgrade.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/forum/db/upgrade.php	(.../upgrade.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -83,6 +83,9 @@
         }
     }
 
+    if ($result && $oldversion < 2007101513) {
+        delete_records('forum_ratings', 'post', 0); /// Clean existing wrong rates. MDL-18227
+    }
 
     return $result;
 }
Index: temp_moodle_dev/moodle/mod/forum/discuss.php
===================================================================
diff -u -rf4ca857d65d3e14544f0d03b4efcddc5dba49c6b -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/forum/discuss.php	(.../discuss.php)	(revision f4ca857d65d3e14544f0d03b4efcddc5dba49c6b)
+++ temp_moodle_dev/moodle/mod/forum/discuss.php	(.../discuss.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -4,7 +4,6 @@
 //  If no post is given, displays all posts in a discussion
 
     require_once('../../config.php');
-    require_once('lib.php');
 
     $d      = required_param('d', PARAM_INT);                // Discussion ID
     $parent = optional_param('parent', 0, PARAM_INT);        // If set, then display this post and all children.
@@ -31,6 +30,13 @@
 
     require_course_login($course, true, $cm);
 
+/// Add ajax-related libs
+    require_js(array('yui_yahoo', 'yui_event', 'yui_dom', 'yui_connection', 'yui_json'));
+    require_js($CFG->wwwroot . '/mod/forum/rate_ajax.js');
+
+    // move this down fix for MDL-6926
+    require_once('lib.php');
+
     $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
     require_capability('mod/forum:viewdiscussion', $modcontext, NULL, true, 'noviewdiscussionspermission', 'forum');
 
@@ -64,6 +70,9 @@
             error('Forum not visible', $return);
         }
 
+        require_capability('mod/forum:startdiscussion',
+            get_context_instance(CONTEXT_MODULE,$cmto->id));
+
         if (!forum_move_attachments($discussion, $forumto->id)) {
             notify("Errors occurred while moving attachment directories - check your file permissions");
         }
@@ -139,15 +148,13 @@
 
     $navigation = build_navigation($navlinks, $cm);
     //if in Lams sequence don't display Moodle's navigation header
-        if($cm->is_lams==1){
-        	print_header();
-        }else{
-        	  print_header("$course->shortname: ".format_string($discussion->name), $course->fullname,
-                     $navigation, "", "", true, $searchform, navmenu($course, $cm));
-        }
-  
+    if($cm->is_lams==1){
+      print_header();
+    }else{
+      print_header("$course->shortname: ".format_string($discussion->name), $course->fullname,
+		   $navigation, "", "", true, $searchform, navmenu($course, $cm));
+    }
 
-
 /// Check to see if groups are being used in this forum
 /// If so, make sure the current person is allowed to see this discussion
 /// Also, if we know they should be able to reply, then explicitly set $canreply for performance reasons
@@ -185,7 +192,8 @@
             $section = -1;
             $forummenu = array();
             foreach ($modinfo->instances['forum'] as $forumcm) {
-                if (!$forumcm->uservisible) {
+                if (!$forumcm->uservisible || !has_capability('mod/forum:startdiscussion',
+                    get_context_instance(CONTEXT_MODULE,$forumcm->id))) {
                     continue;
                 }
 
@@ -201,7 +209,8 @@
             if (!empty($forummenu)) {
                 echo "<div style=\"float:right;\">";
                 echo popup_form("$CFG->wwwroot/mod/forum/", $forummenu, "forummenu", "",
-                                 get_string("movethisdiscussionto", "forum"), "", "", true);
+                                 get_string("movethisdiscussionto", "forum"), "", "", true,'self','',NULL,
+                                 get_string('move'));
                 echo "</div>";
             }
         }
@@ -227,8 +236,7 @@
     $canrate = has_capability('mod/forum:rate', $modcontext);
     forum_print_discussion($course, $cm, $forum, $discussion, $post, $displaymode, $canreply, $canrate);
 
-     //we pass a new parameter to the function so it won't we printed if is_lams=1
+    //we pass a new parameter to the function so it won't we printed if is_lams=1
     print_footer($course,null, false,$cm->is_lams);
 
-
 ?>
Index: temp_moodle_dev/moodle/mod/forum/index.php
===================================================================
diff -u -r960c99bc6c7454f25800bef311d089e89840c7d7 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/forum/index.php	(.../index.php)	(revision 960c99bc6c7454f25800bef311d089e89840c7d7)
+++ temp_moodle_dev/moodle/mod/forum/index.php	(.../index.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -80,7 +80,7 @@
     // some special ones are not.  These get placed in the general forums
     // category with the forums in section 0.
 
-    #$forums = get_records('forum', 'course', $course->id);
+    //$forums = get_records('forum', 'course', $course->id);
     $forums = get_records_select('forum', "course=$course->id and is_lams=0");
 
     $generalforums  = array();
@@ -122,18 +122,20 @@
     if (!is_null($subscribe) and !isguestuser() and !isguest()) {
         foreach ($modinfo->instances['forum'] as $forumid=>$cm) {
             $forum = $forums[$forumid];
+            $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); 
             $cansub = false;
-            if (has_capability('mod/forum:viewdiscussion', $cm)) {
+
+            if (has_capability('mod/forum:viewdiscussion', $modcontext)) {
                 $cansub = true;
             }
             if ($cansub && $cm->visible == 0 &&
-                !has_capability('mod/forum:managesubscriptions', $cm)) 
+                !has_capability('mod/forum:managesubscriptions', $modcontext)) 
             {
                 $cansub = false;
             }
             if (!forum_is_forcesubscribed($forum)) {
                 $subscribed = forum_is_subscribed($USER->id, $forum);
-                if ($subscribe && !$subscribed && $cansub) {
+                if ((has_capability('moodle/course:manageactivities', $coursecontext, $USER->id) || $forum->forcesubscribe != FORUM_DISALLOWSUBSCRIBE) && $subscribe && !$subscribed && $cansub) {
                     forum_subscribe($USER->id, $forumid);
                 } else if (!$subscribe && $subscribed) {
                     forum_unsubscribe($USER->id, $forumid);
@@ -404,7 +406,8 @@
         print_table($learningtable);
     }
 
-     //we pass a new parameter to the function so it won't we printed if is_lams=1
-     print_footer($course,null, false,$cm->is_lams);
+    //we pass a new parameter to the function so it won't we printed if is_lams=1
+    print_footer($course,null, false,$cm->is_lams);
 
+
 ?>
Index: temp_moodle_dev/moodle/mod/forum/lib.php
===================================================================
diff -u -rdce8b38c88e93e02d9ca802b2e0bdd1a4d3d6f08 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/forum/lib.php	(.../lib.php)	(revision dce8b38c88e93e02d9ca802b2e0bdd1a4d3d6f08)
+++ temp_moodle_dev/moodle/mod/forum/lib.php	(.../lib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -70,8 +70,14 @@
         }
     }
 
-    if ($forum->forcesubscribe == FORUM_INITIALSUBSCRIBE) { // all users should be subscribed initially
-        $users = get_course_users($forum->course);
+    if ($forum->forcesubscribe == FORUM_INITIALSUBSCRIBE) {
+    /// all users should be subscribed initially
+    /// Note: forum_get_potential_subscribers should take the forum context,
+    /// but that does not exist yet, becuase the forum is only half build at this
+    /// stage. However, because the forum is brand new, we know that there are
+    /// no role assignments or overrides in the forum context, so using the
+    /// course context gives the same list of users.
+        $users = forum_get_potential_subscribers(get_context_instance(CONTEXT_COURSE, $forum->course), 0, 'u.id, u.email', '');
         foreach ($users as $user) {
             forum_subscribe($user->id, $forum->id);
         }
@@ -119,7 +125,23 @@
                 notify('Warning! There is more than one discussion in this forum - using the most recent');
                 $discussion = array_pop($discussions);
             } else {
-                error('Could not find the discussion in this forum');
+                // try to recover by creating initial discussion - MDL-16262
+                $discussion = new object();
+                $discussion->course   = $forum->course;
+                $discussion->forum    = $forum->id;
+                $discussion->name     = $forum->name;
+                $discussion->intro    = $forum->intro;
+                $discussion->assessed = $forum->assessed;
+                $discussion->format   = $forum->type;
+                $discussion->mailnow  = false;
+                $discussion->groupid  = -1;
+
+                forum_add_discussion($discussion, $discussion->intro);
+
+                if (! $discussion = get_record('forum_discussions', 'forum', $forum->id)) {
+                    error('Could not add the discussion for this forum');
+                }
+
             }
         }
         if (! $post = get_record('forum_posts', 'id', $discussion->firstpost)) {
@@ -282,7 +304,8 @@
 
             // caching subscribed users of each forum
             if (!isset($subscribedusers[$forumid])) {
-                if ($subusers = forum_subscribed_users($courses[$courseid], $forums[$forumid], 0, false)) {
+                $modcontext = get_context_instance(CONTEXT_MODULE, $coursemodules[$forumid]->id);
+                if ($subusers = forum_subscribed_users($courses[$courseid], $forums[$forumid], 0, $modcontext)) {
                     foreach ($subusers as $postuser) {
                         // do not try to mail users with stopped email
                         if ($postuser->emailstop) {
@@ -718,9 +741,9 @@
                         }
                     }
                     if ($canunsubscribe) {
-                        $posthtml .= "\n<div align=\"right\"><font size=\"1\"><a href=\"$CFG->wwwroot/mod/forum/subscribe.php?id=$forum->id\">".get_string("unsubscribe", "forum")."</a></font></div>";
+                        $posthtml .= "\n<div class='mdl-right'><font size=\"1\"><a href=\"$CFG->wwwroot/mod/forum/subscribe.php?id=$forum->id\">".get_string("unsubscribe", "forum")."</a></font></div>";
                     } else {
-                        $posthtml .= "\n<div align=\"right\"><font size=\"1\">".get_string("everyoneissubscribed", "forum")."</font></div>";
+                        $posthtml .= "\n<div class='mdl-right'><font size=\"1\">".get_string("everyoneissubscribed", "forum")."</font></div>";
                     }
                     $posthtml .= '<hr size="1" noshade="noshade" /></p>';
                 }
@@ -900,7 +923,7 @@
     $posthtml .= forum_make_mail_post($course, $forum, $discussion, $post, $userfrom, $userto, false, $canreply, true, false);
 
     if ($canunsubscribe) {
-        $posthtml .= '<hr /><div align="center" class="unsubscribelink">
+        $posthtml .= '<hr /><div class="mdl-align unsubscribelink">
                       <a href="'.$CFG->wwwroot.'/mod/forum/subscribe.php?id='.$forum->id.'">'.get_string('unsubscribe', 'forum').'</a>&nbsp;
                       <a href="'.$CFG->wwwroot.'/mod/forum/unsubscribeall.php">'.get_string('unsubscribeall', 'forum').'</a></div>';
     }
@@ -936,7 +959,7 @@
  *
  */
 function forum_user_complete($course, $user, $mod, $forum) {
-    global $CFG;
+    global $CFG,$USER;
 
     if ($posts = forum_get_user_posts($forum->id, $user->id)) {
 
@@ -945,19 +968,50 @@
         }
         $discussions = forum_get_user_involved_discussions($forum->id, $user->id);
 
+        // preload all user ratings for these discussions - one query only and minimal memory
+        $cm->cache->ratings = array();
+        $cm->cache->myratings = array();
+        if ($postratings = forum_get_all_user_ratings($user->id, $discussions)) {
+            foreach ($postratings as $pr) {
+                if (!isset($cm->cache->ratings[$pr->postid])) {
+                    $cm->cache->ratings[$pr->postid] = array();
+                }
+                $cm->cache->ratings[$pr->postid][$pr->id] = $pr->rating;
+
+                if ($pr->userid == $USER->id) {
+                    $cm->cache->myratings[$pr->postid] = $pr->rating;
+                }
+            }
+            unset($postratings);
+        }
+
         foreach ($posts as $post) {
-            if (!isset($discussions[$forum->discussion])) {
+            if (!isset($discussions[$post->discussion])) {
                 continue;
             }
-            $discussion = $discussions[$forum->discussion];
-            forum_print_post($post, $discussion, $forum, $cm, $course, false, false, false, false);
-        }
+            $discussion = $discussions[$post->discussion];
+            
+            $ratings = null;
 
+            if ($forum->assessed) {
+                if ($scale = make_grades_menu($forum->scale)) {
+                    $ratings =new object();
+                    $ratings->scale = $scale;
+                    $ratings->assesstimestart = $forum->assesstimestart;
+                    $ratings->assesstimefinish = $forum->assesstimefinish;
+                    $ratings->allow = false;
+                }
+            }
+
+            forum_print_post($post, $discussion, $forum, $cm, $course, false, false, false, $ratings);
+
+        }
     } else {
         echo "<p>".get_string("noposts", "forum")."</p>";
     }
 }
 
+
 /**
  *
  */
@@ -1678,7 +1732,11 @@
             $select[] = "(d.userid = {$USER->id} OR (d.timestart < $now AND (d.timeend = 0 OR d.timeend > $now)))";
         }
 
-        if ($forum->type == 'qanda') {
+        $cm = get_coursemodule_from_instance('forum', $forumid);
+        $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+
+        if ($forum->type == 'qanda'
+            && !has_capability('mod/forum:viewqandawithoutposting', $context)) {
             if (!empty($forum->onlydiscussions)) {
                 $discussionsids = implode(',', $forum->onlydiscussions);
                 $select[] = "(d.id IN ($discussionsids) OR p.parent = 0)";
@@ -1799,6 +1857,41 @@
 }
 
 /**
+ * Returns a list of ratings for one specific user for all posts in discussion
+ * @global object $CFG
+ * @param object $discussions the discussions for which we return all ratings
+ * @param int $userid the user for who we return all ratings
+ * @return object
+ */
+function forum_get_all_user_ratings($userid, $discussions) {
+    global $CFG;
+
+
+    foreach ($discussions as $discussion) {
+     if (!isset($discussionsid)){
+         $discussionsid = $discussion->id;
+     }
+     else {
+         $discussionsid .= ",".$discussion->id;
+     }
+    }
+
+    $sql = "SELECT r.id, r.userid, p.id AS postid, r.rating
+                              FROM {$CFG->prefix}forum_ratings r,
+                                   {$CFG->prefix}forum_posts p
+                             WHERE r.post = p.id AND p.userid = $userid";
+    //postgres compability
+    if (!isset($discussionsid)) {
+       $sql .=" AND p.discussion IN (".$discussionsid.")";
+    }
+    $sql .=" ORDER BY p.id ASC";
+
+    return get_records_sql($sql);
+    
+
+}
+
+/**
  * Returns a list of ratings for a particular post - sorted.
  * @param int $postid
  * @param string $sort
@@ -1882,7 +1975,7 @@
             $timedsql = "AND (d.timestart < $now AND (d.timeend = 0 OR d.timeend > $now))";
         }
     }
-    
+
     return get_records_sql("SELECT p.*, d.forum, u.firstname, u.lastname, u.email, u.picture, u.imagealt
                               FROM {$CFG->prefix}forum f
                                    JOIN {$CFG->prefix}forum_discussions d ON d.forum = f.id
@@ -2170,10 +2263,14 @@
 
     $now = round(time(), -2);
 
-    if (!empty($CFG->forum_enabletimedposts)) {
+    $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
 
-        $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
+    if (!has_capability('mod/forum:viewdiscussion', $modcontext)) { /// User must have perms to view discussions
+        return array();
+    }
 
+    if (!empty($CFG->forum_enabletimedposts)) { /// Users must fulfill timed posts
+
         if (!has_capability('mod/forum:viewhiddentimedposts', $modcontext)) {
             $timelimit = " AND ((d.timestart <= $now AND (d.timeend = 0 OR d.timeend > $now))";
             if (isloggedin()) {
@@ -2394,10 +2491,28 @@
 }
 
 /**
- * Returns list of user objects that are subscribed to this forum
+ * Get the list of potential subscribers to a forum. 
+ *
+ * @param object $forumcontext the forum context.
+ * @param integer $groupid the id of a group, or 0 for all groups.
+ * @param string $fields the list of fields to return for each user. As for get_users_by_capability.
+ * @param string $sort sort order. As for get_users_by_capability.
+ * @return array list of users.
  */
-function forum_subscribed_users($course, $forum, $groupid=0) {
+function forum_get_potential_subscribers($forumcontext, $groupid, $fields, $sort) {
+    return get_users_by_capability($forumcontext, 'mod/forum:initialsubscriptions', $fields, $sort, '', '', $groupid, '', false, true);
+}
 
+/**
+ * Returns list of user objects that are subscribed to this forum
+ *
+ * @param object $course the course
+ * @param forum $forum the forum
+ * @param integer $groupid group id, or 0 for all.
+ * @param object $context the forum context, to save re-fetching it where possible.
+ * @return array list of users.
+ */
+function forum_subscribed_users($course, $forum, $groupid=0, $context = NULL) {
     global $CFG;
 
     if ($groupid) {
@@ -2410,11 +2525,14 @@
     }
 
     if (forum_is_forcesubscribed($forum)) {
-        $context = get_context_instance(CONTEXT_COURSE, $course->id);
+        if (empty($context)) {
+            $cm = get_coursemodule_from_instance('forum', $forum->id, $course->id);
+            $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+        }
         $sort = "u.email ASC";
         $fields ="u.id, u.username, u.firstname, u.lastname, u.maildisplay, u.mailformat, u.maildigest, u.emailstop, u.imagealt,
                   u.email, u.city, u.country, u.lastaccess, u.lastlogin, u.picture, u.timezone, u.theme, u.lang, u.trackforums, u.mnethostid";
-        $results = get_users_by_capability($context, 'mod/forum:initialsubscriptions', $fields, $sort, '','','','', false, true);
+        $results = forum_get_potential_subscribers($context, $groupid, $fields, $sort);
     } else {
         $results = get_records_sql("SELECT u.id, u.username, u.firstname, u.lastname, u.maildisplay, u.mailformat, u.maildigest, u.emailstop, u.imagealt,
                                    u.email, u.city, u.country, u.lastaccess, u.lastlogin, u.picture, u.timezone, u.theme, u.lang, u.trackforums, u.mnethostid
@@ -2807,16 +2925,18 @@
         // Print shortened version
         echo format_text(forum_shorten_post($post->message), $post->format, $options, $course->id);
         $numwords = count_words(strip_tags($post->message));
-        echo '<p><a href="'.$CFG->wwwroot.'/mod/forum/discuss.php?d='.$post->discussion.'">';
+        echo '<div class="posting"><a href="'.$CFG->wwwroot.'/mod/forum/discuss.php?d='.$post->discussion.'">';
         echo get_string('readtherest', 'forum');
-        echo '</a> ('.get_string('numwords', '', $numwords).')...</p>';
+        echo '</a> ('.get_string('numwords', '', $numwords).')...</div>';
     } else {
         // Print whole message
+        echo '<div class="posting">';
         if ($highlight) {
             echo highlight($highlight, format_text($post->message, $post->format, $options, $course->id));
         } else {
             echo format_text($post->message, $post->format, $options, $course->id);
         }
+        echo '</div>';
         echo $attachedimages;
     }
 
@@ -2928,15 +3048,19 @@
             }
 
             if ($canviewallratings and !$mypost) {
-                forum_print_ratings($post->id, $ratings->scale, $forum->assessed, $canviewallratings, $allratings);
+                echo '<span class="forumpostratingtext">' .
+                     forum_print_ratings($post->id, $ratings->scale, $forum->assessed, $canviewallratings, $allratings, true) .
+                     '</span>';
                 if (!empty($ratings->allow)) {
                     echo '&nbsp;';
                     forum_print_rating_menu($post->id, $USER->id, $ratings->scale, $myrating);
                     $ratingsmenuused = true;
                 }
 
             } else if ($mypost) {
-                forum_print_ratings($post->id, $ratings->scale, $forum->assessed, true, $allratings);
+                echo '<span class="forumpostratingtext">' .
+                     forum_print_ratings($post->id, $ratings->scale, $forum->assessed, true, $allratings, true) .
+                     '</span>';
 
             } else if (!empty($ratings->allow) ) {
                 forum_print_rating_menu($post->id, $USER->id, $ratings->scale, $myrating);
@@ -3160,7 +3284,7 @@
  * Forumid prevents the double lookup of the forumid in discussion to determine the aggregate type
  * Scale is an array of ratings
  */
-function forum_print_ratings($postid, $scale, $aggregatetype, $link=true, $ratings=null) {
+function forum_print_ratings($postid, $scale, $aggregatetype, $link=true, $ratings=null, $return=false) {
 
     $strratings = '';
 
@@ -3193,12 +3317,19 @@
             $strratings = get_string("ratings", "forum");
         }
 
-        echo "$strratings: ";
+        $strratings .= ': ';
+
         if ($link) {
-            link_to_popup_window ("/mod/forum/report.php?id=$postid", "ratings", $agg, 400, 600);
+            $strratings .= link_to_popup_window ("/mod/forum/report.php?id=$postid", "ratings", $agg, 400, 600, null, null, true);
         } else {
-            echo "$agg ";
+            $strratings .= "$agg ";
         }
+
+        if ($return) {
+            return $strratings;
+        } else {
+            echo $strratings;
+        }
     }
 }
 
@@ -3246,8 +3377,17 @@
 
 /**
  * Return the count of the ratings of a post given to the current user by others.
- * Scale is an array of possible ratings in the scale - the end of the scale is the highest or max grade
- * Ratings is an optional simple array of actual ratings (just integers)
+ *
+ * For numerical grades, the scale index is the same as the real grade value from interval {0..n}
+ * and $scale looks like Array( 0 => '0/n', 1 => '1/n', ..., n => 'n/n' )
+ *
+ * For scales, the index is the order of the scale item {1..n}
+ * and $scale looks like Array( 1 => 'poor', 2 => 'weak', 3 => 'good' )
+ * In case of no ratings done yet, we have nothing to display.
+ *
+ * @param int $postid
+ * @param array $scale Possible ratings in the scale - the end of the scale is the highest or max grade
+ * @param array $ratings An optional simple array of actual ratings (just integers)
  */
 function forum_get_ratings_count($postid, $scale, $ratings=NULL) {
 
@@ -3261,12 +3401,36 @@
     }
 
     $count = count($ratings);
-    $scalecount = count($scale)-1; //this should give us the last element of the scale aka the max grade with  $scale[$scalecount]
+    if (! array_key_exists(0, $scale)) {
+        $scaleused = true;
+    } else {
+        $scaleused = false;
+    }
 
-    if ($count > $scale[$scalecount]) { //if the count exceeds the forum scale (i.e. max grade then set the score to the max grade
-        $count = $scale[$scalecount];
+    if ($count == 0) {
+        if ($scaleused) {    // If no rating given yet and we use a scale
+            return get_string('noratinggiven', 'forum');
+        } else {
+            return '';
+        }
     }
-    return $scale[$count];
+
+    $maxgradeidx = max(array_keys($scale)); // For numerical grades, the index is the same as the real grade value {0..n}
+                                            // and $scale looks like Array( 0 => '0/n', 1 => '1/n', ..., n => 'n/n' )
+                                            // For scales, the index is the order of the scale item {1..n}
+                                            // and $scale looks like Array( 1 => 'poor', 2 => 'weak', 3 => 'good' )
+
+    if ($count > $maxgradeidx) {      // The count exceeds the max grade
+        $a = new stdClass();
+        $a->count = $count;
+        $a->grade = $scale[$maxgradeidx];
+        return get_string('aggregatecountformat', 'forum', $a);
+    } else {                                // Display the count and the aggregated grade for this post
+        $a = new stdClass();
+        $a->count = $count;
+        $a->grade = $scale[$count];
+        return get_string('aggregatecountformat', 'forum', $a);
+    }
 }
 
 /**
@@ -3286,7 +3450,6 @@
     }
 
     $count = count($ratings);
-    $max = max($ratings);
 
     if ($count == 0 ) {
         return "";
@@ -3296,8 +3459,9 @@
         return $scale[$rating];
 
     } else {
+        $max = max($ratings);
 
-     if (isset($scale[$max])) {
+        if (isset($scale[$max])) {
             return $scale[$max]." ($count)";
         } else {
             return "$max ($count)";    // Should never happen, hopefully
@@ -3322,7 +3486,6 @@
     }
 
     $count = count($ratings);
-    $min = min($ratings);
 
     if ($count == 0 ) {
         return "";
@@ -3332,6 +3495,7 @@
         return $scale[$rating]; //this works for min
 
     } else {
+        $min = min($ratings);
 
         if (isset($scale[$min])) {
             return $scale[$min]." ($count)";
@@ -3445,7 +3609,7 @@
         $strrate = get_string("rate", "forum");
     }
     $scale = array(FORUM_UNSET_POST_RATING => $strrate.'...') + $scale;
-    choose_from_menu($scale, $postid, $myrating, '');
+    choose_from_menu($scale, $postid, $myrating, '', '', '0', false, false, 0, '', false, false, 'forumpostratingmenu');
 }
 
 /**
@@ -3999,31 +4163,52 @@
  * Given a new post, subscribes or unsubscribes as appropriate.
  * Returns some text which describes what happened.
  */
-function forum_post_subscription($post) {
+function forum_post_subscription($post, $forum) {
 
     global $USER;
-
-    $subscribed=forum_is_subscribed($USER->id, $post->forum);
-    if ((isset($post->subscribe) && $post->subscribe && $subscribed)
-        || (!$post->subscribe && !$subscribed)) {
+    
+    $action = '';
+    $subscribed = forum_is_subscribed($USER->id, $forum);
+    
+    if ($forum->forcesubscribe == FORUM_FORCESUBSCRIBE) { // database ignored
         return "";
-    }
 
-    if (!$forum = get_record("forum", "id", $post->forum)) {
-        return "";
+    } elseif (($forum->forcesubscribe == FORUM_DISALLOWSUBSCRIBE)
+        && !has_capability('moodle/course:manageactivities', get_context_instance(CONTEXT_COURSE, $forum->course), $USER->id)) {
+        if ($subscribed) {
+            $action = 'unsubscribe'; // sanity check, following MDL-14558
+        } else {
+            return "";
+        }
+
+    } else { // go with the user's choice
+        if (isset($post->subscribe)) {
+            // no change
+            if ((!empty($post->subscribe) && $subscribed)
+                || (empty($post->subscribe) && !$subscribed)) {
+                return "";
+
+            } elseif (!empty($post->subscribe) && !$subscribed) {
+                $action = 'subscribe';
+
+            } elseif (empty($post->subscribe) && $subscribed) {
+                $action = 'unsubscribe';
+            }
+        }
     }
 
     $info = new object();
     $info->name  = fullname($USER);
-    $info->forum = $forum->name;
+    $info->forum = format_string($forum->name);
 
-    if (!empty($post->subscribe)) {
-        forum_subscribe($USER->id, $post->forum);
-        return "<p>".get_string("nowsubscribed", "forum", $info)."</p>";
+    switch ($action) {
+        case 'subscribe':
+            forum_subscribe($USER->id, $post->forum);
+            return "<p>".get_string("nowsubscribed", "forum", $info)."</p>";
+        case 'unsubscribe':
+            forum_unsubscribe($USER->id, $post->forum);
+            return "<p>".get_string("nownotsubscribed", "forum", $info)."</p>";
     }
-
-    forum_unsubscribe($USER->id, $post->forum);
-    return "<p>".get_string("nownotsubscribed", "forum", $info)."</p>";
 }
 
 /**
@@ -4077,14 +4262,17 @@
         $link = '';
 
         if ($fakelink) {
-            $link .= '<script type="text/javascript">';
-            $link .= '//<![CDATA['."\n";
-            $link .= 'document.getElementById("subscriptionlink").innerHTML = "<a title=\"' . $linktitle . '\" href=\"' . $CFG->wwwroot .
-               '/mod/forum/subscribe.php?id=' . $forum->id . $backtoindexlink.'\">' . $linktext . '<\/a>";';
-            $link .= '//]]>';
-            $link .= '</script>';
-            // use <noscript> to print button in case javascript is not enabled
-            $link .= '<noscript>';
+            $link .= <<<EOD
+<script type="text/javascript">
+//<![CDATA[
+var subs_link = document.getElementById("subscriptionlink");
+if(subs_link){
+    subs_link.innerHTML = "<a title=\"$linktitle\" href='$CFG->wwwroot/mod/forum/subscribe.php?id={$forum->id}{$backtoindexlink}'>$linktext<\/a>";
+}
+//]]>
+</script>
+<noscript>
+EOD;
         }
         $options ['id'] = $forum->id;
         $link .= print_single_button($CFG->wwwroot . '/mod/forum/subscribe.php',
@@ -4122,11 +4310,11 @@
 
     if (forum_tp_is_tracked($forum)) {
         $linktitle = $strnotrackforum;
-        $linktext = $strtrackforum;
+        $linktext = $strnotrackforum;
     } else {
         $linktitle = $strtrackforum;
-        $linktext = $strnotrackforum;
-    }
+        $linktext = $strtrackforum;
+    } 
 
     $link = '';
     if ($fakelink) {
@@ -4225,11 +4413,6 @@
         $context = get_context_instance(CONTEXT_MODULE, $cm->id);
     }
 
-    // normal users with temporary guest access can not add discussions
-    if (has_capability('moodle/legacy:guest', $context, $USER->id, false)) {
-        return false;
-    }
-
     if ($currentgroup === null) {
         $currentgroup = groups_get_activity_group($cm);
     }
@@ -4285,7 +4468,7 @@
 
     if (!isset($discussion->groupid)) {
         debugging('incorrect discussion parameter', DEBUG_DEVELOPER);
-        return false; 
+        return false;
     }
 
     if (!$cm) {
@@ -4342,7 +4525,7 @@
             return false;
         }
         return groups_is_member($discussion->groupid);
-    } 
+    }
 }
 
 
@@ -4416,20 +4599,20 @@
 
     // retrieve objects (yuk)
     if (is_numeric($forum)) {
-        debugging('missinf full forum', DEBUG_DEVELOPER);
+        debugging('missing full forum', DEBUG_DEVELOPER);
         if (!$forum = get_record('forum','id',$forum)) {
             return false;
         }
     }
 
     if (is_numeric($discussion)) {
-        debugging('missinf full discussion', DEBUG_DEVELOPER);
+        debugging('missing full discussion', DEBUG_DEVELOPER);
         if (!$discussion = get_record('forum_discussions','id',$discussion)) {
             return false;
         }
     }
     if (is_numeric($post)) {
-        debugging('missinf full post', DEBUG_DEVELOPER);
+        debugging('missing full post', DEBUG_DEVELOPER);
         if (!$post = get_record('forum_posts','id',$post)) {
             return false;
         }
@@ -4804,7 +4987,9 @@
     $ratingsmenuused = false;
     $ratingsformused = false;
     if ($forum->assessed and isloggedin()) {
-        if ($ratings->scale = make_grades_menu($forum->scale)) {
+        if ($scale = make_grades_menu($forum->scale)) {
+            $ratings =new object();
+            $ratings->scale = $scale;
             $ratings->assesstimestart = $forum->assesstimestart;
             $ratings->assesstimefinish = $forum->assesstimefinish;
             $ratings->allow = $canrate;
@@ -4832,9 +5017,9 @@
                 unset($postratings);
             }
         }
+
     }
 
-
     $post->forum = $forum->id;   // Add the forum id to the post object, later used by forum_print_post
     $post->forumtype = $forum->type;
 
@@ -4872,7 +5057,14 @@
     if ($ratingsformused) {
         if ($ratingsmenuused) {
             echo '<div class="ratingsubmit">';
-            echo '<input type="submit" value="'.get_string('sendinratings', 'forum').'" />';
+            echo '<input type="submit" id="forumpostratingsubmit" value="'.get_string('sendinratings', 'forum').'" />';
+            if (ajaxenabled() && !empty($CFG->forum_ajaxrating)) { /// AJAX enabled, standard submission form
+                $rate_ajax_config_settings = array("pixpath"=>$CFG->pixpath, "wwwroot"=>$CFG->wwwroot, "sesskey"=>sesskey());
+                echo "<script type=\"text/javascript\">//<![CDATA[\n".
+                     "var rate_ajax_config = " . json_encode($rate_ajax_config_settings) . ";\n".
+                     "init_rate_ajax();\n".
+                     "//]]></script>\n";
+            }
             if ($forum->scale < 0) {
                 if ($scale = get_record("scale", "id", abs($forum->scale))) {
                     print_scale_menu_helpbutton($course->id, $scale );
@@ -4951,6 +5143,7 @@
                 }
             } else {
                 if (!forum_user_can_see_post($forum, $discussion, $post, NULL, $cm)) {
+                    echo "</div>\n";
                     continue;
                 }
                 $by = new object();
@@ -5262,21 +5455,21 @@
     switch ($context->contextlevel) {
 
         case CONTEXT_SYSTEM:   // For the whole site
-             if ($courses = get_records('course')) {
-                 foreach ($courses as $course) {
-                     $subcontext = get_context_instance(CONTEXT_COURSE, $course->id);
-                     forum_add_user_default_subscriptions($userid, $subcontext);
-                 }
+             $rs = get_recordset('course', '', '', '', 'id');
+             while ($course = rs_fetch_next_record($rs)) {
+                 $subcontext = get_context_instance(CONTEXT_COURSE, $course->id);
+                 forum_add_user_default_subscriptions($userid, $subcontext);
              }
+             rs_close($rs);
              break;
 
         case CONTEXT_COURSECAT:   // For a whole category
-             if ($courses = get_records('course', 'category', $context->instanceid)) {
-                 foreach ($courses as $course) {
-                     $subcontext = get_context_instance(CONTEXT_COURSE, $course->id);
-                     forum_add_user_default_subscriptions($userid, $subcontext);
-                 }
-             }
+            $rs = get_recordset('course', 'category', $context->instanceid, '', 'id');
+            while ($course = rs_fetch_next_record($rs)) {
+                $subcontext = get_context_instance(CONTEXT_COURSE, $course->id);
+                forum_add_user_default_subscriptions($userid, $subcontext);
+            }
+            rs_close($rs);
              if ($categories = get_records('course_categories', 'parent', $context->instanceid)) {
                  foreach ($categories as $category) {
                      $subcontext = get_context_instance(CONTEXT_COURSECAT, $category->id);
@@ -5881,7 +6074,11 @@
     if (empty($CFG->enablegroupings)) {
         $mygroups = $modinfo->groups[0];
     } else {
-        $mygroups = $modinfo->groups[$cm->groupingid];
+        if (array_key_exists($cm->groupingid, $modinfo->groups)) {
+            $mygroups = $modinfo->groups[$cm->groupingid];
+        } else {
+            $mygroups = false; // Will be set below
+        }
     }
 
     // add all groups posts
@@ -6324,11 +6521,12 @@
         // remove ratings
         delete_records_select('forum_ratings', "post IN ($postssql)");
 
-        // all posts
-        delete_records_select('forum_posts', "discussion IN ($discussionssql)");
+        // all posts - initial posts must be kept in single simple discussion forums
+        delete_records_select('forum_posts', "discussion IN ($discussionssql) AND parent <> 0"); // first all children
+        delete_records_select('forum_posts', "discussion IN ($discussionssql AND f.type <> 'single') AND parent = 0"); // now the initial posts for non single simple
 
-        // finally all discussions
-        delete_records_select('forum_discussions', "forum IN ($forumssql)");
+        // finally all discussions except single simple forums
+        delete_records_select('forum_discussions', "forum IN ($forumssql AND f.type <> 'single')");
 
         // now get rid of all attachments
         if ($forums = get_records_sql($forumssql)) {
@@ -6691,6 +6889,13 @@
 }
 
 /**
+ * Returns all other caps used in module
+ */
+function forum_get_extra_capabilities() {
+    return array('moodle/site:accessallgroups', 'moodle/site:viewfullnames', 'moodle/site:trustcontent');
+}
+
+/**
  * LAMS Function
  * This function clones an existing instance of Moodle forum
  * replacing the course and the userid
Index: temp_moodle_dev/moodle/mod/forum/markposts.php
===================================================================
diff -u -r34faa3cf1a00ef0e8418bd4badc803f8b3656cb9 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/forum/markposts.php	(.../markposts.php)	(revision 34faa3cf1a00ef0e8418bd4badc803f8b3656cb9)
+++ temp_moodle_dev/moodle/mod/forum/markposts.php	(.../markposts.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -42,8 +42,8 @@
         print_header($course->shortname, $course->fullname, $navigation, '', '', true, "", navmenu($course, $cm));
         notice_yesno(get_string('noguesttracking', 'forum').'<br /><br />'.get_string('liketologin'),
                      $wwwroot, $returnto);
-         //we pass a new parameter to the function so it won't we printed if is_lams=1
-         print_footer($course,null, false,$cm->is_lams);
+	//we pass a new parameter to the function so it won't we printed if is_lams=1
+	print_footer($course,null, false,$cm->is_lams);
         exit;
     }
 
Index: temp_moodle_dev/moodle/mod/forum/mod_form_lams.php
===================================================================
diff -u -r49d09eadd0817437a212bead2eb82e6dce4d5a6d -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/forum/mod_form_lams.php	(.../mod_form_lams.php)	(revision 49d09eadd0817437a212bead2eb82e6dce4d5a6d)
+++ temp_moodle_dev/moodle/mod/forum/mod_form_lams.php	(.../mod_form_lams.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -12,8 +12,13 @@
         $mform->addElement('header', 'general', get_string('general', 'form'));
 
         $mform->addElement('text', 'name', get_string('forumname', 'forum'), array('size'=>'64'));
-        $mform->setType('name', PARAM_TEXT);
+        if (!empty($CFG->formatstringstriptags)) {
+            $mform->setType('name', PARAM_TEXT);
+        } else {
+            $mform->setType('name', PARAM_CLEAN);
+        }
         $mform->addRule('name', null, 'required', null, 'client');
+        $mform->addRule('name', get_string('maximumchars', '', 255), 'maxlength', 255, 'client');
 
         $forum_types = forum_get_forum_types();
 
@@ -76,16 +81,17 @@
             $mform->addElement('select', 'rssarticles', get_string('rssarticles'), $choices);
             $mform->setHelpButton('rssarticles', array('rssarticles', get_string('rssarticles'), 'forum'));
         }
+
 //-------------------------------------------------------------------------------
-/*        $mform->addElement('header', '', get_string('grade'));
+        $mform->addElement('header', '', get_string('grade'));
 
         $mform->addElement('select', 'assessed', get_string('aggregatetype', 'forum') , forum_get_aggregate_types());
         $mform->setDefault('assessed', 0);
         $mform->setHelpButton('assessed', array('assessaggregate', get_string('aggregatetype', 'forum'), 'forum'));
 
-	$mform->addElement('modgrade', 'scale', get_string('grade'), false);
-	$mform->disabledIf('scale', 'assessed', 'eq', 0);
-	
+        $mform->addElement('modgrade', 'scale', get_string('grade'), false);
+        $mform->disabledIf('scale', 'assessed', 'eq', 0);
+
         $mform->addElement('checkbox', 'ratingtime', get_string('ratingtime', 'forum'));
         $mform->disabledIf('ratingtime', 'assessed', 'eq', 0);
 
@@ -94,7 +100,10 @@
         $mform->disabledIf('assesstimestart', 'ratingtime');
 
         $mform->addElement('date_time_selector', 'assesstimefinish', get_string('to'));
-        $mform->disabledIf('assesstimefinish', 'assessed', 'eq', 0);*/
+        $mform->disabledIf('assesstimefinish', 'assessed', 'eq', 0);
+        $mform->disabledIf('assesstimefinish', 'ratingtime');
+
+
 //-------------------------------------------------------------------------------
         $mform->addElement('header', '', get_string('blockafter', 'forum'));
         $options = array();
@@ -125,18 +134,14 @@
         $mform->disabledIf('warnafter', 'blockperiod', 'eq', 0);
 
 //-------------------------------------------------------------------------------
-        /*$features = new stdClass;
-        $features->groups = false;
+        $features = new stdClass;
+        $features->groups = true;
         $features->groupings = true;
         $features->groupmembersonly = true;
-        $features->gradecat = false;
-	$features->idnumber = false;
-	$this->standard_coursemodule_elements($features);*/
         $this->standard_hidden_coursemodule_elements();
 //-------------------------------------------------------------------------------
 // buttons
         $this->add_action_buttons(false, 'Save', false);
-
     }
 
     function definition_after_data(){
Index: temp_moodle_dev/moodle/mod/forum/post.php
===================================================================
diff -u -red077ddbb92e2cc271e89b8a83962c7e8ac018d3 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/forum/post.php	(.../post.php)	(revision ed077ddbb92e2cc271e89b8a83962c7e8ac018d3)
+++ temp_moodle_dev/moodle/mod/forum/post.php	(.../post.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -4,7 +4,6 @@
 
     require_once('../../config.php');
     require_once('lib.php');
-    require_once('post_form.php');
 
     $reply   = optional_param('reply', 0, PARAM_INT);
     $forum   = optional_param('forum', 0, PARAM_INT);
@@ -16,7 +15,6 @@
     $groupid = optional_param('groupid', null, PARAM_INT);
     $editing = optional_param('editing', 0, PARAM_INT); // 1 if editing in Lams
 
-
     //these page_params will be passed as hidden variables later in the form.
     $page_params = array('reply'=>$reply, 'forum'=>$forum, 'edit'=>$edit);
 
@@ -59,19 +57,19 @@
         }
 
         $navigation = build_navigation('', $cm);
-        //if in Lams sequence don't display Moodle's navigation header
+	//if in Lams sequence don't display Moodle's navigation header
         if($cm->is_lams==1){
-        	print_header();
-        }else{
-        	print_header($course->shortname, $course->fullname, $navigation, '' , '', true, "", navmenu($course, $cm));
-        }
-        
+	    print_header();
+	} else {
+	    print_header($course->shortname, $course->fullname, $navigation, '' , '', true, "", navmenu($course, $cm));
+	}
+
         notice_yesno(get_string('noguestpost', 'forum').'<br /><br />'.get_string('liketologin'),
                      $wwwroot, get_referer(false));
-         //we pass a new parameter to the function so it won't we printed if is_lams=1
-         print_footer($course,null, false,$cm->is_lams);
+	print_footer($course,null, false,$cm->is_lams);
         exit;
     }
+
     require_login(0, false);   // Script is useless unless they're logged in
 
     if (!empty($forum)) {      // User is starting a new discussion in a forum
@@ -145,6 +143,9 @@
             error("Incorrect cm");
         }
 
+        // call course_setup to use forced language, MDL-6926 
+        course_setup($course->id);
+
         $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
         $modcontext    = get_context_instance(CONTEXT_MODULE, $cm->id);
 
@@ -190,8 +191,6 @@
         if (!(substr($post->subject, 0, strlen($strre)) == $strre)) {
             $post->subject = $strre.' '.$post->subject;
         }
-         
-        
 
         unset($SESSION->fromdiscussion);
 
@@ -272,7 +271,7 @@
 
         $replycount = forum_count_replies($post);
 
-        if (!empty($confirm)) {    // User has confirmed the delete
+        if (!empty($confirm) && confirm_sesskey()) {    // User has confirmed the delete
 
             if ($post->totalscore) {
                 notice(get_string("couldnotdeleteratings", "forum"),
@@ -326,7 +325,7 @@
                 }
                 print_header();
                 notice_yesno(get_string("deletesureplural", "forum", $replycount+1),
-                             "post.php?delete=$delete&amp;confirm=$delete",
+                             "post.php?delete=$delete&amp;confirm=$delete&amp;sesskey=".sesskey(),
                              $CFG->wwwroot.'/mod/forum/discuss.php?d='.$post->discussion.'#p'.$post->id);
 
                 forum_print_post($post, $discussion, $forum, $cm, $course, false, false, false);
@@ -339,14 +338,13 @@
             } else {
                 print_header();
                 notice_yesno(get_string("deletesure", "forum", $replycount),
-                             "post.php?delete=$delete&amp;confirm=$delete",
+                             "post.php?delete=$delete&amp;confirm=$delete&amp;sesskey=".sesskey(),
                              $CFG->wwwroot.'/mod/forum/discuss.php?d='.$post->discussion.'#p'.$post->id);
                 forum_print_post($post, $discussion, $forum, $cm, $course, false, false, false);
             }
 
         }
-        //we pass a new parameter to the function so it won't we printed if is_lams=1
-         print_footer($course,null, false,$cm->is_lams);
+        print_footer($course,null, false,$cm->is_lams);
         die;
 
 
@@ -376,7 +374,7 @@
             error("You can't split discussions!");
         }
 
-        if (!empty($name)) {    // User has confirmed the prune
+        if (!empty($name) && confirm_sesskey()) {    // User has confirmed the prune
 
             $newdiscussion = new object();
             $newdiscussion->course       = $discussion->course;
@@ -422,13 +420,8 @@
             $navlinks[] = array('name' => format_string($post->subject, true), 'link' => "discuss.php?d=$discussion->id", 'type' => 'title');
             $navlinks[] = array('name' => get_string("prune", "forum"), 'link' => '', 'type' => 'title');
             $navigation = build_navigation($navlinks, $cm);
-            
-            //we pass a new parameter to the function so it won't we printed if is_lams=1
-            print_header_simple(format_string($discussion->name).": ".format_string($post->subject), "", $navigation, '', "", true, "", navmenu($course, $cm),false,'',false,$cm->is_lams);	
-			
-             
-      
-        
+            print_header_simple(format_string($discussion->name).": ".format_string($post->subject), "", $navigation, '', "", true, "", navmenu($course, $cm));
+
             print_heading(get_string('pruneheading', 'forum'));
             echo '<center>';
 
@@ -437,8 +430,7 @@
             forum_print_post($post, $discussion, $forum, $cm, $course, false, false, false);
             echo '</center>';
         }
-        //we pass a new parameter to the function so it won't we printed if is_lams=1
-         print_footer($course,null, false,$cm->is_lams);
+        print_footer($course,null, false,$cm->is_lams);
         die;
     } else {
         error("No operation specified");
@@ -455,6 +447,11 @@
     }
     $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
 
+    // setup course variable to force form language
+    // fix for MDL-6926
+    course_setup($course->id);
+    require_once('post_form.php');
+
     $mform_post = new mod_forum_post_form('post.php', array('course'=>$course, 'cm'=>$cm, 'coursecontext'=>$coursecontext, 'modcontext'=>$modcontext, 'forum'=>$forum, 'post'=>$post));
 
     if ($fromform = $mform_post->get_data()) {
@@ -472,11 +469,11 @@
         //$fromform->attachment = isset($_FILES['attachment']) ? $_FILES['attachment'] : NULL;
 
         trusttext_after_edit($fromform->message, $modcontext);
-     
-        if($editing==0&&$cm->is_lams==1){//lams: if you are a learner and have add a post to the forum display next activity button to continue the activities in Lams
-			   include('showlamsnext.php');
-		}
 
+	if($editing==0&&$cm->is_lams==1){//lams: if you are a learner and have add a post to the forum display next activity button to continue the activities in Lams
+	  include('showlamsnext.php');
+	}
+
         if ($fromform->edit) {           // Updating a post
             unset($fromform->groupid);
             $fromform->id = $fromform->edit;
@@ -535,7 +532,7 @@
                     "$discussionurl&amp;parent=$fromform->id", "$fromform->id", $cm->id);
 
             redirect(forum_go_back_to("$discussionurl"), $message.$subscribemessage, $timemessage);
-			
+
             exit;
 
 
@@ -575,7 +572,7 @@
                           "$discussionurl&amp;parent=$fromform->id", "$fromform->id", $cm->id);
 
                 redirect(forum_go_back_to("$discussionurl#p$fromform->id"), $message.$subscribemessage, $timemessage);
-				
+
             } else {
                 print_error("couldnotadd", "forum", $errordestination);
             }
@@ -623,7 +620,7 @@
                 if ($subscribemessage = forum_post_subscription($discussion, $forum)) {
                     $timemessage = 4;
                 }
-         
+
                 redirect(forum_go_back_to("view.php?f=$fromform->forum"), $message.$subscribemessage, $timemessage);
 
             } else {
@@ -687,15 +684,15 @@
         $navlinks[] = array('name' => format_string($toppost->subject), 'link' => '', 'type' => 'title');
     }
     $navigation = build_navigation($navlinks, $cm);
-	// if in Lams sequence don't display moodle navigation headers 
-	if($cm->is_lams==1){
-    	print_header();
-	}else{
-    	print_header("$course->shortname: $strdiscussionname ".
-	                  format_string($toppost->subject), $course->fullname,
-	                  $navigation, $mform_post->focus($forcefocus), "", true, "", navmenu($course, $cm));
-	}
-                  
+     // if in Lams sequence don't display moodle navigation headers 
+     if($cm->is_lams==1){   
+       print_header();
+     } else {
+       
+       print_header("$course->shortname: $strdiscussionname ".
+		    format_string($toppost->subject), $course->fullname,
+		    $navigation, $mform_post->focus($forcefocus), "", true, "", navmenu($course, $cm));
+     }
 
 // checkup
     if (!empty($parent) && !forum_user_can_see_post($forum, $discussion, $post, null, $cm)) {
@@ -749,8 +746,7 @@
         } else {
             $data->name = fullname($USER);
             $post->message .= "\n\n(".get_string('editedby', 'forum', $data).')';
-        }  
-       
+        }
     }
 
     //load data into form
@@ -803,7 +799,6 @@
     $mform_post->display();
 
 
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
     print_footer($course,null, false,$cm->is_lams);
 
 
Index: temp_moodle_dev/moodle/mod/forum/prune.html
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/forum/prune.html	(.../prune.html)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/forum/prune.html	(.../prune.html)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -11,6 +11,7 @@
     <td align="center" colspan="2">
     <input type="hidden" name="prune"   value="<?php p($prune) ?>" />
     <input type="hidden" name="confirm" value="<?php p($prune) ?>" />
+    <input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />
     <input type="submit" value="<?php print_string('prune', 'forum'); ?>" />
     </td>
 </tr>
Index: temp_moodle_dev/moodle/mod/forum/rate.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/forum/rate.php	(.../rate.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/forum/rate.php	(.../rate.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -2,14 +2,15 @@
 
 //  Collect ratings, store them, then return to where we came from
 
+/// TODO: Centralise duplicate code in rate.php and rate_ajax.php
 
     require_once('../../config.php');
     require_once('lib.php');
 
     $forumid = required_param('forumid', PARAM_INT); // The forum the rated posts are from
 
     if (!$forum = get_record('forum', 'id', $forumid)) {
-        error("Course ID was incorrect");
+        error("Forum ID was incorrect");
     }
 
     if (!$course = get_record('course', 'id', $forum->course)) {
@@ -39,6 +40,9 @@
 
         $discussionid = false;
 
+    /// Calculate scale values
+        $scale_values = make_grades_menu($forum->scale);
+
         foreach ((array)$data as $postid => $rating) {
             if (!is_numeric($postid)) {
                 continue;
@@ -62,6 +66,11 @@
                 }
             }
 
+        /// Check rate is valid for for that forum scale values
+            if (!array_key_exists($rating, $scale_values) && $rating != FORUM_UNSET_POST_RATING) {
+                print_error('invalidrate', 'forum', '', $rating);
+            }
+
             if ($rating == FORUM_UNSET_POST_RATING) {
                 delete_records('forum_ratings', 'post', $postid, 'userid', $USER->id);
                 forum_update_grades($forum, $post->userid);
Index: temp_moodle_dev/moodle/mod/forum/rate_ajax.js
===================================================================
diff -u
--- temp_moodle_dev/moodle/mod/forum/rate_ajax.js	(revision 0)
+++ temp_moodle_dev/moodle/mod/forum/rate_ajax.js	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -0,0 +1,173 @@
+// $Id$
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.org                                            //
+//                                                                       //
+// Copyright (C) 1999 onwards 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                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+/// Javascript used to handle AJAX forum ratings
+
+/**
+ * This function initializes all the stuff needed to have forum ratings
+ * working under AJAX. Basically it adds one onload listener that triggers
+ * the add_menu_listeners() function to add menu listeners
+ */
+function init_rate_ajax () {
+    YAHOO.util.Event.onDOMReady(add_menu_listeners);
+}
+
+/**
+ * This function adds event listeners to any rating
+ * menu found in he page (class = forumpostratingmenu)
+ * and prevents manual submission
+ */
+function add_menu_listeners(e) {
+
+    /** hide the submit button */
+    var submitbutton = YAHOO.util.Dom.get('forumpostratingsubmit');
+    submitbutton.style.display = 'none';
+
+    /** prevent form submission **/
+    var form = YAHOO.util.Dom.get('form');
+    YAHOO.util.Event.addListener(form, 'submit', prevent_form_submission);
+
+    /** add listeners to all rating menus */
+    var menus = YAHOO.util.Dom.getElementsByClassName('forumpostratingmenu', 'select');
+    for (var i=0; i<menus.length; i++) {
+        var menu = menus[i];
+        YAHOO.util.Event.addListener(menu, 'change', perform_rate, menu);
+    }
+}
+
+/**
+ * This function prevents manual form submission, to avoid
+ * rate form to be submitted completely
+ */
+function prevent_form_submission(e) {
+
+    /** stop submission completely **/
+    YAHOO.util.Event.stopEvent(e);
+}
+
+/**
+ * This function performs the communication with the server
+ * in order to send new rates and receive feedback about that.
+ * It is the action thrown by all the menu listeners defined above
+ */
+function perform_rate(e, menu) {
+
+    /** define response behaviour **/
+    var callback = {
+        success: rate_success,
+        failure: rate_failure,
+        args:menu
+    };
+
+    /** Here goes the request **/
+    var url = rate_ajax_config.wwwroot +  '/mod/forum/rate_ajax.php?postid=' + menu.name + '&rate=' + menu.value + '&sesskey=' + rate_ajax_config.sesskey;
+    YAHOO.util.Connect.asyncRequest('GET', url, callback, null);
+
+    /** Start animation **/
+    var animatedElement   = YAHOO.util.Dom.getAncestorByTagName(menu, 'div');
+    animatedElement.style.background = "url('" + rate_ajax_config.pixpath + "/i/loading_small.gif') no-repeat top right";
+
+}
+
+/**
+ * Code to execute when we receive a success in the AJAX response
+ * It should print updated info about ratings (replacing previous one)
+ */
+function rate_success(o) {
+    menu = this.args;
+
+    /** Stop animation **/
+    var animatedElement   = YAHOO.util.Dom.getAncestorByTagName(menu, 'div');
+    animatedElement.style.background = '';
+
+    /** Parse json response **/
+    var response = new Object();
+    try {
+        response = YAHOO.lang.JSON.parse(o.responseText);
+    } catch (e) { /** Fake response **/
+        response.status = 'Error';
+        response.message= '';
+    }
+
+    /** Process error response **/
+    if (response.status != 'Ok') {
+        display_error(menu, response);
+    } else {
+        display_response(menu, response);
+    }
+
+    /** That's all, really simple **/
+}
+
+/**
+ * Code to execute when we receive a failure in the AJAX response
+ * It should print some error message
+ */
+function rate_failure(o) {
+    menu = this.args;
+
+    /** Stop animation **/
+    var animatedElement   = YAHOO.util.Dom.getAncestorByTagName(menu, 'div');
+    animatedElement.style.background = '';
+
+    /** Process error response **/
+    display_error(menu);
+}
+
+/**
+ * This function will display the correct response received from server
+ */
+function display_response(menu, response) {
+
+    /** Correct response, revert menu color if neeeded **/
+    if (menu.style.backgroundColor == 'red') {
+        menu.style.backgroundColor = null;
+    }
+
+    /** Process ok response, displaying it **/
+    var ratingsDiv  = YAHOO.util.Dom.getAncestorByTagName(menu, 'div');
+    var ratingsSpan = YAHOO.util.Dom.getFirstChildBy(ratingsDiv, function(el){return YAHOO.util.Dom.hasClass(el,'forumpostratingtext');});
+
+    /** span doesn't exist (first rate), add it, shouldn't happen ever but... fallback**/
+    if (!ratingsSpan) {
+        ratingsSpan = document.createElement('span');
+        YAHOO.util.Dom.addClass(ratingsSpan, 'forumpostratingtext');
+        ratingsDiv.appendChild(ratingsSpan);
+    }
+
+    /** finally replace span HTML **/
+    ratingsSpan.innerHTML = response.message ? response.message : ''; /** Prevent null to be printed in IE7 **/
+}
+
+/**
+ * This function will perform the desired actions to inform
+ * about the error response of ajax request
+ */
+function display_error(menu, response) {
+    /** Set red background color in menu - silly error measure **/
+    menu.style.backgroundColor = 'red';
+}
+
Index: temp_moodle_dev/moodle/mod/forum/rate_ajax.php
===================================================================
diff -u
--- temp_moodle_dev/moodle/mod/forum/rate_ajax.php	(revision 0)
+++ temp_moodle_dev/moodle/mod/forum/rate_ajax.php	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -0,0 +1,160 @@
+<?php // $Id$
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.org                                            //
+//                                                                       //
+// Copyright (C) 1999 onwards 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                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+/// Accept, process and reply to ajax calls to rate forums
+
+/// TODO: Centralise duplicate code in rate.php and rate_ajax.php
+
+    require_once('../../config.php');
+    require_once($CFG->dirroot . '/mod/forum/lib.php');
+
+/// In developer debug mode, when there is a debug=1 in the URL send as plain text
+/// for easier debugging.
+    if (debugging('', DEBUG_DEVELOPER) && optional_param('debug', false, PARAM_BOOL)) {
+        header('Content-type: text/plain; charset=UTF-8');
+        $debugmode = true;
+    } else {
+        header('Content-type: application/json');
+        $debugmode = false;
+    }
+
+/// Here we maintain response contents
+    $response = array('status'=> 'Error', 'message'=>'kk');
+
+/// Check access.
+    if (!isloggedin()) {
+        print_error('mustbeloggedin');
+    }
+    if (isguestuser()) {
+        print_error('noguestrate', 'forum');
+    }
+    if (!confirm_sesskey()) {
+        print_error('invalidsesskey');
+    }
+
+
+/// Check required params
+    $postid = required_param('postid', PARAM_INT); // The postid to rate
+    $rate   = required_param('rate', PARAM_INT); // The rate to apply
+
+/// Check postid is valid
+    if (!$post = get_record_sql("SELECT p.*,
+                                        d.forum AS forumid
+                                   FROM {$CFG->prefix}forum_posts p
+                                   JOIN {$CFG->prefix}forum_discussions d ON p.discussion = d.id
+                                  WHERE p.id = $postid")) {
+        print_error('invalidpostid', 'forum', '', $postid);
+    }
+
+/// Check forum
+    if (!$forum = get_record('forum', 'id', $post->forumid)) {
+        print_error('invalidforumid', 'forum');
+    }
+
+/// Check course
+    if (!$course = get_record('course', 'id', $forum->course)) {
+        print_error('invalidcourseid');
+    }
+
+/// Check coursemodule
+    if (!$cm = get_coursemodule_from_instance('forum', $forum->id)) {
+        print_error('invalidcoursemodule');
+    } else {
+        $forum->cmidnumber = $cm->id; //MDL-12961
+    }
+
+/// Check forum can be rated
+    if (!$forum->assessed) {
+        print_error('norate', 'forum');
+    }
+
+/// Check user can rate
+    $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+    require_capability('mod/forum:rate', $context);
+
+/// Check timed ratings
+    if ($forum->assesstimestart and $forum->assesstimefinish) {
+        if ($post->created < $forum->assesstimestart or $post->created > $forum->assesstimefinish) {
+            // we can not rate this, ignore it - this should not happen anyway unless teacher changes setting
+            print_error('norate', 'forum');
+        }
+    }
+
+/// Calculate scale values
+    $scale_values = make_grades_menu($forum->scale);
+
+/// Check rate is valid for for that forum scale values
+    if (!array_key_exists($rate, $scale_values) && $rate != FORUM_UNSET_POST_RATING) {
+        print_error('invalidrate', 'forum');
+    }
+
+/// Everything ready, process rate
+
+/// Deleting rate
+    if ($rate == FORUM_UNSET_POST_RATING) {
+        delete_records('forum_ratings', 'post', $postid, 'userid', $USER->id);
+
+/// Updating rate
+    } else if ($oldrating = get_record('forum_ratings', 'userid', $USER->id, 'post', $post->id)) {
+        if ($rate != $oldrating->rating) {
+            $oldrating->rating = $rate;
+            $oldrating->time   = time();
+            if (!update_record('forum_ratings', $oldrating)) {
+                print_error('cannotupdaterate', 'error', '', (object)array('id'=>$post->id, 'rating'=>$rate));
+            }
+        }
+
+/// Inserting rate
+    } else {
+        $newrating = new object();
+        $newrating->userid = $USER->id;
+        $newrating->time   = time();
+        $newrating->post   = $post->id;
+        $newrating->rating = $rate;
+
+        if (!insert_record('forum_ratings', $newrating)) {
+            print_error('cannotinsertrate', 'error', '', (object)array('id'=>$postid, 'rating'=>$rate));
+        }
+    }
+
+/// Update grades
+    forum_update_grades($forum, $post->userid);
+
+/// Check user can see any rate
+    $canviewanyrating = has_capability('mod/forum:viewanyrating', $context);
+
+/// Decide if rates info is displayed
+    $rateinfo = '';
+    if ($canviewanyrating) {
+        $rateinfo = forum_print_ratings($postid, $scale_values, $forum->assessed, true, NULL, true);
+    }
+
+/// Calculate response
+    $response['status']  = 'Ok';
+    $response['message'] = $rateinfo;
+    echo json_encode($response);
+
+?>
Index: temp_moodle_dev/moodle/mod/forum/settings.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/forum/settings.php	(.../settings.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/forum/settings.php	(.../settings.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -61,4 +61,7 @@
 $settings->add(new admin_setting_configcheckbox('forum_logblocked', get_string('logblocked', 'forum'),
                    get_string('configlogblocked', 'forum'), 1));
 
+$settings->add(new admin_setting_configcheckbox('forum_ajaxrating', get_string('ajaxrating', 'forum'),
+                   get_string('configajaxrating', 'forum'), 0));
+
 ?>
Index: temp_moodle_dev/moodle/mod/forum/subscribe.php
===================================================================
diff -u -r48d91a6edb8b0ef9ddd87ff0f3bf4949a78de099 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/forum/subscribe.php	(.../subscribe.php)	(revision 48d91a6edb8b0ef9ddd87ff0f3bf4949a78de099)
+++ temp_moodle_dev/moodle/mod/forum/subscribe.php	(.../subscribe.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -56,8 +56,8 @@
         
         notice_yesno(get_string('noguestsubscribe', 'forum').'<br /><br />'.get_string('liketologin'),
                      $wwwroot, $_SERVER['HTTP_REFERER']);
-        //we pass a new parameter to the function so it won't we printed if is_lams=1
-         print_footer($course,null, false,$cm->is_lams);
+	//we pass a new parameter to the function so it won't we printed if is_lams=1
+        print_footer($course,null, false,$cm->is_lams);
         exit;
     }
 
Index: temp_moodle_dev/moodle/mod/forum/subscriber.html
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/forum/subscriber.html	(.../subscriber.html)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/forum/subscriber.html	(.../subscriber.html)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -1,6 +1,5 @@
 
 <form id="subscriberform" method="post" action="subscribers.php">
-<input type="hidden" name="previoussearch" value="<?php p($previoussearch) ?>" />
 <input type="hidden" name="id" value="<?php echo $id?>" />
   <table align="center" border="0" cellpadding="5" cellspacing="0">
     <tr>
@@ -14,7 +13,7 @@
     </tr>
     <tr>
       <td valign="top">
-          <select name="removeselect[]" size="20" id="removeselect" multiple
+          <select name="removeselect[]" size="20" id="removeselect" multiple="multiple"
                   onFocus="getElementById('subscriberform').add.disabled=true;
                            getElementById('subscriberform').remove.disabled=false;
                            getElementById('subscriberform').addselect.selectedIndex=-1;">
@@ -34,12 +33,12 @@
         <br />
       </td>
       <td valign="top">
-          <select name="addselect[]" size="20" id="addselect" multiple
+          <select name="addselect[]" size="20" id="addselect" multiple="multiple"
                   onFocus="getElementById('subscriberform').add.disabled=false;
                            getElementById('subscriberform').remove.disabled=true;
                            getElementById('subscriberform').removeselect.selectedIndex=-1;">
           <?php
-              if (!empty($searchusers)) {
+              if (isset($searchusers)) {
                   echo "<optgroup label=\"$strsearchresults (" . count($searchusers) . ")\">\n";
                   foreach ($searchusers as $user) {
                       $fullname = fullname($user, true);
@@ -56,19 +55,10 @@
           ?>
          </select>
          <br />
-         <input type="text" name="searchtext" size="30" value="<?php p($searchtext, true) ?>" 
-                  onFocus ="getElementById('subscriberform').add.disabled=true;
-                            getElementById('subscriberform').remove.disabled=true;
-                            getElementById('subscriberform').removeselect.selectedIndex=-1;
-                            getElementById('subscriberform').addselect.selectedIndex=-1;"
-                  onkeydown = "var keyCode = event.which ? event.which : event.keyCode;
-                               if (keyCode == 13) {
-                                    getElementById('subscriberform').previoussearch.value=1;
-                                    getElementById('subscriberform').submit();
-                               } " />
+         <input type="text" name="searchtext" size="30" value="<?php p($searchtext, true) ?>" />
          <input name="search" id="search" type="submit" value="<?php p($strsearch) ?>" />
          <?php
-              if (!empty($searchusers)) {
+              if (isset($searchusers)) {
                   echo '<input name="showall" id="showall" type="submit" value="'.$strshowall.'" />'."\n";
               }
          ?>
Index: temp_moodle_dev/moodle/mod/forum/subscribers.php
===================================================================
diff -u -r48d91a6edb8b0ef9ddd87ff0f3bf4949a78de099 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/forum/subscribers.php	(.../subscribers.php)	(revision 48d91a6edb8b0ef9ddd87ff0f3bf4949a78de099)
+++ temp_moodle_dev/moodle/mod/forum/subscribers.php	(.../subscribers.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -34,20 +34,20 @@
     $strsubscribeall = get_string("subscribeall", "forum");
     $strsubscribenone = get_string("subscribenone", "forum");
     $strsubscribers = get_string("subscribers", "forum");
-    $strforums      = get_string("forums", "forum");
+    $strforums = get_string("forums", "forum");
 
     $navigation = build_navigation($strsubscribers, $cm);
 
     if (has_capability('mod/forum:managesubscriptions', $context)) {
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
+      //we pass a new parameter to the function so it won't we printed if is_lams=1
         print_header_simple("$strsubscribers", "", $navigation,
-            "", "", true, forum_update_subscriptions_button($course->id, $id),'',false,'',false,$cm->is_lams);
+			    "", "", true, forum_update_subscriptions_button($course->id, $id),'',false,'',false,$cm->is_lams);
         if ($edit != -1) {
             $USER->subscriptionsediting = $edit;
         }
     } else {
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
-        print_header_simple("$strsubscribers", "", $navigation, "", "", true, '','',false,'',false,$cm->is_lams);
+      //we pass a new parameter to the function so it won't we printed if is_lams=1
+      print_header_simple("$strsubscribers", "", $navigation, "", "", true, '','',false,'',false,$cm->is_lams);
         unset($USER->subscriptionsediting);
     }
 
@@ -58,7 +58,7 @@
 
     if (empty($USER->subscriptionsediting)) {         /// Display an overview of subscribers
 
-        if (! $users = forum_subscribed_users($course, $forum, $currentgroup) ) {
+        if (! $users = forum_subscribed_users($course, $forum, $currentgroup, $context) ) {
 
             print_heading(get_string("nosubscribers", "forum"));
 
@@ -80,7 +80,7 @@
         }
 
         //we pass a new parameter to the function so it won't we printed if is_lams=1
-         print_footer($course,null, false,$cm->is_lams);
+	print_footer($course,null, false,$cm->is_lams);
         exit;
     }
 
@@ -96,12 +96,11 @@
     $strsubscribers = get_string("subscribers", "forum");
     $strforums      = get_string("forums", "forum");
 
+    $searchtext = optional_param('searchtext', '', PARAM_RAW);
     if ($frm = data_submitted()) {
 
 /// A form was submitted so process the input
-
         if (!empty($frm->add) and !empty($frm->addselect)) {
-
             foreach ($frm->addselect as $addsubscriber) {
                 if (! forum_subscribe($addsubscriber, $id)) {
                     error("Could not add subscriber with id $addsubscriber to this forum!");
@@ -114,48 +113,41 @@
                 }
             }
         } else if (!empty($frm->showall)) {
-            unset($frm->searchtext);
-            $frm->previoussearch = 0;
+            $searchtext = '';
         }
     }
 
-    $previoussearch = (!empty($frm->search) or (!empty($frm->previoussearch) && $frm->previoussearch == 1)) ;
-
 /// Get all existing subscribers for this forum.
-    if (!$subscribers = forum_subscribed_users($course, $forum, $currentgroup)) {
+    if (!$subscribers = forum_subscribed_users($course, $forum, $currentgroup, $context)) {
         $subscribers = array();
     }
 
-    $subscriberarray = array();
+/// Get all the potential subscribers excluding users already subscribed
+    $users = forum_get_potential_subscribers($context, $currentgroup, 'id,email,firstname,lastname', 'firstname ASC, lastname ASC');
+    if (!$users) {
+        $users = array();
+    }
     foreach ($subscribers as $subscriber) {
-        $subscriberarray[] = $subscriber->id;
+        unset($users[$subscriber->id]);
     }
-    $subscriberlist = implode(',', $subscriberarray);
 
-    unset($subscriberarray);
-
-/// Get search results excluding any users already subscribed
-
-    if (!empty($frm->searchtext) and $previoussearch) {
-        $searchusers = search_users($course->id, $currentgroup, $frm->searchtext, 'firstname ASC, lastname ASC', $subscriberlist);
-    }
-
-/// If no search results then get potential subscribers for this forum excluding users already subscribed
-    if (empty($searchusers)) {
-        if ($currentgroup) {
-            $users = get_group_users($currentgroup, 'firstname ASC, lastname ASC', $subscriberlist);
-        } else {
-             $users = get_course_users($course->id, 'firstname ASC, lastname ASC', $subscriberlist);
+/// This is yucky, but do the search in PHP, becuase the list we are using comes from get_users_by_capability,
+/// which does not allow searching in the database. Fortunately the list is only this list of users in this
+/// course, which is normally OK, except on the site course of a big site. But before you can enter a search
+/// term, you have already seen a page that lists everyone, since this code never does paging, so you have probably
+/// already crashed your server if you are going to. This will be fixed properly for Moodle 2.0: MDL-17550.
+    if ($searchtext) {
+        $searchusers = array();
+        $lcsearchtext = moodle_strtolower($searchtext);
+        foreach ($users as $userid => $user) {
+            if (strpos(moodle_strtolower($user->email), $lcsearchtext) !== false ||
+                    strpos(moodle_strtolower($user->firstname . ' ' . $user->lastname), $lcsearchtext) !== false) {
+                $searchusers[$userid] = $user;
+            }
+            unset($users[$userid]);
         }
-        if (!$users) {
-            $users = array();
-        }
-
     }
 
-    $searchtext = (isset($frm->searchtext)) ? $frm->searchtext : "";
-    $previoussearch = ($previoussearch) ? '1' : '0';
-
     print_simple_box_start('center');
 
     include('subscriber.html');
Index: temp_moodle_dev/moodle/mod/forum/version.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/forum/version.php	(.../version.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/forum/version.php	(.../version.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -5,7 +5,7 @@
 //  This fragment is called by /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2007101512;
+$module->version  = 2007101513;
 $module->requires = 2007101509;  // Requires this Moodle version
 $module->cron     = 60;
 
Index: temp_moodle_dev/moodle/mod/forum/view.php
===================================================================
diff -u -rfaa773988e907aa4cca07fb53a572435d2db186f -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/forum/view.php	(.../view.php)	(revision faa773988e907aa4cca07fb53a572435d2db186f)
+++ temp_moodle_dev/moodle/mod/forum/view.php	(.../view.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -13,7 +13,8 @@
     $page        = optional_param('page', 0, PARAM_INT);     // which page to show
     $search      = optional_param('search', '');             // search string
     $returnurl   = optional_param('returnUrl', '', PARAM_TEXT);  // lams url to proceed to next in sequence
-	$editing  = optional_param('editing', 0, PARAM_INT); // 1 if editing in Lams
+    $editing  = optional_param('editing', 0, PARAM_INT); // 1 if editing in Lams
+
     $buttontext = '';
 
     if ($id) {
@@ -26,6 +27,9 @@
         if (! $forum = get_record("forum", "id", $cm->instance)) {
             error("Forum ID was incorrect");
         }
+        // move require_course_login here to use forced language for course
+        // fix for MDL-6926
+        require_course_login($course, true, $cm);
         $strforums = get_string("modulenameplural", "forum");
         $strforum = get_string("modulename", "forum");
         $buttontext = update_module_button($cm->id, $course->id, $strforum);
@@ -39,13 +43,16 @@
             error("Forum is misconfigured - don't know what course it's from");
         }
 
-        $strforums = get_string("modulenameplural", "forum");
-        $strforum = get_string("modulename", "forum");
-
         if (!$cm = get_coursemodule_from_instance("forum", $forum->id, $course->id)) {
             error("Course Module missing");
         }
 
+        // move require_course_login here to use forced language for course
+        // fix for MDL-6926
+        require_course_login($course, true, $cm);
+
+        $strforums = get_string("modulenameplural", "forum");
+        $strforum = get_string("modulename", "forum");
         $buttontext = update_module_button($cm->id, $course->id, $strforum);
 
     } else {
@@ -56,16 +63,13 @@
         $buttontext = forum_search_form($course, $search);
     }
 
-
-    require_course_login($course, true, $cm);
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 
-
 /// Print header.
     $navigation = build_navigation('', $cm);
     //we pass a new parameter to the function so it won't we printed if is_lams=1
     print_header_simple(format_string($forum->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm),false,'',false,$cm->is_lams);
+			$navigation, "", "", true, $buttontext, navmenu($course, $cm),false,'',false,$cm->is_lams);
 
 /// Some capability checks.
     if (empty($cm->visible) and !has_capability('moodle/course:viewhiddenactivities', $context)) {
@@ -87,7 +91,7 @@
     } else {
         add_to_log($course->id, "forum", "view forum", "view.php?f=$forum->id", "$forum->id");
     }
-	
+
     if($editing==1&&$cm->is_lams==1){//lams: if you are a teacher editing show lams navigation button to finish editing
 			include('showlamsfinish.php');
 	}
@@ -124,45 +128,46 @@
 
     if (!empty($USER->id) && !has_capability('moodle/legacy:guest', $context, NULL, false)) {
         $SESSION->fromdiscussion = "$FULLME";
-	        if (forum_is_forcesubscribed($forum)) {
-	            $streveryoneisnowsubscribed = get_string('everyoneisnowsubscribed', 'forum');
-	            $strallowchoice = get_string('allowchoice', 'forum');
-	            echo '<span class="helplink">' . get_string("forcessubscribe", 'forum') . '</span><br />';
-	            helpbutton("subscription", $strallowchoice, "forum");
-	            echo '&nbsp;<span class="helplink">';
-	            if (has_capability('mod/forum:managesubscriptions', $context)) {
-	                echo "<a title=\"$strallowchoice\" href=\"subscribe.php?id=$forum->id&amp;force=no\">$strallowchoice</a>";
-	            } else {
-	                echo $streveryoneisnowsubscribed;
-	            }
-	            echo '</span><br />';
-	
-	        } else if ($forum->forcesubscribe == FORUM_DISALLOWSUBSCRIBE) {
-	            $strsubscriptionsoff = get_string('disallowsubscribe','forum');
-	            echo $strsubscriptionsoff;
-	            helpbutton("subscription", $strsubscriptionsoff, "forum");
-	        } else {
-	            $streveryonecannowchoose = get_string("everyonecannowchoose", "forum");
-	            $strforcesubscribe = get_string("forcesubscribe", "forum");
-	            $strshowsubscribers = get_string("showsubscribers", "forum");
-	            echo '<span class="helplink">' . get_string("allowsallsubscribe", 'forum') . '</span><br />';
-	            helpbutton("subscription", $strforcesubscribe, "forum");
-	            echo '&nbsp;';
-	
-	            if (has_capability('mod/forum:managesubscriptions', $context)) {
-	                echo "<span class=\"helplink\"><a title=\"$strforcesubscribe\" href=\"subscribe.php?id=$forum->id&amp;force=yes\">$strforcesubscribe</a></span>";
-	            } else {
-	                echo '<span class="helplink">'.$streveryonecannowchoose.'</span>';
-	            }
-	
-	            if(has_capability('mod/forum:viewsubscribers', $context)){
-	                echo "<br />";
-	                echo "<span class=\"helplink\"><a href=\"subscribers.php?id=$forum->id\">$strshowsubscribers</a></span>";
-	            }
-	
-	            echo '<div class="helplink" id="subscriptionlink">', forum_get_subscribe_link($forum, $context,
-	                    array('forcesubscribed' => '', 'cantsubscribe' => '')), '</div>';
+        if (forum_is_forcesubscribed($forum)) {
+            $streveryoneisnowsubscribed = get_string('everyoneisnowsubscribed', 'forum');
+            $strallowchoice = get_string('allowchoice', 'forum');
+            echo '<span class="helplink">' . get_string("forcessubscribe", 'forum') . '</span><br />';
+            helpbutton("subscription", $strallowchoice, "forum");
+            echo '&nbsp;<span class="helplink">';
+            if (has_capability('mod/forum:managesubscriptions', $context)) {
+                echo "<a title=\"$strallowchoice\" href=\"subscribe.php?id=$forum->id&amp;force=no\">$strallowchoice</a>";
+            } else {
+                echo $streveryoneisnowsubscribed;
+            }
+            echo '</span><br />';
+
+        } else if ($forum->forcesubscribe == FORUM_DISALLOWSUBSCRIBE) {
+            $strsubscriptionsoff = get_string('disallowsubscribe','forum');
+            echo $strsubscriptionsoff;
+            helpbutton("subscription", $strsubscriptionsoff, "forum");
+        } else {
+            $streveryonecannowchoose = get_string("everyonecannowchoose", "forum");
+            $strforcesubscribe = get_string("forcesubscribe", "forum");
+            $strshowsubscribers = get_string("showsubscribers", "forum");
+            echo '<span class="helplink">' . get_string("allowsallsubscribe", 'forum') . '</span><br />';
+            helpbutton("subscription", $strforcesubscribe, "forum");
+            echo '&nbsp;';
+
+            if (has_capability('mod/forum:managesubscriptions', $context)) {
+                echo "<span class=\"helplink\"><a title=\"$strforcesubscribe\" href=\"subscribe.php?id=$forum->id&amp;force=yes\">$strforcesubscribe</a></span>";
+            } else {
+                echo '<span class="helplink">'.$streveryonecannowchoose.'</span>';
+            }
+
+            if(has_capability('mod/forum:viewsubscribers', $context)){
+                echo "<br />";
+                echo "<span class=\"helplink\"><a href=\"subscribers.php?id=$forum->id\">$strshowsubscribers</a></span>";
+            }
+
+            echo '<div class="helplink" id="subscriptionlink">', forum_get_subscribe_link($forum, $context,
+                    array('forcesubscribed' => '', 'cantsubscribe' => '')), '</div>';
         }
+
         if (forum_tp_can_track_forums($forum)) {
             echo '<div class="helplink" id="trackinglink">'. forum_get_tracking_link($forum). '</div>';
         }
@@ -185,7 +190,7 @@
         }
 //        print_box_start('rsslink');
         echo '<span class="wrap rsslink">';
-       rss_print_link($course->id, $userid, "forum", $forum->id, $tooltiptext);
+        rss_print_link($course->id, $userid, "forum", $forum->id, $tooltiptext);
         echo '</span>';
 //        print_box_end(); // subscription
 
@@ -237,9 +242,11 @@
 
         case 'eachuser':
             if (!empty($forum->intro)) {
-                print_box(format_text($forum->intro), 'generalbox', 'intro');
+                $options = new stdclass;
+                $options->para = false;
+                print_box(format_text($forum->intro, FORMAT_MOODLE, $options), 'generalbox', 'intro');
             }
-            echo '<p align="center">';
+            echo '<p class="mdl-align">';
             if (forum_user_can_post_discussion($forum, null, -1, $cm)) {
                 print_string("allowsdiscussions", "forum");
             } else {
@@ -263,7 +270,9 @@
 
         default:
             if (!empty($forum->intro)) {
-                print_box(format_text($forum->intro), 'generalbox', 'intro');
+                $options = new stdclass;
+                $options->para = false;
+                print_box(format_text($forum->intro, FORMAT_MOODLE, $options), 'generalbox', 'intro');
             }
             echo '<br />';
             if (!empty($showall)) {
@@ -275,8 +284,9 @@
 
             break;
     }
-  
+   
         //we pass a new parameter to the function so it won't we printed if is_lams=1
          print_footer($course,null, false,$cm->is_lams);
 
+
 ?>
Index: temp_moodle_dev/moodle/mod/glossary/comment.php
===================================================================
diff -u -r587c0e61fc21b94cd096a9a66858a47be3e27d7a -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/glossary/comment.php	(.../comment.php)	(revision 587c0e61fc21b94cd096a9a66858a47be3e27d7a)
+++ temp_moodle_dev/moodle/mod/glossary/comment.php	(.../comment.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -72,18 +72,18 @@
         if (!$newcomment->id = insert_record('glossary_comments', $newcomment)) {
             error('Could not insert this new comment');
         } else {
-        	if($cm->is_lams==1){
-        	 	$next=1;//lams: variable we pass to the view page to tell it that there is a new entry
-        	}
+	    if($cm->is_lams==1){
+		$next=1;//lams: variable we pass to the view page to tell it that there is a new entry
+	     }
             add_to_log($course->id, 'glossary', 'add comment', "comments.php?id=$cm->id&amp;eid=$entry->id", "$newcomment->id", $cm->id);
         }
-        redirect("comments.php?id=$cm->id&amp;eid=$entry->id&amp;next=$next");
+	redirect("comments.php?id=$cm->id&amp;eid=$entry->id&amp;next=$next");
 
     } else {
         glossary_comment_print_header($course, $cm, $glossary, $entry, 'add');
         $mform->display();
-        //we pass a new parameter to the function so it won't we printed if is_lams=1
-    	print_footer($course,null, false,$glossary->is_lams);
+	//we pass a new parameter to the function so it won't we printed if is_lams=1
+	print_footer($course,null, false,$glossary->is_lams);
         die;
     }
 }
@@ -137,8 +137,8 @@
         glossary_comment_print_header($course, $cm, $glossary, $entry, 'delete');
         glossary_print_comment($course, $cm, $glossary, $entry, $comment);
         notice_yesno($strdeletewarning, $linkyes, $linkno, $optionsyes, $optionsno, 'post', 'get');
-        //we pass a new parameter to the function so it won't we printed if is_lams=1
-    	print_footer($course,null, false,$glossary->is_lams);
+	//we pass a new parameter to the function so it won't we printed if is_lams=1
+	print_footer($course,null, false,$glossary->is_lams);
         die;
     }
 }
@@ -203,8 +203,8 @@
     } else {
         glossary_comment_print_header($course, $cm, $glossary, $entry, 'edit');
         $mform->display();
-        //we pass a new parameter to the function so it won't we printed if is_lams=1
-    	print_footer($course,null, false,$glossary->is_lams);
+	//we pass a new parameter to the function so it won't we printed if is_lams=1
+	print_footer($course,null, false,$glossary->is_lams);
         die;
     }
 }
@@ -233,12 +233,11 @@
     $navlinks[] = array('name' => $strcomments, 'link' => "comments.php?id=$cm->id&amp;eid=$entry->id", 'type' => 'title');
     $navlinks[] = array('name' => $straction, 'link' => '', 'type' => 'action');
     $navigation = build_navigation($navlinks, $cm);
-	 //we pass a new parameter to the function so it won't we printed if is_lams=1	
+
+    //we pass a new parameter to the function so it won't we printed if is_lams=1  
     print_header_simple(format_string($glossary->name), '', $navigation,
         '', '', true, update_module_button($cm->id, $course->id, $strglossary),
-        navmenu($course, $cm),false,'',false,$cm->is_lams);
-        
-        
+	navmenu($course, $cm),false,'',false,$cm->is_lams);
 /// print original glossary entry for any comment action (add, update, delete)
     glossary_print_entry($course, $cm, $glossary, $entry, 'approval', '', false);
 }
Index: temp_moodle_dev/moodle/mod/glossary/comments.php
===================================================================
diff -u -r9e3156f9cff184e2162784d7f2b8ba759a9b5eee -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/glossary/comments.php	(.../comments.php)	(revision 9e3156f9cff184e2162784d7f2b8ba759a9b5eee)
+++ temp_moodle_dev/moodle/mod/glossary/comments.php	(.../comments.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -44,7 +44,7 @@
     $straddcomment = get_string("addcomment", "glossary");
 
     $navigation = build_navigation($strcomments, $cm);
-    //we pass a new parameter to the function so it won't we printed if is_lams=1	
+    //we pass a new parameter to the function so it won't we printed if is_lams=1    
     print_header_simple(strip_tags("$strcomments: $entry->concept"), "", $navigation,
         "", "", true, update_module_button($cm->id, $course->id, $strglossary),
         navmenu($course, $cm),false,'',false,$cm->is_lams);
@@ -71,12 +71,13 @@
     } else {
         print_heading(get_string("nocomments","glossary"));
     }
-	 if($glossary->is_lams==1&&$next==1){ //lams: display the next activity button 
-            	include('showlamsnext.php');
-	}   
+
+    if($glossary->is_lams==1&&$next==1){ //lams: display the next activity button 
+	include('showlamsnext.php');
+	}
+
 /// Finish the page
 
-     //we pass a new parameter to the function so it won't we printed if is_lams=1
-     print_footer($course,null, false,$glossary->is_lams);
+    print_footer($course,null, false,$glossary->is_lams);
 
 ?>
Index: temp_moodle_dev/moodle/mod/glossary/db/install.xml
===================================================================
diff -u -r2c687ba266ed3df65804003199eb1a45e7b7b316 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/glossary/db/install.xml	(.../install.xml)	(revision 2c687ba266ed3df65804003199eb1a45e7b7b316)
+++ temp_moodle_dev/moodle/mod/glossary/db/install.xml	(.../install.xml)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -31,7 +31,7 @@
         <FIELD NAME="scale" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="false" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="assesstimefinish" NEXT="timecreated"/>
         <FIELD NAME="timecreated" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="scale" NEXT="timemodified"/>
         <FIELD NAME="timemodified" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="timecreated" NEXT="is_lams"/>
-		<FIELD NAME="is_lams" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="timemodified" />
+        <FIELD NAME="is_lams" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="timemodified" />
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" />
Index: temp_moodle_dev/moodle/mod/glossary/edit.php
===================================================================
diff -u -r42d5ebd8cc6cca51996a331d7c7112906c257921 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/glossary/edit.php	(.../edit.php)	(revision 42d5ebd8cc6cca51996a331d7c7112906c257921)
+++ temp_moodle_dev/moodle/mod/glossary/edit.php	(.../edit.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -13,6 +13,7 @@
 $mode = optional_param('mode', '', PARAM_ALPHA);      // categories if by category?
 $hook = optional_param('hook', '', PARAM_ALPHANUM);   // CategoryID
 $next=0;//lams: variable that after editing we pass to the view page to let it know we have edit an entry
+
 if (! $cm = get_coursemodule_from_id('glossary', $id)) {
     error("Course Module ID was incorrect");
 }
@@ -50,7 +51,6 @@
 $mform =& new mod_glossary_entry_form(null, compact('cm', 'glossary', 'hook', 'mode', 'e', 'context'));
 if ($mform->is_cancelled()){
     if ($e){
-    
         redirect("view.php?id=$cm->id&amp;mode=entry&amp;hook=$e");
     } else {
         redirect("view.php?id=$cm->id");
@@ -95,34 +95,30 @@
         }
 
         if (update_record('glossary_entries', $todb)) {
-         $next=1;//lams: variable we pass to the view page to tell it that there is a new entry
+	   $next=1;//lams: variable we pass to the view page to tell it that there is a new entry
             add_to_log($course->id, "glossary", "update entry",
                        "view.php?id=$cm->id&amp;mode=entry&amp;hook=$todb->id",
                        $todb->id, $cm->id);
-     
-	       
         } else {
             error("Could not update your glossary");
         }
     } else {
-    		
+
         $todb->userid = $USER->id;
         $todb->timecreated = $timenow;
         $todb->sourceglossaryid = 0;
         $todb->teacherentry = has_capability('mod/glossary:manageentries', $context);
 
-    	
+
         if ($todb->id = insert_record("glossary_entries", $todb)) {
             $e = $todb->id;
             $dir = glossary_file_area_name($todb);
             if ($mform->save_files($dir) and $newfilename = $mform->get_new_filename()) {
                 set_field("glossary_entries", "attachment", $newfilename, "id", $todb->id);
             }
-             $next=1;//lams: variable we pass to the view page to tell it that there is a new entry
+	    $next=1;//lams: variable we pass to the view page to tell it that there is a new entry
             add_to_log($course->id, "glossary", "add entry",
                        "view.php?id=$cm->id&amp;mode=entry&amp;hook=$todb->id", $todb->id,$cm->id);
-       		
-           
         } else {
             error("Could not insert this new entry");
         }
@@ -133,7 +129,6 @@
     delete_records("glossary_alias", "entryid", $e);
 
     if (empty($fromform->notcategorised) && isset($fromform->categories)) {
-    
         $newcategory->entryid = $e;
         foreach ($fromform->categories as $category) {
             if ( $category > 0 ) {
@@ -180,7 +175,6 @@
         $toform->fullmatch = $fromdb->fullmatch;
         $toform->aliases = '';
         $ineditperiod = ((time() - $fromdb->timecreated <  $CFG->maxeditingtime) || $glossary->editalways);
-    	
         if ((!$ineditperiod  || $USER->id != $fromdb->userid) and !has_capability('mod/glossary:manageentries', $context)) {
             if ( $USER->id != $fromdb->userid ) {
                 print_error('errcannoteditothers', 'glossary');
@@ -195,14 +189,13 @@
         }
         $mform->set_data($toform);
     }
-
 }
 
 $stredit = empty($e) ? get_string('addentry', 'glossary') : get_string("edit");
 $navigation = build_navigation($stredit, $cm);
- //we pass a new parameter to the function so it won't we printed if is_lams=1	
+//we pass a new parameter to the function so it won't we printed if is_lams=1  
 print_header_simple(format_string($glossary->name), "", $navigation, "",
-              "", true, "", navmenu($course, $cm),false,'',false,$cm->is_lams);	
+	"", true, "", navmenu($course, $cm),false,'',false,$cm->is_lams); 
 
 
 print_heading(format_string($glossary->name));
@@ -225,6 +218,7 @@
 
 ///glossary_print_tabbed_table_end();
 
+
 //we pass a new parameter to the function so it won't we printed if is_lams=1
 print_footer($course,null, false,$glossary->is_lams);
 
Index: temp_moodle_dev/moodle/mod/glossary/editcategories.php
===================================================================
diff -u -rae465e5a7d3f73c6a9a65042c15fb2915be164e6 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/glossary/editcategories.php	(.../editcategories.php)	(revision ae465e5a7d3f73c6a9a65042c15fb2915be164e6)
+++ temp_moodle_dev/moodle/mod/glossary/editcategories.php	(.../editcategories.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -53,7 +53,7 @@
     $navlinks[] = array('name' => get_string("categories","glossary"), 'link' => '', 'type' => 'title');
     
     $navigation = build_navigation($navlinks);
-	//we pass a new parameter to the function so it won't we printed if is_lams=1
+    //we pass a new parameter to the function so it won't we printed if is_lams=1
     print_header_simple(format_string($glossary->name), "", $navigation,"", "", true, update_module_button($cm->id, $course->id, $strglossary),navmenu($course, $cm),false,'',false,$cm->is_lams);
 
     if ( $hook >0 ) {
@@ -77,8 +77,7 @@
                 $name = $category->name;
                 $usedynalink = $category->usedynalink;
                 require "editcategories.html";
-                //we pass a new parameter to the function so it won't we printed if is_lams=1
-    			print_footer(null,null, false,$glossary->is_lams);
+		print_footer(null,null, false,$glossary->is_lams);
                 die;
             }
 
@@ -91,8 +90,7 @@
                 echo "<div style=\"text-align:center\">" . get_string("categorydeleted","glossary") ."</div>";
                 echo "</center>";
                 print_simple_box_end();
-                //we pass a new parameter to the function so it won't we printed if is_lams=1
-    			print_footer($course,null, false,$glossary->is_lams);
+                print_footer($course,null, false,$glossary->is_lams);
 
                 add_to_log($course->id, "glossary", "delete category", "editcategories.php?id=$cm->id", $hook,$cm->id);
 
@@ -173,8 +171,7 @@
     }
 
     if ( $action ) {
-        //we pass a new parameter to the function so it won't we printed if is_lams=1
-    	print_footer(null,null, false,$glossary->is_lams);
+	print_footer($course,null, false,$glossary->is_lams);
         die;
     }
 
@@ -248,5 +245,4 @@
 
 </form>
 
-<?php //we pass a new parameter to the function so it won't we printed if is_lams=1
-      print_footer(null,null, false,$glossary->is_lams); ?>
+<?php print_footer(null,null, false,$glossary->is_lams); ?>
Index: temp_moodle_dev/moodle/mod/glossary/export.php
===================================================================
diff -u -rae465e5a7d3f73c6a9a65042c15fb2915be164e6 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/glossary/export.php	(.../export.php)	(revision ae465e5a7d3f73c6a9a65042c15fb2915be164e6)
+++ temp_moodle_dev/moodle/mod/glossary/export.php	(.../export.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -35,13 +35,12 @@
     $strsearchindefinition = get_string("searchindefinition", "glossary");
     $strsearch = get_string("search");
     $strexportfile = get_string("exportfile", "glossary");
-    $strexportentries = get_string('exportentries', 'glossary');
+    $strexportentries = get_string('exportentriestoxml', 'glossary');
 
-    $navigation = build_navigation('', $cm);
-    //we pass a new parameter to the function so it won't we printed if is_lams=1	
+    $navigation = build_navigation($strexportentries, $cm);
     print_header_simple(format_string($glossary->name), "",$navigation,
         "", "", true, update_module_button($cm->id, $course->id, $strglossary),
-        navmenu($course, $cm),false,'',false,$cm->is_lams);
+	navmenu($course, $cm),false,'',false,$cm->is_lams);
 
     print_heading($strexportentries);
 
@@ -59,6 +58,7 @@
     </form>
 <?php
     print_box_end();
+    print_footer($course);
     //we pass a new parameter to the function so it won't we printed if is_lams=1
     print_footer($course,null, false,$glossary->is_lams);
 ?>
Index: temp_moodle_dev/moodle/mod/glossary/exportentry.php
===================================================================
diff -u -r5063e98cf451d2bd9e9c25464a397ce6d0e405e5 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/glossary/exportentry.php	(.../exportentry.php)	(revision 5063e98cf451d2bd9e9c25464a397ce6d0e405e5)
+++ temp_moodle_dev/moodle/mod/glossary/exportentry.php	(.../exportentry.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -37,6 +37,7 @@
     $strglossaries   = get_string('modulenameplural', 'glossary');
     $entryalreadyexist = get_string('entryalreadyexist','glossary');
     $entryexported = get_string('entryexported','glossary');
+
     $navigation = build_navigation('', $cm);
     print_header_simple(format_string($glossary->name), '', $navigation, '', '', true, '', navmenu($course, $cm));
 
Index: temp_moodle_dev/moodle/mod/glossary/filter.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/glossary/filter.php	(.../filter.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/glossary/filter.php	(.../filter.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -149,6 +149,17 @@
 
         $conceptlist = filter_remove_duplicates($conceptlist);
     }
+    
+    global $GLOSSARY_EXCLUDECONCEPTS;
+    if(!empty($GLOSSARY_EXCLUDECONCEPTS)) {
+        $reducedconceptlist=array();
+        foreach($conceptlist as $concept) {
+            if(!in_array($concept->phrase,$GLOSSARY_EXCLUDECONCEPTS)) {
+                $reducedconceptlist[]=$concept;
+            }
+        }
+        return filter_phrases($text, $reducedconceptlist);
+    }
 
     return filter_phrases($text, $conceptlist);   // Actually search for concepts!
 }
Index: temp_moodle_dev/moodle/mod/glossary/import.php
===================================================================
diff -u -rae465e5a7d3f73c6a9a65042c15fb2915be164e6 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/glossary/import.php	(.../import.php)	(revision ae465e5a7d3f73c6a9a65042c15fb2915be164e6)
+++ temp_moodle_dev/moodle/mod/glossary/import.php	(.../import.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -46,10 +46,9 @@
     $strimportentries = get_string('importentriesfromxml', 'glossary');
 
     $navigation = build_navigation($strimportentries, $cm);
-    //we pass a new parameter to the function so it won't we printed if is_lams=1	
     print_header_simple(format_string($glossary->name), "", $navigation,
         "", "", true, update_module_button($cm->id, $course->id, $strglossary),
-        navmenu($course, $cm),false,'',false,$cm->is_lams);
+        navmenu($course, $cm));
 
     print_heading($strimportentries);
 
@@ -58,8 +57,7 @@
         include("import.html");
         print_box_end();
 
-         //we pass a new parameter to the function so it won't we printed if is_lams=1
-    	print_footer($course,null, false,$glossary->is_lams);;
+        print_footer($course);
         exit;
     }
 
@@ -74,8 +72,7 @@
         print_continue('import.php?id='.$id);
         print_box_end();
 
-         //we pass a new parameter to the function so it won't we printed if is_lams=1
-    	print_footer($course,null, false,$glossary->is_lams);
+        print_footer();
         die();
     }
 
@@ -138,8 +135,7 @@
                     notify("Error while trying to create the new glossary.");
                     echo '</center>';
                     glossary_print_tabbed_table_end();
-                     //we pass a new parameter to the function so it won't we printed if is_lams=1
-    				print_footer($course,null, false,$glossary->is_lams);
+                    print_footer($course);
                     exit;
                 } else {
                     //The instance has been created, so lets do course_modules
@@ -189,8 +185,7 @@
                 }
             } else {
                 notify("Error while trying to create the new glossary.");
-                 //we pass a new parameter to the function so it won't we printed if is_lams=1
-    			 print_footer($course,null, false,$glossary->is_lams);
+                print_footer($course);
                 exit;
             }
         }
@@ -370,7 +365,6 @@
     }
 
 /// Finish the page
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
-    print_footer($course,null, false,$glossary->is_lams);
+    print_footer($course);
 
 ?>
Index: temp_moodle_dev/moodle/mod/glossary/index.php
===================================================================
diff -u -r24bb7eb47a508d736f4c4d8db1a5f87b2fd85eda -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/glossary/index.php	(.../index.php)	(revision 24bb7eb47a508d736f4c4d8db1a5f87b2fd85eda)
+++ temp_moodle_dev/moodle/mod/glossary/index.php	(.../index.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -35,6 +35,7 @@
     print_header_simple("$strglossarys", "", $navigation, "", "", true, "", navmenu($course));
 
 /// Get all the appropriate data
+
     if (! $glossarys = get_all_instances_in_course("glossary", $course)) {
         notice(get_string('thereareno', 'moodle', $strglossarys), "../../course/view.php?id=$course->id");
         die;
Index: temp_moodle_dev/moodle/mod/glossary/lib.php
===================================================================
diff -u -r92d42c33d22c518e5f81fe523fa8a11526a50ab3 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/glossary/lib.php	(.../lib.php)	(revision 92d42c33d22c518e5f81fe523fa8a11526a50ab3)
+++ temp_moodle_dev/moodle/mod/glossary/lib.php	(.../lib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -699,101 +699,18 @@
         $ttpresent = false;
     }
 
-    $links = array();
-    $tags = array();
-    $urls = array();
-    $addrs = array();
+    global $GLOSSARY_EXCLUDECONCEPTS;
 
     //Calculate all the strings to be no-linked
     //First, the concept
-    $term = preg_quote(trim($entry->concept),'/');
-    $pat = '/('.$term.')/is';
-    $doNolinks[] = $pat;
+    $GLOSSARY_EXCLUDECONCEPTS=array($entry->concept);
     //Now the aliases
     if ( $aliases = get_records('glossary_alias','entryid',$entry->id) ) {
         foreach ($aliases as $alias) {
-            $term = preg_quote(trim($alias->alias),'/');
-            $pat = '/('.$term.')/is';
-            $doNolinks[] = $pat;
+            $GLOSSARY_EXCLUDECONCEPTS[]=trim($alias->alias);
         }
     }
 
-
-    //Extract <a>..><a> tags from definition
-    preg_match_all('/<a\s[^>]+?>(.*?)<\/a>/is',$definition,$list_of_a);
-
-    //Save them into links array to use them later
-    foreach (array_unique($list_of_a[0]) as $key=>$value) {
-        $links['<#'.$key.'#>'] = $value;
-    }
-    //Take off every link from definition
-    if ( $links ) {
-        $definition = str_replace($links,array_keys($links),$definition);
-    }
-
-
-    //Extract all tags from definition
-    preg_match_all('/(<.*?>)/is',$definition,$list_of_tags);
-
-    //Save them into tags array to use them later
-    foreach (array_unique($list_of_tags[0]) as $key=>$value) {
-        $tags['<@'.$key.'@>'] = $value;
-    }
-    //Take off every tag from definition
-    if ( $tags ) {
-        $definition = str_replace($tags,array_keys($tags),$definition);
-    }
-
-
-    //Extract all URLS with protocol (http://domain.com) from definition
-    preg_match_all('/([[:space:]]|^|\(|\[)([[:alnum:]]+):\/\/([^[:space:]]*)([[:alnum:]#?\/&=])/is',$definition,$list_of_urls);
-
-    //Save them into urls array to use them later
-    foreach (array_unique($list_of_urls[0]) as $key=>$value) {
-        $urls['<*'.$key.'*>'] = $value;
-    }
-    //Take off every url from definition
-    if ( $urls ) {
-        $definition = str_replace($urls,array_keys($urls),$definition);
-    }
-
-
-    //Extract all WEB ADDRESSES (www.domain.com) from definition
-    preg_match_all('/([[:space:]]|^|\(|\[)www\.([^[:space:]]*)([[:alnum:]#?\/&=])/is',$definition,$list_of_addresses);
-
-    //Save them into addrs array to use them later
-    foreach (array_unique($list_of_addresses[0]) as $key=>$value) {
-        $addrs['<+'.$key.'+>'] = $value;
-    }
-    //Take off every addr from definition
-    if ( $addrs ) {
-        $definition = str_replace($addrs,array_keys($addrs),$definition);
-    }
-
-
-    //Put doNolinks (concept + aliases) enclosed by <nolink> tag
-    $definition= preg_replace($doNolinks,'<span class="nolink">$1</span>',$definition);
-
-    //Restore addrs
-    if ( $addrs ) {
-        $definition = str_replace(array_keys($addrs),$addrs,$definition);
-    }
-
-    //Restore urls
-    if ( $urls ) {
-        $definition = str_replace(array_keys($urls),$urls,$definition);
-    }
-
-    //Restore tags
-    if ( $tags ) {
-        $definition = str_replace(array_keys($tags),$tags,$definition);
-    }
-
-    //Restore links
-    if ( $links ) {
-        $definition = str_replace(array_keys($links),$links,$definition);
-    }
-
     $options = new object();
     $options->para = false;
     $options->trusttext = true;
@@ -806,6 +723,10 @@
     }
 
     $text = format_text($definition, $entry->format, $options);
+    
+    // Stop excluding concepts from autolinking
+    unset($GLOSSARY_EXCLUDECONCEPTS);
+    
     if (!empty($entry->highlight)) {
         $text = highlight($entry->highlight, $text);
     }
@@ -2084,7 +2005,7 @@
         while ($pagenum <= $pageto) {
             $pagetoshow = $pagenum +1;
             if ($pagenum == $page && !$specialselected) {
-                $code .= "$separator$pagetoshow";
+                $code .= "$separator<b>$pagetoshow</b>";
             } else {
                 $code .= "$separator<a href=\"{$baseurl}page=$pagenum\">$pagetoshow</a>";
             }
@@ -2104,7 +2025,7 @@
         if ($showspecial) {
             $code .= '<br />';
             if ($specialselected) {
-                $code .= $specialtext;
+                $code .= "<b>$specialtext</b>";
             } else {
                 $code .= "$separator<a href=\"{$baseurl}page=$specialvalue\">$specialtext</a>";
             }
@@ -2575,4 +2496,5 @@
 }
 
 
+
 ?>
Index: temp_moodle_dev/moodle/mod/glossary/print.php
===================================================================
diff -u -rae465e5a7d3f73c6a9a65042c15fb2915be164e6 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/glossary/print.php	(.../print.php)	(revision ae465e5a7d3f73c6a9a65042c15fb2915be164e6)
+++ temp_moodle_dev/moodle/mod/glossary/print.php	(.../print.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -173,13 +173,13 @@
                         $pivottoshow = fullname($user);
                     }
 
-                    echo "<p align=\"center\"><strong>".clean_text($pivottoshow)."</strong></p>" ;
+                    echo "<p class='mdl-align'><strong>".clean_text($pivottoshow)."</strong></p>" ;
                 }
             }
 
             glossary_print_entry($course, $cm, $glossary, $entry, $mode, $hook,1,$displayformat,false,true);
         }
     }
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
+
     print_footer('empty',null, false,$glossary->is_lams);
 ?>
Index: temp_moodle_dev/moodle/mod/glossary/rate.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/glossary/rate.php	(.../rate.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/glossary/rate.php	(.../rate.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -45,6 +45,10 @@
     }
 
     if ($data = data_submitted()) {    // form submitted
+
+    /// Calculate scale values
+        $scale_values = make_grades_menu($glossary->scale);
+
         foreach ((array)$data as $entryid => $rating) {
             if (!is_numeric($entryid)) {
                 continue;
@@ -69,6 +73,11 @@
                 continue;
             }
 
+        /// Check rate is valid for that glossary scale values
+            if (!array_key_exists($rating, $scale_values) && $rating != -999) {
+                print_error('invalidrate', 'glossary', '', $rating);
+            }
+
             if ($oldrating = get_record("glossary_ratings", "userid", $USER->id, "entryid", $entry->id)) {
                 //Check if we must delete the rate
                 if ($rating == -999) {
Index: temp_moodle_dev/moodle/mod/glossary/view.php
===================================================================
diff -u -rb1391a38884c06d71be409a5a01e3ddbdd5203db -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/glossary/view.php	(.../view.php)	(revision b1391a38884c06d71be409a5a01e3ddbdd5203db)
+++ temp_moodle_dev/moodle/mod/glossary/view.php	(.../view.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -19,8 +19,9 @@
     $page       = optional_param('page', 0,PARAM_INT);               // Page to show (for paging purposes)
     $show       = optional_param('show', '', PARAM_ALPHA);           // [ concept | alias ] => mode=term hook=$show
     $returnurl   = optional_param('returnUrl', '', PARAM_TEXT);  // lams url to proceed to next in sequence
-	$editing  = optional_param('editing', 0, PARAM_INT); // 1 if editing in Lams
-	$next  = optional_param('next', 0, PARAM_INT); // 1 if new entry in Lams
+    $editing  = optional_param('editing', 0, PARAM_INT); // 1 if editing in Lams
+    $next  = optional_param('next', 0, PARAM_INT); // 1 if new entry in Lams
+
     if (!empty($id)) {
         if (! $cm = get_coursemodule_from_id('glossary', $id)) {
             error("Course Module ID was incorrect");
@@ -54,8 +55,8 @@
 
 /// redirecting if adding a new entry
     if ($tab == GLOSSARY_ADDENTRY_VIEW ) {
-    //if lams pass editing variable to know if the user is a teacher editing the activity
-        redirect("edit.php?id=$cm->id&amp;mode=$mode&amp;editing=$editing");
+   	//if lams pass editing variable to know if the user is a teacher editing the activity
+	redirect("edit.php?id=$cm->id&amp;mode=$mode&amp;editing=$editing");
     }
 
 /// setting the defaut number of entries per page if not set
@@ -214,16 +215,15 @@
     default:
         $showcommonelements = 1;
     break;
-    
     }
 //if Lams print navigation buttons to finish editing the Glossary
 	if($cm->is_lams==1&&$editing==1){
-        		include('showlamsfinish.php');
-  	}
-  	$isteacher = has_capability('mod/glossary:preview', get_context_instance(CONTEXT_MODULE, $cm->id)); // indicates if is a teacher, useful in lams
-	if($isteacher&&$editing==0&&$cm->is_lams==1){//lams: if the teachers view the choice as a learner, display the next activity button so he hasn't to attempt the choice if he don't want to
-	       include('showlamsnext.php');
+		include('showlamsfinish.php');
 	}
+	$isteacher = has_capability('mod/glossary:preview', get_context_instance(CONTEXT_MODULE, $cm->id)); // indicates if is a teacher, useful in lams
+	if($isteacher&&$editing==0&&$cm->is_lams==1){//lams: if the teachers view the choice as a learner, display the next activity button so he hasn't to attempt the choice if he don't want to
+		include('showlamsnext.php');
+	}	
 /// Printing the heading
     $strglossaries = get_string("modulenameplural", "glossary");
     $strglossary = get_string("modulename", "glossary");
@@ -240,14 +240,12 @@
         require_capability('mod/glossary:approve', $context);
 
         $navigation = build_navigation($strwaitingapproval, $cm);
-         //we pass a new parameter to the function so it won't we printed if is_lams=1	
         print_header_simple(format_string($glossary->name), "", $navigation, "", "", true,
             update_module_button($cm->id, $course->id, $strglossary), navmenu($course, $cm),false,'',false,$cm->is_lams);
-            
+
         print_heading($strwaitingapproval);
     } else { /// Print standard header
         $navigation = build_navigation('', $cm);
-         //we pass a new parameter to the function so it won't we printed if is_lams=1	
         print_header_simple(format_string($glossary->name), "", $navigation, "", "", true,
             update_module_button($cm->id, $course->id, $strglossary), navmenu($course, $cm),false,'',false,$cm->is_lams);
     }
@@ -335,7 +333,9 @@
 
 /// Info box
     if ( $glossary->intro && $showcommonelements ) {
-        print_box(format_text($glossary->intro), 'generalbox', 'intro');
+        $options = new stdclass;
+        $options->para = false;
+        print_box(format_text($glossary->intro, FORMAT_MOODLE, $options), 'generalbox', 'intro');
     }
 
 /// Search box
@@ -370,8 +370,7 @@
 /// Show the add entry button if allowed
     if (has_capability('mod/glossary:write', $context) && $showcommonelements ) {
         echo '<div class="singlebutton glossaryaddentry">';
-         //if lams pass editing variable to know if the user is a teacher editing the activity
-        echo "<form id=\"newentryform\" method=\"get\" action=\"$CFG->wwwroot/mod/glossary/edit.php?editing=$editing\">";
+	echo "<form id=\"newentryform\" method=\"get\" action=\"$CFG->wwwroot/mod/glossary/edit.php?editing=$editing\">";
         echo '<div>';
         echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\" />";
         echo '<input type="submit" value="';
@@ -531,12 +530,11 @@
     echo '<br />';
     glossary_print_tabbed_table_end();
 
+/// Finish the page
     if($cm->is_lams==1&&$next==1&&$editing==0){ //lams: display the next activity button 
-            	include('showlamsnext.php');
-	}    
-    /// Finish the page
+	include('showlamsnext.php');
+     }	
 
-    
     //we pass a new parameter to the function so it won't we printed if is_lams=1
     print_footer($course,null, false,$glossary->is_lams);
 
Index: temp_moodle_dev/moodle/mod/lesson/action/addendofbranch.php
===================================================================
diff -u -r0a66ad1a19f63e2f1615d471b70f158862a4bcc3 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/lesson/action/addendofbranch.php	(.../addendofbranch.php)	(revision 0a66ad1a19f63e2f1615d471b70f158862a4bcc3)
+++ temp_moodle_dev/moodle/mod/lesson/action/addendofbranch.php	(.../addendofbranch.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -61,11 +61,12 @@
         }
         
         lesson_set_message(get_string('addedanendofbranch', 'lesson'), 'notifysuccess');
-        //LAMS: variable we pass to let it know we have added a new Branch
-        $uploaded=1;
+	//LAMS: variable we pass to let it know we have added a new Branch
+	$uploaded=1;
     } else {
         lesson_set_message(get_string('nobranchtablefound', 'lesson'));
     }
+    
     //LAMS: new variable $uploaded we pass, so in view.php we will be able to display the button "finished and back to LAMS"
     redirect("$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id&uploaded=$uploaded");
 ?>
Index: temp_moodle_dev/moodle/mod/lesson/action/continue.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/lesson/action/continue.php	(.../continue.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/lesson/action/continue.php	(.../continue.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -122,7 +122,7 @@
                     $expectedanswer = str_replace('#####', '.*', $expectedanswer);
                 }
                 // see if user typed in any of the correct answers
-                if (lesson_iscorrect($pageid, $answer->jumpto) or ($lesson->custom && $answer->score > 0) ) {
+                if ((!$lesson->custom && lesson_iscorrect($pageid, $answer->jumpto)) or ($lesson->custom && $answer->score > 0) ) {
                     if (!$useregexp) { // we are using 'normal analysis', which ignores case
                         if (preg_match('/^'.$expectedanswer.'$/i',$useranswer)) {
                             $ismatch = true;
Index: temp_moodle_dev/moodle/mod/lesson/action/insertpage.php
===================================================================
diff -u -r8c3b6f1927bac1f086a6450e5a919cfb1913d5e6 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/lesson/action/insertpage.php	(.../insertpage.php)	(revision 8c3b6f1927bac1f086a6450e5a919cfb1913d5e6)
+++ temp_moodle_dev/moodle/mod/lesson/action/insertpage.php	(.../insertpage.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -92,8 +92,8 @@
             if (!$newpageid) {
                 error("Insert page: new first page not inserted");
             }else{
-            	$uploaded=1;
-            }
+		$uploaded=1;
+	    }
         } else {
             // there are existing pages put this at the start
             $newpage->lessonid = $lesson->id;
Index: temp_moodle_dev/moodle/mod/lesson/action/updatepage.php
===================================================================
diff -u -r8c3b6f1927bac1f086a6450e5a919cfb1913d5e6 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/lesson/action/updatepage.php	(.../updatepage.php)	(revision 8c3b6f1927bac1f086a6450e5a919cfb1913d5e6)
+++ temp_moodle_dev/moodle/mod/lesson/action/updatepage.php	(.../updatepage.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -50,8 +50,8 @@
     if (!update_record("lesson_pages", $page)) {
         error("Update page: page not updated");
     }else{
-    	// LAMS: we pass a vrialbe to view.php if the page has been edited
-    	$uploaded=1;
+	// LAMS: we pass a vrialbe to view.php if the page has been edited
+	$uploaded=1;
     }
     if ($page->qtype == LESSON_ENDOFBRANCH || $page->qtype == LESSON_ESSAY || $page->qtype == LESSON_CLUSTER || $page->qtype == LESSON_ENDOFCLUSTER) {
         // there's just a single answer with a jump
@@ -182,8 +182,8 @@
     lesson_set_message(get_string('updatedpage', 'lesson').': '.format_string($page->title, true), 'notifysuccess');
     if ($redirect == 'navigation') {
         // takes us back to viewing the page
-        redirect("$CFG->wwwroot/mod/lesson/view.php?id=$cm->id&amp;pageid=$page->id&uploaded=$uploaded");
+	redirect("$CFG->wwwroot/mod/lesson/view.php?id=$cm->id&amp;pageid=$page->id&uploaded=$uploaded");
     } else {
-        redirect("$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id&uploaded=$uploaded");
+	redirect("$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id&uploaded=$uploaded");
     }
 ?>
Index: temp_moodle_dev/moodle/mod/lesson/db/install.xml
===================================================================
diff -u -r2af5abd77f0592c6ad675639d68826f93c3403c5 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/lesson/db/install.xml	(.../install.xml)	(revision 2af5abd77f0592c6ad675639d68826f93c3403c5)
+++ temp_moodle_dev/moodle/mod/lesson/db/install.xml	(.../install.xml)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -46,7 +46,7 @@
         <FIELD NAME="available" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="maxhighscores" NEXT="deadline"/>
         <FIELD NAME="deadline" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="available" NEXT="timemodified"/>
         <FIELD NAME="timemodified" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="deadline" NEXT="is_lams"/>
- 		<FIELD NAME="is_lams" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="timemodified" />     
+	<FIELD NAME="is_lams" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="timemodified" />     
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" />
Index: temp_moodle_dev/moodle/mod/lesson/db/upgrade.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/lesson/db/upgrade.php	(.../upgrade.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/lesson/db/upgrade.php	(.../upgrade.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -56,14 +56,6 @@
         $result = $result && change_field_notnull($table, $field);
     }
 
-    if ($result && $oldversion < 2007072200) {
-        require_once($CFG->dirroot.'/mod/lesson/lib.php');
-        // too much debug output
-        $db->debug = false;
-        lesson_update_grades();
-        $db->debug = true;
-    }
-
 //===== 1.9.0 upgrade line ======//
 
     if ($result && $oldversion < 2007072201) {
@@ -81,6 +73,14 @@
         }
     }
 
+    if ($result && $oldversion < 2008112601) {
+        require_once($CFG->dirroot.'/mod/lesson/lib.php');
+        // too much debug output
+        $db->debug = false;
+        lesson_update_grades();
+        $db->debug = true;
+    }
+
     return $result;
 }
 
Index: temp_moodle_dev/moodle/mod/lesson/edit.php
===================================================================
diff -u -r3e06349876aaed3b509bda15540c90c2b779ff69 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/lesson/edit.php	(.../edit.php)	(revision 3e06349876aaed3b509bda15540c90c2b779ff69)
+++ temp_moodle_dev/moodle/mod/lesson/edit.php	(.../edit.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -16,13 +16,11 @@
     $mode    = optional_param('mode', get_user_preferences('lesson_view', 'collapsed'), PARAM_ALPHA);
     $pageid = optional_param('pageid', 0, PARAM_INT);
     $uploaded = optional_param('uploaded',0, PARAM_INT); // 1 if something has been edited in the lesson
-  //  $learner = optional_param('learner',0, PARAM_INT); // 1 if learner
     
     if ($mode != 'single') {
         set_user_preference('lesson_view', $mode);
     }
     
-    
     list($cm, $course, $lesson) = lesson_get_basics($id);
     
     if ($firstpage = get_record('lesson_pages', 'lessonid', $lesson->id, 'prevpageid', 0)) {
@@ -297,10 +295,11 @@
                 break;
         }
     } 
-	if($cm->is_lams==1&&$uploaded==1&&$is_learner==0){
-		 		//lams: display the next activity button 
-            	include('showlamsfinish.php');   
-	}
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
+
+    if($cm->is_lams==1&&$uploaded==1&&$is_learner==0){
+      //lams: display the next activity button
+      include('showlamsfinish.php');   
+    }
+
     print_footer($course,null, false,$cm->is_lams);
 ?>
Index: temp_moodle_dev/moodle/mod/lesson/essay.php
===================================================================
diff -u -r4f27c4b366ebc68ce1b5e8f82c5153e0a8fc4cc0 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/lesson/essay.php	(.../essay.php)	(revision 4f27c4b366ebc68ce1b5e8f82c5153e0a8fc4cc0)
+++ temp_moodle_dev/moodle/mod/lesson/essay.php	(.../essay.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -366,6 +366,5 @@
             break;
     }
     
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
     print_footer($course,null, false,$cm->is_lams);
 ?>
\ No newline at end of file
Index: temp_moodle_dev/moodle/mod/lesson/format.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/lesson/format.php	(.../format.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/lesson/format.php	(.../format.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -220,7 +220,21 @@
     // Somewhere to specify question parameters that are not handled
     // by import but are required db fields.
     // This should not be overridden. 
+        global $CFG;
+
         $question = new stdClass();
+        $question->shuffleanswers = $CFG->quiz_shuffleanswers;
+        $question->defaultgrade = 1;
+        $question->image = "";
+        $question->usecase = 0;
+        $question->multiplier = array();
+        $question->generalfeedback = '';
+        $question->correctfeedback = '';
+        $question->partiallycorrectfeedback = '';
+        $question->incorrectfeedback = '';
+        $question->answernumbering = 'abc';
+        $question->penalty = 0.1;
+        $question->length = 1;
         $question->qoption = 0;
         $question->layout = 1;
         
Index: temp_moodle_dev/moodle/mod/lesson/highscores.php
===================================================================
diff -u -r4f27c4b366ebc68ce1b5e8f82c5153e0a8fc4cc0 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/lesson/highscores.php	(.../highscores.php)	(revision 4f27c4b366ebc68ce1b5e8f82c5153e0a8fc4cc0)
+++ temp_moodle_dev/moodle/mod/lesson/highscores.php	(.../highscores.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -138,7 +138,7 @@
     switch ($mode) {
         case 'add':
             print_simple_box_start('center');
-            echo '<div align="center">
+            echo '<div class="mdl-align">
                  <form id="nickname" method ="post" action="'.$CFG->wwwroot.'/mod/lesson/highscores.php" autocomplete="off">
                  <input type="hidden" name="id" value="'.$cm->id.'" />
                  <input type="hidden" name="mode" value="save" />
@@ -192,7 +192,7 @@
             }
         
             if (!has_capability('mod/lesson:manage', $context)) {  // teachers don't need the links
-                echo '<div align="center">';
+                echo '<div style="text-align:center">';
                 if ($link) {
                     echo "<br /><div class=\"lessonbutton standardbutton\"><a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">".get_string("returntocourse", "lesson")."</a></div>";
                 } else {
@@ -204,7 +204,6 @@
             break;
     }
     
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
     print_footer($course,null, false,$lesson->is_lams);
 
-?>
\ No newline at end of file
+?>
Index: temp_moodle_dev/moodle/mod/lesson/import.php
===================================================================
diff -u -r935d3cef4a213681d1f47b804f77b65dc870b15a -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/lesson/import.php	(.../import.php)	(revision 935d3cef4a213681d1f47b804f77b65dc870b15a)
+++ temp_moodle_dev/moodle/mod/lesson/import.php	(.../import.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -36,7 +36,6 @@
     $strlessons = get_string("modulenameplural", "lesson");
 
     $navigation = build_navigation($strimportquestions, $cm);
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
     print_header_simple("$strimportquestions", " $strimportquestions", $navigation, "", "", true, '','',false,'',false,$cm->is_lams);
 
     if ($form = data_submitted()) {   /// Filename
@@ -69,18 +68,17 @@
             if (! $format->importprocess($_FILES['newfile']['tmp_name'], $lesson, $pageid)) {    // Process the uploaded file
                 error("Error occurred during processing!");
             }elseif($cm->is_lams==1){
-            	$uploaded=1;
-            }
+	      $uploaded=1;
+	    }
 
             if (! $format->importpostprocess()) {                     // In case anything needs to be done after
                 error("Error occurred during post-processing!");
             }
 
             echo "<hr>";
-            // pass a new parameter to view.php just to know if the teacher has imported any question (if he did, he will be able to finish editting Lams's sequence)
-            print_continue("view.php?id=$cm->id&uploaded=$uploaded");
-            //we pass a new parameter to the function so it won't we printed if is_lams=1
-    		print_footer($course,null, false,$cm->is_lams);
+	    // pass a new parameter to view.php just to know if the teacher has imported any question (if he did, he will be able to finish editting Lams's sequence)
+	    print_continue("view.php?id=$cm->id&uploaded=$uploaded");
+	    print_footer($course,null, false,$cm->is_lams);
             exit;
         }
     }
@@ -115,7 +113,6 @@
     echo "</form>";
     print_simple_box_end();
 
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
     print_footer($course,null, false,$cm->is_lams);
 
 ?>
Index: temp_moodle_dev/moodle/mod/lesson/importppt.php
===================================================================
diff -u -r935d3cef4a213681d1f47b804f77b65dc870b15a -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/lesson/importppt.php	(.../importppt.php)	(revision 935d3cef4a213681d1f47b804f77b65dc870b15a)
+++ temp_moodle_dev/moodle/mod/lesson/importppt.php	(.../importppt.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -45,8 +45,6 @@
     $strlessons = get_string("modulenameplural", "lesson");
 
     $navigation = build_navigation($strimportppt, $cm);
-    
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
     print_header_simple("$strimportppt", " $strimportppt", $navigation, "", "", true, '','',false,'',false,$cm->is_lams);
 
     if ($form = data_submitted()) {   /// Filename
@@ -71,19 +69,17 @@
                 
                 if(! $mod_save_objects($objects, $mod->id, $pageid)) {  // sends it to DB
                     error("could not save");
-                //LAMS: variable we pass to let it know we have added a new PPT while editting
+		    //LAMS: variable we pass to let it know we have added a new PPT while editting
                 }elseif($cm->is_lams==1){
-            		$uploaded=1;
-            	}
+		  $uploaded=1;
+		}
             } else {
                 error('could not get data');
             }
 
             echo "<hr>";
-            // pass a new parameter to view.php just to know if the teacher has imported any question (if he did, he will be able to finish editting Lams's sequence)
-            print_continue("$CFG->wwwroot/mod/$modname/view.php?id=$cm->id&uploaded=$uploaded");
-            //we pass a new parameter to the function so it won't we printed if is_lams=1
-    		print_footer($course,null, false,$cm->is_lams);
+	    print_continue("$CFG->wwwroot/mod/$modname/view.php?id=$cm->id&uploaded=$uploaded");
+	    print_footer($course,null, false,$cm->is_lams);
             exit;
         }
     }
@@ -110,7 +106,6 @@
     echo "</form>";
     print_simple_box_end();
 
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
     print_footer($course,null, false,$cm->is_lams);
     
 // START OF FUNCTIONS
@@ -134,7 +129,7 @@
     $path_parts = pathinfo($zipfile);
     $dirname = substr($zipfile, 0, strpos($zipfile, '.'.$path_parts['extension'])); // take off the extension
     if (!file_exists($base.$dirname)) {
-        mkdir($base.$dirname);
+        mkdir($base.$dirname, $CFG->directorypermissions);
     }
 
     // move our uploaded file to temp/lesson
@@ -212,7 +207,7 @@
     while(true) {
         if (!file_exists($imagedir.'/'.$lessonname.$i)) {
             // ok doesnt exist so make the directory and update our paths
-            mkdir($imagedir.'/'.$lessonname.$i);
+            mkdir($imagedir.'/'.$lessonname.$i, $CFG->directorypermissions);
             $imagedir = $imagedir.'/'.$lessonname.$i;
             $imagelink = $imagelink.'/'.$lessonname.$i;
             break;
Index: temp_moodle_dev/moodle/mod/lesson/index.php
===================================================================
diff -u -r283afa151e8bb5649df908f52f01fff24fc01585 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/lesson/index.php	(.../index.php)	(revision 283afa151e8bb5649df908f52f01fff24fc01585)
+++ temp_moodle_dev/moodle/mod/lesson/index.php	(.../index.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -106,7 +106,6 @@
 
 /// Finish the page
 
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
     print_footer($course,null, false,$lesson->is_lams);
 
 ?>
Index: temp_moodle_dev/moodle/mod/lesson/lesson.php
===================================================================
diff -u -r283afa151e8bb5649df908f52f01fff24fc01585 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/lesson/lesson.php	(.../lesson.php)	(revision 283afa151e8bb5649df908f52f01fff24fc01585)
+++ temp_moodle_dev/moodle/mod/lesson/lesson.php	(.../lesson.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -58,7 +58,6 @@
             error("Fatal Error: Unknown action\n");
     }
 
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
     print_footer($course,null, false,$cm->is_lams);
  
 ?>
Index: temp_moodle_dev/moodle/mod/lesson/lib.php
===================================================================
diff -u -r085c5bae08907c3c1cf6eef22e011b47a5e9e272 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/lesson/lib.php	(.../lib.php)	(revision 085c5bae08907c3c1cf6eef22e011b47a5e9e272)
+++ temp_moodle_dev/moodle/mod/lesson/lib.php	(.../lib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -107,7 +107,7 @@
     }
     $pagetypes = page_import_types('mod/lesson/');
     foreach ($pagetypes as $pagetype) {
-        if (!delete_records('block_instance', 'pageid', $lesson->id, 'pagetype', $pagetype)) {
+        if (!blocks_delete_all_on_page($pagetype, $lesson->id)) {
             $result = false;
         }
     }
@@ -427,6 +427,19 @@
     if ($grades  === 'reset') {
         $params['reset'] = true;
         $grades = NULL;
+    } else if (!empty($grades)) {
+        // Need to calculate raw grade (Note: $grades has many forms)
+        if (is_object($grades)) {
+            $grades = array($grades->userid => $grades);
+        } else if (array_key_exists('userid', $grades)) {
+            $grades = array($grades['userid'] => $grades);
+        }
+        foreach ($grades as $key => $grade) {
+            if (!is_array($grade)) {
+                $grades[$key] = $grade = (array) $grade;
+            }
+            $grades[$key]['rawgrade'] = ($grade['rawgrade'] * $lesson->grade / 100);
+        }
     }
 
     return grade_update('mod/lesson', $lesson->course, 'mod', 'lesson', $lesson->id, 0, $grades, $params);
@@ -508,9 +521,7 @@
     unset($lesson->completed);
     unset($lesson->gradebetterthan);
 
-    if (!empty($lesson->password)) {
-        $lesson->password = md5($lesson->password);
-    } else {
+    if (empty($lesson->password)) {
         unset($lesson->password);
     }
 
@@ -661,6 +672,13 @@
     return array('moodle/site:accessallgroups');
 }
 
+/**
+ * Tells if files in moddata are trusted and can be served without XSS protection.
+ * @return bool true if file can be submitted by teacher only (trusted), false otherwise
+ */
+function lesson_is_moddata_trusted() {
+    return true;
+}
 
 //
 /**
Index: temp_moodle_dev/moodle/mod/lesson/locallib.php
===================================================================
diff -u -r283afa151e8bb5649df908f52f01fff24fc01585 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/lesson/locallib.php	(.../locallib.php)	(revision 283afa151e8bb5649df908f52f01fff24fc01585)
+++ temp_moodle_dev/moodle/mod/lesson/locallib.php	(.../locallib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -241,12 +241,12 @@
     $navigation = build_navigation('', $cm);
     
 /// Print header, heading, tabs and messages
-	if($cm->is_lams==1){
-    	print_header();
-	}else{
-		 print_header("$course->shortname: $strname", $course->fullname, $navigation,
+    if($cm->is_lams==1){
+      print_header();
+    }else{
+      print_header("$course->shortname: $strname", $course->fullname, $navigation,
                   '', '', true, $button, navmenu($course, $cm));
-	}
+    }
 
     if (has_capability('mod/lesson:manage', $context)) {
         print_heading_with_help($strname, "overview", "lesson");
@@ -1448,7 +1448,7 @@
                     $earned += $essayinfo->score;
                     $nmanual++;
                     $manualpoints += $answers[$attempt->answerid]->score;
-                } else {
+                } else if (!empty($attempt->answerid)) {
                     $earned += $answers[$attempt->answerid]->score;
                 }
             } else {
Index: temp_moodle_dev/moodle/mod/lesson/mediafile.php
===================================================================
diff -u -r283afa151e8bb5649df908f52f01fff24fc01585 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/lesson/mediafile.php	(.../mediafile.php)	(revision 283afa151e8bb5649df908f52f01fff24fc01585)
+++ temp_moodle_dev/moodle/mod/lesson/mediafile.php	(.../mediafile.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -49,8 +49,7 @@
                 </div>
                 </form>
                 </div>';
-            //we pass a new parameter to the function so it won't we printed if is_lams=1
-    		print_footer($course,null, false,$lesson->is_lams);
+            print_footer($course,null, false,$lesson->is_lams);
         }
         exit();
     }
@@ -207,6 +206,5 @@
        echo '</div>';
     }
     
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
     print_footer($course,null, false,$cm->is_lams);
 ?>
Index: temp_moodle_dev/moodle/mod/lesson/mod_form.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/lesson/mod_form.php	(.../mod_form.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/lesson/mod_form.php	(.../mod_form.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -182,10 +182,9 @@
         $mform->setHelpButton('usepassword', array('usepassword', get_string('usepassword', 'lesson'), 'lesson'));
         $mform->setDefault('usepassword', 0);
 
-        $mform->addElement('text', 'password', get_string('password', 'lesson'));
+        $mform->addElement('passwordunmask', 'password', get_string('password', 'lesson'));
         $mform->setHelpButton('password', array('password', get_string('password', 'lesson'), 'lesson'));
         $mform->setDefault('password', '');
-        //never displayed converted to md5
         $mform->setType('password', PARAM_RAW);
 
         $mform->addElement('date_time_selector', 'available', get_string('available', 'lesson'), array('optional'=>true));
@@ -299,13 +298,15 @@
      * @return void
      **/
     function data_preprocessing(&$default_values) {
+        global $module;
         if (isset($default_values['conditions'])) {
             $conditions = unserialize($default_values['conditions']);
             $default_values['timespent'] = $conditions->timespent;
             $default_values['completed'] = $conditions->completed;
             $default_values['gradebetterthan'] = $conditions->gradebetterthan;
         }
-        if (isset($default_values['password'])) {
+        // after this passwords are clear text, MDL-11090
+        if (isset($default_values['password']) and ($module->version<2008112600)) {
             unset($default_values['password']);
         }
         if (isset($default_values['add']) and $defaults = get_record('lesson_default', 'course', $default_values['course'])) {
Index: temp_moodle_dev/moodle/mod/lesson/pagelib.php
===================================================================
diff -u -r283afa151e8bb5649df908f52f01fff24fc01585 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/lesson/pagelib.php	(.../pagelib.php)	(revision 283afa151e8bb5649df908f52f01fff24fc01585)
+++ temp_moodle_dev/moodle/mod/lesson/pagelib.php	(.../pagelib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -60,7 +60,6 @@
      *
      * @return void
      **/
-    //LAMS: we pass a new parameter so when in a lams sequence we don't display Moodle's headers
     function print_header($title = '', $morenavlinks = array(),$is_lams=NULL) {
         global $CFG;
 
@@ -126,13 +125,12 @@
         // }
 
         $navigation = build_navigation($morenavlinks, $this->modulerecord);
-        //LAMS: in a lams sequence we don't display Moodle's headers
-        if($is_lams==1){
-        	print_header();
-        }else{
-        	print_header($title, $this->courserecord->fullname, $navigation, '', $meta, true, $buttons, navmenu($this->courserecord, $this->modulerecord));
-        }
-        
+	//LAMS: in a lams sequence we don't display Moodle's headers
+	if($is_lams==1){
+	  print_header();
+	}else{
+	  print_header($title, $this->courserecord->fullname, $navigation, '', $meta, true, $buttons, navmenu($this->courserecord, $this->modulerecord));
+	}
 
         if (has_capability('mod/lesson:manage', $context)) {
             print_heading_with_help($activityname, 'overview', 'lesson');
Index: temp_moodle_dev/moodle/mod/lesson/reformat.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/lesson/reformat.php	(.../reformat.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/lesson/reformat.php	(.../reformat.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -108,7 +108,7 @@
             // make entry followed by '.'
             $line[1]='.';
         }
-        elseif ( ($responses AND $answer_found) OR (count(outlines)<=1) ) {
+        elseif ( ($responses AND $answer_found) OR (count($outlines)<=1) ) {
         // we have found responses and an answer and the current line is not an answer
             switch ($line[0]) {
                 case 1:
Index: temp_moodle_dev/moodle/mod/lesson/report.php
===================================================================
diff -u -r283afa151e8bb5649df908f52f01fff24fc01585 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/lesson/report.php	(.../report.php)	(revision 283afa151e8bb5649df908f52f01fff24fc01585)
+++ temp_moodle_dev/moodle/mod/lesson/report.php	(.../report.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -110,16 +110,14 @@
     lesson_print_header($cm, $course, $lesson, $action);
     
     $course_context = get_context_instance(CONTEXT_COURSE, $course->id);
-    //we add a new parameter to the IF condition so if we are in lams the All Course Grades Button won't be displayed
     if (has_capability('gradereport/grader:view', $course_context) && has_capability('moodle/grade:viewall', $course_context)&&$cm->is_lams==0) {
         echo '<div class="allcoursegrades"><a href="' . $CFG->wwwroot . '/grade/report/grader/index.php?id=' . $course->id . '">' 
             . get_string('seeallcoursegrades', 'grades') . '</a></div>';
     }
 
     if ($nothingtodisplay) {
         notify(get_string('nolessonattempts', 'lesson'));
-        //we pass a new parameter to the function so it won't we printed if is_lams=1
-    	print_footer($course,null, false,$cm->is_lams);
+	print_footer($course,null, false,$cm->is_lams);
         exit();
     }
 
@@ -918,7 +916,6 @@
     }
 
 /// Finish the page
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
     print_footer($course,null, false,$cm->is_lams);
 
 ?>
Index: temp_moodle_dev/moodle/mod/lesson/version.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/lesson/version.php	(.../version.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/lesson/version.php	(.../version.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -8,7 +8,7 @@
  * @package lesson
  **/
 
-$module->version  = 2007101509;  // The current module version (Date: YYYYMMDDXX)
+$module->version  = 2008112601;  // The current module version (Date: YYYYMMDDXX)
 $module->requires = 2007101509;  // Requires this Moodle version
 $module->cron     = 0;           // Period for cron to check this module (secs)
 
Index: temp_moodle_dev/moodle/mod/lesson/view.php
===================================================================
diff -u -r315b77d10668848b6ab52751b049063ce356bf06 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/lesson/view.php	(.../view.php)	(revision 315b77d10668848b6ab52751b049063ce356bf06)
+++ temp_moodle_dev/moodle/mod/lesson/view.php	(.../view.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -16,9 +16,11 @@
     $id      = required_param('id', PARAM_INT);             // Course Module ID
     $pageid  = optional_param('pageid', NULL, PARAM_INT);   // Lesson Page ID
     $edit    = optional_param('edit', -1, PARAM_BOOL);
-    $uploaded = optional_param('uploaded',0, PARAM_INT); // 1 if something has been edited in the lesson
+    $userpassword = optional_param('userpassword','',PARAM_CLEAN);
+    $uploaded = optional_param('uploaded',0, PARAM_INT); // 1 if something has been edited in the lesson    
     $editing  = optional_param('editing', 0, PARAM_INT); // 1 if editing in Lams
     $is_learner  = optional_param('is_learner',0, PARAM_INT);
+ 
     list($cm, $course, $lesson) = lesson_get_basics($id);
 
     require_login($course->id, false, $cm);
@@ -41,25 +43,20 @@
             }
             
             lesson_print_header($cm, $course, $lesson);
-            	
-		            print_simple_box_start('center');
-		            echo '<div style="text-align:center;">';
-		            echo '<p>'.$message.'</p>';
-		            // don't display the return to lesson or to course buttons if you are in a Lams lesson
-	            	if($cm->is_lams==0){
-		            	echo '<div class="lessonbutton standardbutton" style="padding: 5px;"><a href="'.$CFG->wwwroot.'/course/view.php?id='. $course->id .'">'. get_string('returnto', 'lesson', format_string($course->fullname, true)) .'</a></div>';
-	            	}
-		            echo '</div>';
-		            print_simple_box_end();
-	            
-            //we pass a new parameter to the function so it won't we printed if is_lams=1
-    		print_footer($course,null, false,$cm->is_lams);
+            print_simple_box_start('center');
+            echo '<div style="text-align:center;">';
+            echo '<p>'.$message.'</p>';
+            echo '<div class="lessonbutton standardbutton" style="padding: 5px;"><a href="'.$CFG->wwwroot.'/course/view.php?id='. $course->id .'">'. get_string('returnto', 'lesson', format_string($course->fullname, true)) .'</a></div>';
+            echo '</div>';
+            print_simple_box_end();
+            print_footer($course,null, false,$cm->is_lams);
             exit();
         
         } else if ($lesson->usepassword and empty($USER->lessonloggedin[$lesson->id])) { // Password protected lesson code
             $correctpass = false;
-            if ($password = optional_param('userpassword', '', PARAM_CLEAN)) {
-                if ($lesson->password == md5(trim($password))) {
+            if (!empty($userpassword)) {
+                // with or without md5 for backward compatibility (MDL-11090)
+                if (($lesson->password == md5(trim($userpassword))) or ($lesson->password == trim($userpassword))) {
                     $USER->lessonloggedin[$lesson->id] = true;
                     $correctpass = true;
                     if ($lesson->highscores) {
@@ -79,20 +76,20 @@
                 if (optional_param('userpassword', 0, PARAM_CLEAN)) {
                     notify(get_string('loginfail', 'lesson'));
                 }
-				if($cm->is_lams==0){
-	                echo get_string('passwordprotectedlesson', 'lesson', format_string($lesson->name))."<br /><br />\n".
-	                     get_string('enterpassword', 'lesson')." <input type=\"password\" name=\"userpassword\" /><br /><br />\n<center>".
-	                     '<span class="lessonbutton standardbutton"><a href="'.$CFG->wwwroot.'/course/view.php?id='. $course->id .'">'. get_string('cancel', 'lesson') .'</a></span> ';
-				}else{
-					   echo get_string('passwordprotectedlesson', 'lesson', format_string($lesson->name))."<br /><br />\n".
-	                     get_string('enterpassword', 'lesson')." <input type=\"password\" name=\"userpassword\" /><br /><br />\n<center>";
-				}
+		if($cm->is_lams==0){
+
+                echo get_string('passwordprotectedlesson', 'lesson', format_string($lesson->name))."<br /><br />\n".
+                     get_string('enterpassword', 'lesson')." <input type=\"password\" name=\"userpassword\" /><br /><br />\n<center>".
+                     '<span class="lessonbutton standardbutton"><a href="'.$CFG->wwwroot.'/course/view.php?id='. $course->id .'">'. get_string('cancel', 'lesson') .'</a></span> ';
+		}else{
+		  echo get_string('passwordprotectedlesson', 'lesson', format_string($lesson->name))."<br /><br />\n".
+		    get_string('enterpassword', 'lesson')." <input type=\"password\" name=\"userpassword\" /><br /><br />\n<center>";
+		}
                 lesson_print_submit_link(get_string('continue', 'lesson'), 'password', 'center', 'standardbutton submitbutton');
                 echo '</fieldset></form>';
                 print_simple_box_end();
                 echo "</div>\n";
-                //we pass a new parameter to the function so it won't we printed if is_lams=1
-    			print_footer($course,null, false,$cm->is_lams);
+		print_footer($course,null, false,$cm->is_lams);
                 exit();
             }
         
@@ -161,8 +158,7 @@
                     echo '<p style="text-align:center;">'.implode('<br />'.get_string('and', 'lesson').'<br />', $errors).'</p>';
                     print_simple_box_end();
                     echo '</p>';
-                    //we pass a new parameter to the function so it won't we printed if is_lams=1
-    				print_footer($course,null, false,$cm->is_lams);
+                    print_footer($course,null, false,$cm->is_lams);
                     exit();
                 } 
             }
@@ -192,7 +188,7 @@
                 lesson_set_message(get_string('lessonnotready', 'lesson', $course->teacher)); // a nice message to the student
             } else {
                 if (!count_records('lesson_pages', 'lessonid', $lesson->id)) {
-                    redirect("$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id&is_learner=$is_learner"); // no pages - redirect to add pages
+                    redirect("$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id&is_learner=$is_learner&count_records('lesson_pages'"); // no pages - redirect to add pages
                 } else {
                     lesson_set_message(get_string('lessonpagelinkingbroken', 'lesson'));  // ok, bad mojo
                 }
@@ -263,11 +259,11 @@
             // get the first page
             if (!$firstpageid = get_field('lesson_pages', 'id', 'lessonid', $lesson->id,
                         'prevpageid', 0)) {
-                if($cm->is_lams==0){
-                	error('Navigation: first page not found');
-                }else{
-                	include('showlamsnext.php');
-                }
+	      if($cm->is_lams==0){
+                error('Navigation: first page not found');
+	      }else{
+		include('showlamsnext.php');
+	      }
             }
             lesson_print_header($cm, $course, $lesson);
             if ($lesson->timed) {
@@ -277,17 +273,12 @@
                               '<a href="view.php?id='.$cm->id.'&amp;pageid='.$firstpageid.'&amp;startlastseen=no">'.
                                 get_string('continue', 'lesson').'</a></div>';
                 } else {
-	                
-		                print_simple_box_start('center');
-	                    echo '<div style="text-align:center;">';
-	                    echo get_string('leftduringtimednoretake', 'lesson');
-	                     // don't display the return to lesson or to course buttons if you are in a Lams lesson
-			            if($cm->is_lams==0){  
-		                    echo '<br /><br /><div class="lessonbutton standardbutton"><a href="../../course/view.php?id='. $course->id .'">'. get_string('returntocourse', 'lesson') .'</a></div>';
-			            }
-	                    echo '</div>';
-	                    print_simple_box_end();
-		            
+                    print_simple_box_start('center');
+                    echo '<div style="text-align:center;">';
+                    echo get_string('leftduringtimednoretake', 'lesson');
+                    echo '<br /><br /><div class="lessonbutton standardbutton"><a href="../../course/view.php?id='. $course->id .'">'. get_string('returntocourse', 'lesson') .'</a></div>';
+                    echo '</div>';
+                    print_simple_box_end();
                 }
                 
             } else {
@@ -303,8 +294,7 @@
                         get_string('no').'</a></div>';
                 echo '</span>';
             }
-            //we pass a new parameter to the function so it won't we printed if is_lams=1
-    		print_footer($course,null, false,$cm->is_lams);
+            print_footer($course,null, false,$cm->is_lams);
             exit();
         }
         
@@ -318,14 +308,12 @@
                 print_simple_box_start('center');
                 echo "<div style=\"text-align:center;\">";
                 echo get_string("noretake", "lesson");
-            	// don't display the return to lesson or to course buttons if you are in a Lams lesson
-			   	if($cm->is_lams==0){  
-               		 echo "<br /><br /><div class=\"lessonbutton standardbutton\"><a href=\"../../course/view.php?id=$course->id\">".get_string('returntocourse', 'lesson').'</a></div>';
-			   	}
-               	echo "</div>";
+		if($cm->is_lams==0){  
+		  echo "<br /><br /><div class=\"lessonbutton standardbutton\"><a href=\"../../course/view.php?id=$course->id\">".get_string('returntocourse', 'lesson').'</a></div>';
+		}
+                echo "</div>";
                 print_simple_box_end();
-                //we pass a new parameter to the function so it won't we printed if is_lams=1
-    			print_footer($course,null, false,$cm->is_lams);
+                print_footer($course,null, false,$cm->is_lams);
                 exit();
                   //redirect("../../course/view.php?id=$course->id", get_string("alreadytaken", "lesson"));
             // allow student to retake course even if they have the maximum grade
@@ -336,11 +324,11 @@
         }
         // start at the first page
         if (!$pageid = get_field('lesson_pages', 'id', 'lessonid', $lesson->id, 'prevpageid', 0)) {
-                if($cm->is_lams==0){
-                	error('Navigation: first page not found');
-                }else{
-                	include('showlamsnext.php');
-                }
+	  if($cm->is_lams==0){
+                error('Navigation: first page not found');
+	  }else{
+	    include('showlamsnext.php');
+	  }
         }
         /// This is the code for starting a timed test
         if(!isset($USER->startlesson[$lesson->id]) && !has_capability('mod/lesson:manage', $context)) {
@@ -381,14 +369,13 @@
         add_to_log($course->id, 'lesson', 'view', 'view.php?id='. $cm->id, $pageid, $cm->id);
         
         if (!$page = get_record('lesson_pages', 'id', $pageid)) {
-        		if($cm->is_lams==0){
-                	error('Navigation: the page record not found');
-                }else{
-                	include('showlamsnext.php');
-                	print_r("This lesson hasn't been edited yet by the teacher");
-                	break;
-                }
-            
+	  if($cm->is_lams==0){
+            error('Navigation: the page record not found');
+	  }else{
+	    include('showlamsnext.php');
+	    print_r("This lesson hasn't been edited yet by the teacher");
+	    break;
+	  }
         }
 
         if ($page->qtype == LESSON_CLUSTER) {  //this only gets called when a user starts up a new lesson and the first page is a cluster page
@@ -550,7 +537,6 @@
         }
 
     /// Print the page header, heading and tabs
-    	//LAMS: we pass a new parameter so when in a lams sequence we don't display Moodle's headers
         $PAGE->print_header('','',$cm->is_lams);
 
         if ($attemptflag) {
@@ -973,8 +959,8 @@
             echo "<p style=\"text-align:center;\">".get_string("displayofgrade", "lesson")."</p>\n";
         }
         print_simple_box_end(); //End of Lesson button to Continue.
-		 //LAMS: if the student have finished the activity
-         $finishlesson=1;
+	//LAMS: if the student have finished the activity
+	$finishlesson=1;
         // after all the grade processing, check to see if "Show Grades" is off for the course
         // if yes, redirect to the course page
         if (!$course->showgrades&&$cm->is_lams==0) {
@@ -1053,25 +1039,25 @@
                     }
             }
         }
-    // don't display the return to lesson or to course buttons if you are in a Lams lesson
-		if($cm->is_lams==0){  
-	        echo "<div style=\"text-align:center; padding:5px;\" class=\"lessonbutton standardbutton\"><a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">".get_string('returnto', 'lesson', format_string($course->fullname, true))."</a></div>\n";
-	        echo "<div style=\"text-align:center; padding:5px;\" class=\"lessonbutton standardbutton\"><a href=\"$CFG->wwwroot/grade/index.php?id=$course->id\">".get_string('viewgrades', 'lesson')."</a></div>\n";
-		}
-		
+
+	if($cm->is_lams==0){
+	  echo "<div style=\"text-align:center; padding:5px;\" class=\"lessonbutton standardbutton\"><a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">".get_string('returnto', 'lesson', format_string($course->fullname, true))."</a></div>\n";
+	  echo "<div style=\"text-align:center; padding:5px;\" class=\"lessonbutton standardbutton\"><a href=\"$CFG->wwwroot/grade/index.php?id=$course->id\">".get_string('viewgrades', 'lesson')."</a></div>\n";
+	}
     }
+
     if($cm->is_lams==1){
-    	if($uploaded==1||$editing==1){
-		 		//lams: display the finish edditing button if we have added any kind of question
-            	include('showlamsfinish.php');   
-    	}elseif($finishlesson==1||$is_learner==1||!get_record('lesson_pages', 'lessonid', $lesson->id)){
-    			//lams: display the next activity button if we have added any kind of question
-            	include('showlamsnext.php');   
-    	}
-	}
+      if($uploaded==1||$editing==1){
+	//lams: display the finish edditing button if we have added any kind of question
+	include('showlamsfinish.php'); 
+      }elseif($finishlesson==1||$is_learner==1||!get_record('lesson_pages', 'lessonid', $lesson->id)){
+	//lams: display the next activity button if we have added any kind of question
+	include('showlamsnext.php');   
+      }
+    }
 
+
 /// Finish the page
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
-    print_footer($course,null, false,$cm->is_lams);
+   print_footer($course,null, false,$cm->is_lams);
 
 ?>
Index: temp_moodle_dev/moodle/mod/quiz/attempt.php
===================================================================
diff -u -r89659faa9ee2ac5d9c25fa5524f6925d923f00b3 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/quiz/attempt.php	(.../attempt.php)	(revision 89659faa9ee2ac5d9c25fa5524f6925d923f00b3)
+++ temp_moodle_dev/moodle/mod/quiz/attempt.php	(.../attempt.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -60,8 +60,8 @@
     $ispreviewing = has_capability('mod/quiz:preview', $context);
 
     // if no questions have been set up yet redirect to edit.php
-    if (!$quiz->questions and has_capability('mod/quiz:manage', $context)) {	
-    		redirect($CFG->wwwroot . '/mod/quiz/edit.php?cmid=' . $cm->id);	
+    if (!$quiz->questions and has_capability('mod/quiz:manage', $context)) {
+        redirect($CFG->wwwroot . '/mod/quiz/edit.php?cmid=' . $cm->id);
     }
 
     if (!$ispreviewing) {
@@ -85,31 +85,32 @@
 /// Check number of attempts
     $numberofpreviousattempts = count_records_select('quiz_attempts', "quiz = '{$quiz->id}' AND " .
         "userid = '{$USER->id}' AND timefinish > 0 AND preview != 1");
-    
-    if ($quiz->attempts and $numberofpreviousattempts >= $quiz->attempts) {
-        	print_error('nomoreattempts', 'quiz', "view.php?id={$cm->id}");
+    if (!empty($quiz->attempts) and $numberofpreviousattempts >= $quiz->attempts) {
+        print_error('nomoreattempts', 'quiz', "view.php?id={$cm->id}");
     }
 
 /// Check subnet access
-    if (!$ispreviewing && $quiz->subnet && !address_in_subnet(getremoteaddr(), $quiz->subnet)) {
-	        	print_error('subneterror', 'quiz', "view.php?id={$cm->id}");
+    if (!$ispreviewing && !empty($quiz->subnet) && !address_in_subnet(getremoteaddr(), $quiz->subnet)) {
+        print_error("subneterror", "quiz", "view.php?id=$cm->id");
     }
 
 /// Check password access
     if ($ispreviewing && $forcenew) {
         unset($SESSION->passwordcheckedquizzes[$quiz->id]);
     }
 
-    if ($quiz->password and empty($SESSION->passwordcheckedquizzes[$quiz->id])) {
+    if (!empty($quiz->password) and empty($SESSION->passwordcheckedquizzes[$quiz->id])) {
         $enteredpassword = optional_param('quizpassword', '', PARAM_RAW);
         if (optional_param('cancelpassword', false)) {
-        		redirect($CFG->wwwroot . '/mod/quiz/view.php?q=' . $quiz->id);
+            // User clicked cancel in the password form.
+            redirect($CFG->wwwroot . '/mod/quiz/view.php?q=' . $quiz->id);
         } else if (strcmp($quiz->password, $enteredpassword) === 0) {
             // User entered the correct password.
             $SESSION->passwordcheckedquizzes[$quiz->id] = true;
         } else {
-        		
-        	$url = $CFG->wwwroot . '/mod/quiz/attempt.php?q=' . $quiz->id;
+            // User entered the wrong password, or has not entered one yet.
+            $url = $CFG->wwwroot . '/mod/quiz/attempt.php?q=' . $quiz->id;
+
             if (empty($popup)) {
                 print_header('', '', '', 'quizpassword');
             }
@@ -122,7 +123,6 @@
             if (!empty($enteredpassword)) {
                 echo '<p class="notifyproblem">', get_string('passworderror', 'quiz'), '</p>';
             }
-            
 ?>
 <p><?php print_string('requirepasswordmessage', 'quiz'); ?></p>
 <form id="passwordform" method="post" action="<?php echo $url; ?>" onclick="this.autocomplete='off'">
@@ -136,14 +136,13 @@
 <?php
             print_box_end();
             if (empty($popup)) {
-            	//we pass a new parameter to the function so it won't we printed if is_lams=1
-	    		print_footer(null,null, false,$cm->is_lams);
+                print_footer(null,null, false,$cm->is_lams);
             }
             exit;
         }
     }
 
-    if ($quiz->delay1 or $quiz->delay2) {
+    if (!empty($quiz->delay1) or !empty($quiz->delay2)) {
         //quiz enforced time delay
         if ($attempts = quiz_get_user_attempts($quiz->id, $USER->id)) {
             $numattempts = count($attempts);
@@ -155,13 +154,13 @@
         if ($lastattempt_obj) {
             $lastattempt = $lastattempt_obj->timefinish;
         }
-        if ($numattempts == 1 && $quiz->delay1) {
+        if ($numattempts == 1 && !empty($quiz->delay1)) {
             if ($timenow - $quiz->delay1 < $lastattempt) {
-	        		 print_error('timedelay', 'quiz', 'view.php?q='.$quiz->id);
+                print_error('timedelay', 'quiz', 'view.php?q='.$quiz->id);
             }
-        } else if($numattempts > 1 && $quiz->delay2) {
+        } else if($numattempts > 1 && !empty($quiz->delay2)) {
             if ($timenow - $quiz->delay2 < $lastattempt) {
-	        		 print_error('timedelay', 'quiz', 'view.php?q='.$quiz->id);
+                print_error('timedelay', 'quiz', 'view.php?q='.$quiz->id);
             }
         }
     }
@@ -198,24 +197,17 @@
         }
         // make log entries
         if ($ispreviewing) {
-	        	
             add_to_log($course->id, 'quiz', 'preview',
-                           'attempt.php?id='.$cm->id,
+                           "attempt.php?id=$cm->id",
                            "$quiz->id", $cm->id);
         } else {
- 
             add_to_log($course->id, 'quiz', 'attempt',
-                           'review.php?attempt='.$attempt->id,
+                           "review.php?attempt=$attempt->id",
                            "$quiz->id", $cm->id);
         }
     } else {
-        // log continuation of attempt only if some time has lapsed
-        if (($timestamp - $attempt->timemodified) > 600) { // 10 minutes have elapsed 
-	            $address5='review.php?attempt='.$attempt->id;
-             add_to_log($course->id, 'quiz', 'continue attemp', // this action used to be called 'continue attempt' but the database field has only 15 characters
-                           $address5,
-                           "$quiz->id", $cm->id);
-        }
+         add_to_log($course->id, 'quiz', 'continue attemp', // this action used to be called 'continue attempt' but the database field has only 15 characters
+                       'review.php?attempt=' . $attempt->id, $quiz->id, $cm->id);
     }
     if (!$attempt->timestart) { // shouldn't really happen, just for robustness
         debugging('timestart was not set for this attempt. That should be impossible.', DEBUG_DEVELOPER);
@@ -239,7 +231,7 @@
     }
 
     if (!$questionlist) {
-	            print_error('noquestionsfound', 'quiz', 'view.php?q='.$quiz->id);
+        print_error('noquestionsfound', 'quiz', 'view.php?q='.$quiz->id);
     }
 
     $sql = "SELECT q.*, i.grade AS maxgrade, i.id AS instance".
@@ -250,7 +242,7 @@
 
     // Load the questions
     if (!$questions = get_records_sql($sql)) {
-	            print_error('noquestionsfound', 'quiz', 'view.php?q='.$quiz->id);
+        print_error('noquestionsfound', 'quiz', 'view.php?q='.$quiz->id);
     }
 
     // Load the question type specific information
@@ -326,9 +318,8 @@
             if ($page) {
                 $pagebit = '&amp;page=' . $page;
             }
-	            $address6=$CFG->wwwroot . '/mod/quiz/attempt.php?q=' . $quiz->id . $pagebit;
             print_error('errorprocessingresponses', 'question',
-                    $address6);
+                    $CFG->wwwroot . '/mod/quiz/attempt.php?q=' . $quiz->id . $pagebit);
         }
 
         $attempt->timemodified = $timestamp;
@@ -384,9 +375,8 @@
             print_error('errorprocessingresponses', 'question',
                     $CFG->wwwroot . '/mod/quiz/attempt.php?q=' . $quiz->id . $pagebit);
         }
-        add_to_log($course->id, 'quiz', 'close attempt',
-                           'review.php?attempt='.$attempt->id,
-                           "$quiz->id", $cm->id);
+
+        add_to_log($course->id, 'quiz', 'close attempt', 'review.php?attempt=' . $attempt->id, $quiz->id, $cm->id);
     }
 
 /// Update the quiz attempt and the overall grade for the quiz
@@ -408,12 +398,12 @@
         if (!empty($SESSION->passwordcheckedquizzes[$quiz->id])) {
             unset($SESSION->passwordcheckedquizzes[$quiz->id]);
         }
-        	 redirect($CFG->wwwroot . '/mod/quiz/review.php?attempt='.$attempt->id, 0);
+        redirect($CFG->wwwroot . '/mod/quiz/review.php?attempt='.$attempt->id, 0);
     }
 
 // Now is the right time to check the open and close times.
     if (!$ispreviewing && ($timestamp < $quiz->timeopen || ($quiz->timeclose && $timestamp > $quiz->timeclose))) {
-    	 		print_error('notavailable', 'quiz', "view.php?id={$cm->id}");
+        print_error('notavailable', 'quiz', "view.php?id={$cm->id}");
     }
 
 /// Print the quiz page ////////////////////////////////////////////////////////
@@ -431,8 +421,7 @@
                     ? update_module_button($cm->id, $course->id, get_string('modulename', 'quiz'))
                     : "";
         $navigation = build_navigation($strattemptnum, $cm);
-     //we pass a new parameter to the function so it won't we printed if is_lams=1
-	  print_header_simple(format_string($quiz->name), "", $navigation, "", $headtags, true, $strupdatemodule,'',false,'',false,$quiz->is_lams);
+        print_header_simple(format_string($quiz->name), "", $navigation, "", $headtags, true, $strupdatemodule,'',false,'',false,$quiz->is_lams);
     }
 
     echo '<div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>'; // for overlib
@@ -468,8 +457,10 @@
     }
 
     // Start the form
-    echo '<form id="responseform" method="post" action="', 'attempt.php?q='. s($quiz->id). '&amp;page='. s($page), '" enctype="multipart/form-data"' .
-            ' onclick="this.autocomplete=\'off\'" onkeypress="return check_enter(event);">', "\n";
+    $quiz->thispageurl = $CFG->wwwroot . '/mod/quiz/attempt.php?q=' . s($quiz->id) . '&amp;page=' . s($page);
+    $quiz->cmid = $cm->id;
+    echo '<form id="responseform" method="post" action="', $quiz->thispageurl . '" enctype="multipart/form-data"' .
+            ' onclick="this.autocomplete=\'off\'" onkeypress="return check_enter(event);" accept-charset="utf-8">', "\n";
     if($quiz->timelimit > 0) {
         // Make sure javascript is enabled for time limited quizzes
         ?>
@@ -510,7 +501,7 @@
     if ($quiz->optionflags & QUESTION_ADAPTIVE) {
         echo "<input type=\"submit\" name=\"markall\" value=\"".get_string("markall", "quiz")."\" />\n";
     }
-    echo "<input type=\"submit\" name=\"finishattempt\" value=\"".get_string("finishattempt", "quiz")."\"onclick=\"$onclick\" />\n";
+    echo "<input type=\"submit\" name=\"finishattempt\" value=\"".get_string("finishattempt", "quiz")."\" onclick=\"$onclick\" />\n";
 
     echo "</div>";
 
@@ -548,7 +539,6 @@
 
     // Finish the page
     if (empty($popup)) {
-    	//we pass a new parameter to the function so it won't we printed if is_lams=1
-	    print_footer($course,null, false,$cm->is_lams);
+        print_footer($course,null, false,$cm->is_lams);
     }
 ?>
Index: temp_moodle_dev/moodle/mod/quiz/comment.php
===================================================================
diff -u -r89659faa9ee2ac5d9c25fa5524f6925d923f00b3 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/quiz/comment.php	(.../comment.php)	(revision 89659faa9ee2ac5d9c25fa5524f6925d923f00b3)
+++ temp_moodle_dev/moodle/mod/quiz/comment.php	(.../comment.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -74,14 +74,14 @@
             notify(get_string('changessaved'));
             echo '<div class="boxaligncenter"><input type="button" onclick="window.opener.location.reload(1); self.close();return false;" value="' .
                     get_string('closewindow') . "\" /></div>";
-			//we pass a new parameter to the function so it won't we printed if is_lams=1
+
             print_footer(null,null, false,$quiz->is_lams);
             exit;
         }
     }
 
     question_print_comment_box($question, $state, $attempt, $CFG->wwwroot.'/mod/quiz/comment.php');
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
-    print_footer(null,null, false,$quiz->is_lams);	
 
+    print_footer(null,null, false,$quiz->is_lams);      
+
 ?>
Index: temp_moodle_dev/moodle/mod/quiz/db/access.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/quiz/db/access.php	(.../access.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/quiz/db/access.php	(.../access.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -22,13 +22,25 @@
 
     // Ability to do the quiz as a 'student'.
     'mod/quiz:attempt' => array(
+        'riskbitmask' => RISK_SPAM,
         'captype' => 'write',
         'contextlevel' => CONTEXT_MODULE,
         'legacy' => array(
             'student' => CAP_ALLOW
         )
     ),
 
+    // Ability for a 'Student' to review their previous attempts. Review by
+    // 'Teachers' is controlled by mod/quiz:viewreports.
+    'mod/quiz:reviewmyattempts' => array(
+        'captype' => 'read',
+        'contextlevel' => CONTEXT_MODULE,
+        'legacy' => array(
+            'student' => CAP_ALLOW
+        ),
+        'clonepermissionsfrom' => 'moodle/quiz:attempt'
+    ),
+
     // Edit the quiz settings, add and remove questions.
     'mod/quiz:manage' => array(
         'riskbitmask' => RISK_SPAM,
Index: temp_moodle_dev/moodle/mod/quiz/db/install.xml
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/quiz/db/install.xml	(.../install.xml)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/quiz/db/install.xml	(.../install.xml)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -201,10 +201,8 @@
         <FIELD NAME="subnet" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="password" NEXT="popup"/>
         <FIELD NAME="popup" TYPE="int" LENGTH="4" NOTNULL="true" UNSIGNED="false" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="subnet" NEXT="delay1"/>
         <FIELD NAME="delay1" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="false" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="popup" NEXT="delay2"/>
-        <FIELD NAME="delay2" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="false" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="delay1"  NEXT="is_lams" />
-		<FIELD NAME="is_lams" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="delay2" /> 
-		
-		
+        <FIELD NAME="delay2" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="false" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="delay1" NEXT="is_lams"/>
+        <FIELD NAME="is_lams" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="delay2"/>
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" />
Index: temp_moodle_dev/moodle/mod/quiz/edit.php
===================================================================
diff -u -r57edaa98d43acacd6f06ac7e71325b52e5d8eb65 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/quiz/edit.php	(.../edit.php)	(revision 57edaa98d43acacd6f06ac7e71325b52e5d8eb65)
+++ temp_moodle_dev/moodle/mod/quiz/edit.php	(.../edit.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -30,7 +30,7 @@
     //Gets Lams update URL if the quiz was created in a sequence
     $lamsupdateurl = optional_param('lamsUpdateURL', PARAM_TEXT);//lams update address to come back to Lams after editing the quiz
     $is_learner  = optional_param('is_learner',0, PARAM_INT);
-	/**
+    /**
      * Callback function called from question_list() function (which is called from showbank())
      * Displays action icon as first action for each question.
      */
@@ -44,7 +44,7 @@
                 $movearrow = 'moveleft.gif'; 
             } 
             $straddtoquiz = get_string("addtoquiz", "quiz");
-            $out = "<a title=\"$straddtoquiz\" href=\"edit.php?".$pageurl->get_query_string()."&amp;addquestion=$questionid&amp;sesskey=".sesskey()."&hola\"><img
+	    $out = "<a title=\"$straddtoquiz\" href=\"edit.php?".$pageurl->get_query_string()."&amp;addquestion=$questionid&amp;sesskey=".sesskey()."&hola\"><img            
                   src=\"$CFG->pixpath/t/$movearrow\" alt=\"$straddtoquiz\" /></a>&nbsp;";
             return $out;
         } else {
@@ -67,22 +67,27 @@
      * Callback function called from question_list() function (which is called from showbank())
      */
     function module_specific_controls($totalnumber, $recurse, $category, $cmid){
+        global $QTYPES;
+        $out = '';
         $catcontext = get_context_instance_by_id($category->contextid);
         if (has_capability('moodle/question:useall', $catcontext)){
-            for ($i = 1;$i <= min(10, $totalnumber); $i++) {
-                $randomcount[$i] = $i;
+            $randomusablequestions = $QTYPES['random']->get_usable_questions_from_category(
+                    $category->id, $recurse, '0');
+            $maxrand = count($randomusablequestions);
+            if ($maxrand > 0) {
+                for ($i = 1;$i <= min(10, $maxrand); $i++) {
+                    $randomcount[$i] = $i;
+                }
+                for ($i = 20;$i <= min(100, $maxrand); $i += 10) {
+                    $randomcount[$i] = $i;
+                }
+                $out .= '<br />';
+                $out .= get_string('addrandom', 'quiz', choose_from_menu($randomcount, 'randomcount', '1', '', '', '', true));
+                $out .= '<input type="hidden" name="recurse" value="'.$recurse.'" />';
+                $out .= '<input type="hidden" name="categoryid" value="'.$category->id.'" />';
+                $out .= ' <input type="submit" name="addrandom" value="'. get_string('add') .'" />';
+                $out .= helpbutton('random', get_string('random', 'quiz'), 'quiz', true, false, '', true);
             }
-            for ($i = 20;$i <= min(100, $totalnumber); $i += 10) {
-                $randomcount[$i] = $i;
-            }
-            $out = '<br />';
-            $out .= get_string('addrandom', 'quiz', choose_from_menu($randomcount, 'randomcount', '1', '', '', '', true));
-            $out .= '<input type="hidden" name="recurse" value="'.$recurse.'" />';
-            $out .= "<input type=\"hidden\" name=\"categoryid\" value=\"$category->id\" />";
-            $out .= ' <input type="submit" name="addrandom" value="'. get_string('add') .'" />';
-            $out .= helpbutton('random', get_string('random', 'quiz'), 'quiz', true, false, '', true);
-        } else {
-            $out = '';
         }
         return $out;
     }
@@ -167,7 +172,7 @@
     }
 
     if (($addquestion = optional_param('addquestion', 0, PARAM_INT)) and confirm_sesskey()) { /// Add a single question to the current quiz
-    	quiz_add_quiz_question($addquestion, $quiz);
+        quiz_add_quiz_question($addquestion, $quiz);
         $significantchangemade = true;
     }
 
@@ -199,8 +204,6 @@
                 WHERE qtype = '" . RANDOM . "'
                     AND category = $category->id
                     AND " . sql_compare_text('questiontext') . " = '$recurse'
-                    
-                  
                     AND NOT EXISTS (SELECT * FROM " . $CFG->prefix . "quiz_question_instances WHERE question = q.id)
                 ORDER BY id")) {
             // Take as many of these as needed.
@@ -303,16 +306,17 @@
                 error('Could not set a new maximum grade for the quiz');
             }
         }
-        //If there is a Quiz inside a Lams sequence after saving changes from your question's list you are redirect back to the Lams page
-        if ($quiz->is_lams==1){
-        	// old redirect(urldecode($lamsupdateurl)."&extToolContentID=$quiz->id");
-        	//include the javascript code so we can call the button frame and change the button properties so it can be shown
-	        if($is_learner==0){	
-	        	include('showlamsfinish.php');
-	        }else{
-	        	include('showlamsnext.php');
-	        }
-        }
+	//If there is a Quiz inside a Lams sequence after saving changes from your question's list you are redirect back to the Lams page
+	if ($quiz->is_lams==1){
+		// old redirect(urldecode($lamsupdateurl)."&extToolContentID=$quiz->id");
+		//include the javascript code so we can call the button frame and change the button properties so it can be shown
+		include('showlamsfinish.php');
+	        if($is_learner==0){ 
+			include('showlamsfinish.php');
+		}else{
+			include('showlamsnext.php');
+		}
+	}
         $significantchangemade = true;
     }
 
@@ -338,30 +342,28 @@
                     ? update_module_button($cm->id, $course->id, get_string('modulename', 'quiz'))
                     : "";
         $navigation = build_navigation($streditingquiz, $cm);
-        
-        //we pass a new parameter to the function so it won't we printed if is_lams=1
         print_header_simple($streditingquiz, '', $navigation, "", "",true, $strupdatemodule,'',false,'',false,$cm->is_lams);
-      	
+
         $currenttab = 'edit';
         $mode = 'editq';
 
         include('tabs.php');
 
         print_box_start();
+
         echo "<div class=\"quizattemptcounts\">\n";
-        echo '<a href="report.php?mode=overview&amp;id=' . $cm->id.'">' .
+        echo '<a href="report.php?mode=overview&amp;id=' . $cm->id . '">' .
                 quiz_num_attempt_summary($quiz, $cm) . '</a><br />' .
                 get_string('cannoteditafterattempts', 'quiz');
         echo "</div>\n";
+
         $sumgrades = quiz_print_question_list($quiz,  $thispageurl, false, $quiz_showbreaks, $quiz_reordertool);
-        
         if (!set_field('quiz', 'sumgrades', $sumgrades, 'id', $quiz->instance)) {
             error('Failed to set sumgrades');
         }
 
         print_box_end();
-	    //we pass a new parameter to the function so it won't we printed if is_lams=1
-	    print_footer(null,null, false,$quiz->is_lams);
+        print_footer(null,null, false,$quiz->is_lams);
         exit;
     }
 
@@ -370,9 +372,7 @@
         ? update_module_button($cm->id, $course->id, get_string('modulename', 'quiz'))
         : "";
     $navigation = build_navigation($streditingquiz, $cm);
-	//we pass a new parameter to the function so it won't we printed if is_lams=1
-	print_header_simple($streditingquiz, '', $navigation, "", "", true, $strupdatemodule,'',false,'',false,$quiz->is_lams);
-	//old print_header_simple($streditingquiz, '', $navigation, "", "", true, $strupdatemodule);
+    print_header_simple($streditingquiz, '', $navigation, "", "", true, $strupdatemodule,'',false,'',false,$quiz->is_lams);
 
     $currenttab = 'edit';
     $mode = 'editq';
@@ -383,20 +383,22 @@
     echo '<tr><td style="width:50%" valign="top">';
     print_box_start('generalbox quizquestions');
     print_heading(get_string('questionsinthisquiz', 'quiz'), '', 2);
-	$sumgrades = quiz_print_question_list($quiz, $thispageurl, true, $quiz_showbreaks, $quiz_reordertool);
-    
+
+    $sumgrades = quiz_print_question_list($quiz, $thispageurl, true, $quiz_showbreaks, $quiz_reordertool);
     if (!set_field('quiz', 'sumgrades', $sumgrades, 'id', $quiz->instance)) {
         error('Failed to set sumgrades');
     }
 
     print_box_end();
 
     echo '</td><td style="width:50%" valign="top">';
-	question_showbank('editq', $contexts, $thispageurl, $cm, $pagevars['qpage'], $pagevars['qperpage'], $pagevars['qsortorder'], $pagevars['qsortorderdecoded'],
-                   $pagevars['cat'], $pagevars['recurse'], $pagevars['showhidden'], $pagevars['showquestiontext']);
-                               
+
+    question_showbank('editq', $contexts, $thispageurl, $cm, $pagevars['qpage'], $pagevars['qperpage'], $pagevars['qsortorder'], $pagevars['qsortorderdecoded'],
+                    $pagevars['cat'], $pagevars['recurse'], $pagevars['showhidden'], $pagevars['showquestiontext']);
+
     echo '</td></tr>';
     echo '</table>';
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
-	print_footer($course,null, false,$quiz->is_lams);
+
+    print_footer($course,null, false,$quiz->is_lams);
 ?>
+
Index: temp_moodle_dev/moodle/mod/quiz/editlib.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/quiz/editlib.php	(.../editlib.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/quiz/editlib.php	(.../editlib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -62,7 +62,6 @@
 *                         This is updated by this function
 */
 function quiz_add_quiz_question($id, &$quiz) {
-	
     $questions = explode(",", $quiz->questions);
 
     if (in_array($id, $questions)) {
@@ -92,7 +91,8 @@
 
     // update question grades
     $questionrecord = get_record("question", "id", $id);
-    $quiz->grades[$id] = $questionrecord->defaultgrade;
+    $quiz->grades[$id]
+            = $questionrecord->defaultgrade;
     quiz_update_question_instance($quiz->grades[$id], $id, $quiz->instance);
 
     return true;
@@ -132,10 +132,7 @@
 * @param boolean $showbreaks  Indicates whether the page breaks should be displayed
 * @param boolean $showbreaks  Indicates whether the reorder tool should be displayed
 */
-
-function quiz_print_question_list($quiz, $pageurl, $allowdelete=true, $showbreaks=true, $reordertool=false, $lamsupdateurl=null) { //we pass the Lams update URL to be able later to go back to the Lams page
-	// old function quiz_print_question_list($quiz, $pageurl, $allowdelete=true, $showbreaks=true, $reordertool=false) {
-	
+function quiz_print_question_list($quiz, $pageurl, $allowdelete=true, $showbreaks=true, $reordertool=false) {
     global $USER, $CFG, $QTYPES;
 
     $strorder = get_string("order");
@@ -179,13 +176,7 @@
         $order[] = 0;
         $lastindex++;
     }
-    // If this is a Quiz inside a Lams sequence we pass the Lams update URL to the edit page
-    if($quiz->is_lams==1){
-     $address="edit.php?lamsUpdateURL=".urlencode($lamsupdateurl);
-    echo '<form method="post" action="'.$address.'">';
-    }else{
-    	echo '<form method="post" action="edit.php">';
-    }
+    echo "<form method=\"post\" action=\"edit.php\">";
     echo '<fieldset class="invisiblefieldset" style="display: block;">';
     echo "<input type=\"hidden\" name=\"sesskey\" value=\"$USER->sesskey\" />";
     echo $pageurl->hidden_params_out();
@@ -339,13 +330,7 @@
     echo "</form>\n";
 
 /// Form to choose to show pagebreaks and to repaginate quiz
-	 if($quiz->is_lams==1){ //if press GO button and in a Lams sequence you keep the lamsupdateurl to be able to come back to lams later
-	     $address2="edit.php?lamsUpdateURL=".urlencode($lamsupdateurl);
-	    echo '<form method="post" action="'.$address2.'" id="showbreaks">';
-	  }else{
-	    	echo '<form method="post" action="edit.php" id="showbreaks">';
-	  }
-    
+    echo '<form method="post" action="edit.php" id="showbreaks">';
     echo '<fieldset class="invisiblefieldset">';
     echo $pageurl->hidden_params_out(array('showbreaks', 'reordertool'));
     echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
Index: temp_moodle_dev/moodle/mod/quiz/grade.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/quiz/grade.php	(.../grade.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/quiz/grade.php	(.../grade.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -17,11 +17,11 @@
     }
 
     require_login($course->id, false, $cm);
-	if (has_capability('mod/quiz:viewreports', get_context_instance(CONTEXT_MODULE, $cm->id))) {
-	      redirect('report.php?id='.$cm->id);
-	} else {
-	      redirect('view.php?id='.$cm->id);
-	}
-	
 
+    if (has_capability('mod/quiz:viewreports', get_context_instance(CONTEXT_MODULE, $cm->id))) {
+        redirect('report.php?id='.$cm->id);
+    } else {
+        redirect('view.php?id='.$cm->id);
+    }
+
 ?>
Index: temp_moodle_dev/moodle/mod/quiz/index.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/quiz/index.php	(.../index.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/quiz/index.php	(.../index.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -34,8 +34,8 @@
     $navlinks[] = array('name' => $strquizzes, 'link' => '', 'type' => 'activity');
     $navigation = build_navigation($navlinks);
 
-   	print_header_simple($strquizzes, '', $navigation,'', '', true, $streditquestions, navmenu($course));
-    
+    print_header_simple($strquizzes, '', $navigation,
+                 '', '', true, $streditquestions, navmenu($course));
 
 // Get all the appropriate data
     if (!$quizzes = get_all_instances_in_course("quiz", $course)) {
@@ -53,15 +53,16 @@
     }
     array_unshift($align, 'center');
 
-    $showing = 'scores';  // default
+    $showing = '';  // default
 
     if (has_capability('mod/quiz:viewreports', $coursecontext)) {
         array_push($headings, get_string('attempts', 'quiz'));
         array_push($align, 'left');
         $showing = 'stats';
-    } else if (has_capability('mod/quiz:attempt', $coursecontext)) {
+    } else if (has_any_capability(array('mod/quiz:reviewmyattempts', 'mod/quiz:attempt'), $coursecontext)) {
         array_push($headings, get_string('bestgrade', 'quiz'), get_string('feedback', 'quiz'));
         array_push($align, 'left', 'left');
+        $showing = 'scores';  // default
     }
 
     $table->head = $headings;
Index: temp_moodle_dev/moodle/mod/quiz/lib.php
===================================================================
diff -u -r31020ea7f43ca21b697b3055a0880691f6214ff3 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/quiz/lib.php	(.../lib.php)	(revision 31020ea7f43ca21b697b3055a0880691f6214ff3)
+++ temp_moodle_dev/moodle/mod/quiz/lib.php	(.../lib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -10,8 +10,6 @@
 */
 
 require_once($CFG->libdir.'/pagelib.php');
-require_once($CFG->libdir.'/questionlib.php');
-require_once($CFG->dirroot.'/mod/quiz/editlib.php');
 
 /// CONSTANTS ///////////////////////////////////////////////////////////////////
 
@@ -120,7 +118,6 @@
     return true;
 }
 
-
 function quiz_delete_instance($id) {
 /// Given an ID of an instance of this module,
 /// this function will permanently delete the instance
@@ -133,8 +130,9 @@
     $result = true;
 
     if ($attempts = get_records("quiz_attempts", "quiz", "$quiz->id")) {
+        // TODO: this should use the delete_attempt($attempt->uniqueid) function in questionlib.php
+        // require_once($CFG->libdir.'/questionlib.php');
         foreach ($attempts as $attempt) {
-            // TODO: this should use the delete_attempt($attempt->uniqueid) function in questionlib.php
             if (! delete_records("question_states", "attempt", "$attempt->uniqueid")) {
                 $result = false;
             }
@@ -160,7 +158,7 @@
 
     $pagetypes = page_import_types('mod/quiz/');
     foreach($pagetypes as $pagetype) {
-        if(!delete_records('block_instance', 'pageid', $quiz->id, 'pagetype', $pagetype)) {
+        if(!blocks_delete_all_on_page($pagetype, $quiz->id)) {
             $result = false;
         }
     }
@@ -176,33 +174,47 @@
     return $result;
 }
 
+/**
+ * Get the best current grade for a particular user in a quiz.
+ *
+ * @param object $quiz the quiz object.
+ * @param integer $userid the id of the user.
+ * @return float the user's current grade for this quiz.
+ */
+function quiz_get_best_grade($quiz, $userid) {
+    $grade = get_field('quiz_grades', 'grade', 'quiz', $quiz->id, 'userid', $userid);
 
+    // Need to detect errors/no result, without catching 0 scores.
+    if (is_numeric($grade)) {
+        return round($grade, $quiz->decimalpoints);
+    } else {
+        return NULL;
+    }
+}
+
 function quiz_user_outline($course, $user, $mod, $quiz) {
 /// Return a small object with summary information about what a
 /// user has done with a given particular instance of this module
 /// Used for user activity reports.
 /// $return->time = the time they did it
 /// $return->info = a short text description
-    if ($grade = get_record('quiz_grades', 'userid', $user->id, 'quiz', $quiz->id)) {
-
-        $result = new stdClass;
-        if ((float)$grade->grade) {
-            $result->info = get_string('grade').':&nbsp;'.round($grade->grade, $quiz->decimalpoints);
-        }
-        $result->time = $grade->timemodified;
-        return $result;
+    $grade = quiz_get_best_grade($quiz, $user->id);
+    if (is_null($grade)) {
+        return NULL;
     }
-    return NULL;
 
+    $result = new stdClass;
+    $result->info = get_string('grade') . ': ' . $grade . '/' . $quiz->grade;
+    $result->time = get_field('quiz_attempts', 'MAX(timefinish)', 'userid', $user->id, 'quiz', $quiz->id);
+    return $result;
 }
 
-
 function quiz_user_complete($course, $user, $mod, $quiz) {
 /// Print a detailed representation of what a  user has done with
 /// a given particular instance of this module, for user activity reports.
 
     if ($attempts = get_records_select('quiz_attempts', "userid='$user->id' AND quiz='$quiz->id'", 'attempt ASC')) {
-        if ($quiz->grade  and $quiz->sumgrades && $grade = get_record('quiz_grades', 'userid', $user->id, 'quiz', $quiz->id)) {
+        if ($quiz->grade && $quiz->sumgrades && $grade = get_record('quiz_grades', 'userid', $user->id, 'quiz', $quiz->id)) {
             echo get_string('grade').': '.round($grade->grade, $quiz->decimalpoints).'/'.$quiz->grade.'<br />';
         }
         foreach ($attempts as $attempt) {
@@ -221,8 +233,7 @@
     return true;
 }
 
-
-function quiz_cron () {
+function quiz_cron() {
 /// Function to be run periodically according to the moodle cron
 /// This function searches for things that need to be done, such
 /// as sending out mail, toggling flags etc ...
@@ -416,7 +427,6 @@
     return grade_update('mod/quiz', $quiz->course, 'mod', 'quiz', $quiz->id, 0, NULL, array('deleted'=>1));
 }
 
-
 function quiz_get_participants($quizid) {
 /// Returns an array of users who have data in a given quiz
 /// (users with records in quiz_attempts and quiz_question_versions)
@@ -449,8 +459,6 @@
 }
 
 function quiz_refresh_events($courseid = 0) {
-// This horrible function only seems to be called from mod/quiz/db/[dbtype].php.
-
 // This standard function will check all instances of this module
 // and make sure there are up-to-date events created for each of them.
 // If courseid = 0, then every quiz event in the site is checked, else
@@ -574,7 +582,6 @@
          return;
     }
 
-
     $cm_context      = get_context_instance(CONTEXT_MODULE, $cm->id);
     $grader          = has_capability('moodle/grade:viewall', $cm_context);
     $accessallgroups = has_capability('moodle/site:accessallgroups', $cm_context);
@@ -630,7 +637,6 @@
   return;
 }
 
-
 function quiz_print_recent_mod_activity($activity, $courseid, $detail, $modnames) {
     global $CFG;
 
@@ -732,9 +738,11 @@
         $numboundaries = $i;
 
         // Check there is nothing in the remaining unused fields.
-        for ($i = $numboundaries; $i < count($quiz->feedbackboundaries); $i += 1) {
-            if (!empty($quiz->feedbackboundaries[$i]) && trim($quiz->feedbackboundaries[$i]) != '') {
-                return get_string('feedbackerrorjunkinboundary', 'quiz', $i + 1);
+        if (!empty($quiz->feedbackboundaries)) {
+            for ($i = $numboundaries; $i < count($quiz->feedbackboundaries); $i += 1) {
+                if (!empty($quiz->feedbackboundaries[$i]) && trim($quiz->feedbackboundaries[$i]) != '') {
+                    return get_string('feedbackerrorjunkinboundary', 'quiz', $i + 1);
+                }
             }
         }
         for ($i = $numboundaries + 1; $i < count($quiz->feedbacktext); $i += 1) {
@@ -866,12 +874,11 @@
         $feedback->feedbacktext = $quiz->feedbacktext[$i];
         $feedback->mingrade = $quiz->feedbackboundaries[$i];
         $feedback->maxgrade = $quiz->feedbackboundaries[$i - 1];
-       if (!insert_record('quiz_feedback', $feedback, false)) {
+        if (!insert_record('quiz_feedback', $feedback, false)) {
             return "Could not save quiz feedback.";
         }
     }
 
-
     // Update the events relating to this quiz.
     // This is slightly inefficient, deleting the old events and creating new ones. However,
     // there are at most two events, and this keeps the code simpler.
@@ -997,7 +1004,14 @@
  */
 function quiz_reset_userdata($data) {
     global $CFG, $QTYPES;
+    
+    if (empty($QTYPES)) {
+        require_once($CFG->libdir . '/questionlib.php');
+    }
 
+    // TODO: this should use the delete_attempt($attempt->uniqueid) function in questionlib.php
+    // require_once($CFG->libdir.'/questionlib.php');
+
     $componentstr = get_string('modulenameplural', 'quiz');
     $status = array();
 
@@ -1055,14 +1069,14 @@
  * Checks whether the current user is allowed to view a file uploaded in a quiz.
  * Teachers can view any from their courses, students can only view their own.
  *
- * @param int $attemptid int attempt id
+ * @param int $attemptuniqueid int attempt id
  * @param int $questionid int question id
  * @return boolean to indicate access granted or denied
  */
-function quiz_check_file_access($attemptid, $questionid) {
+function quiz_check_file_access($attemptuniqueid, $questionid) {
     global $USER;
 
-    $attempt = get_record("quiz_attempts", 'id', $attemptid);
+    $attempt = get_record("quiz_attempts", 'uniqueid', $attemptuniqueid);
     $quiz = get_record("quiz", 'id', $attempt->quiz);
     $context = get_context_instance(CONTEXT_COURSE, $quiz->course);
 
@@ -1115,7 +1129,7 @@
                 // The $quiz objects returned by get_all_instances_in_course have the necessary $cm 
                 // fields set to make the following call work.
                 $str .= '<div class="info">' . quiz_num_attempt_summary($quiz, $quiz, true) . '</div>';
-            } else if (has_capability('mod/quiz:attempt', $context)){ // Student
+            } else if (has_any_capability(array('mod/quiz:reviewmyattempts', 'mod/quiz:attempt'), $context)) { // Student
             /// For student-like people, tell them how many attempts they have made.
                 if (isset($USER->id) && ($attempts = quiz_get_user_attempts($quiz->id, $USER->id))) {
                     $numattempts = count($attempts);
@@ -1177,6 +1191,25 @@
 }
 
 /**
+ * Returns all other caps used in module
+ */
+function quiz_get_extra_capabilities() {
+    return array(
+        'moodle/site:accessallgroups',
+        'moodle/question:add',
+        'moodle/question:editmine',
+        'moodle/question:editall',
+        'moodle/question:viewmine',
+        'moodle/question:viewall',
+        'moodle/question:usemine',
+        'moodle/question:useall',
+        'moodle/question:movemine',
+        'moodle/question:moveall',
+        'moodle/question:managecategory',
+    );
+}
+
+/**
  * LAMS Function
  * This function clones an existing instance of Moodle quiz
  * replacing the course and the userid
@@ -1334,4 +1367,5 @@
 
 }
 
+
 ?>
Index: temp_moodle_dev/moodle/mod/quiz/locallib.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/quiz/locallib.php	(.../locallib.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/quiz/locallib.php	(.../locallib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -294,24 +294,6 @@
 }
 
 /**
- * Get the best current grade for a particular user in a quiz.
- *
- * @param object $quiz the quiz object.
- * @param integer $userid the id of the user.
- * @return float the user's current grade for this quiz.
- */
-function quiz_get_best_grade($quiz, $userid) {
-    $grade = get_field('quiz_grades', 'grade', 'quiz', $quiz->id, 'userid', $userid);
-
-    // Need to detect errors/no result, without catching 0 scores.
-    if (is_numeric($grade)) {
-        return round($grade, $quiz->decimalpoints);
-    } else {
-        return NULL;
-    }
-}
-
-/**
  * Convert the raw grade stored in $attempt into a grade out of the maximum
  * grade for this quiz.
  *
Index: temp_moodle_dev/moodle/mod/quiz/mod_form.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/quiz/mod_form.php	(.../mod_form.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/quiz/mod_form.php	(.../mod_form.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -98,11 +98,9 @@
 
 //-------------------------------------------------------------------------------
         $mform->addElement('header', 'attemptshdr', get_string('attempts', 'quiz'));
-        $attemptoptions = array();
-        $attemptoptions[0] = get_string("attemptsunlimited", "quiz");
-        $attemptoptions[1] = "1 ".moodle_strtolower(get_string("attempt", "quiz"));
-        for ($i=2;$i<=6;$i++) {
-            $attemptoptions[$i] = "$i ".moodle_strtolower(get_string("attempts", "quiz"));
+        $attemptoptions = array('0' => get_string('unlimited'));
+        for ($i = 1; $i <= 10; $i++) {
+            $attemptoptions[$i] = $i;
         }
         $mform->addElement('select', 'attempts', get_string("attemptsallowed", "quiz"), $attemptoptions);
         $mform->setHelpButton('attempts', array("attempts", get_string("attemptsallowed","quiz"), "quiz"));
@@ -142,8 +140,6 @@
         $mform->setAdvanced('decimalpoints', $CFG->quiz_fix_decimalpoints);
         $mform->setDefault('decimalpoints', $CFG->quiz_decimalpoints);
 
-        $mform->addElement('hidden', 'grade', $CFG->quiz_maximumgrade);
-
 //-------------------------------------------------------------------------------
         $mform->addElement('header', 'reviewoptionshdr', get_string('reviewoptionsheading', 'quiz'));
         $mform->setHelpButton('reviewoptionshdr', array('reviewoptions', get_string('reviewoptionsheading','quiz'), 'quiz'));
@@ -225,11 +221,24 @@
         $mform->addElement('header', 'overallfeedbackhdr', get_string('overallfeedback', 'quiz'));
         $mform->setHelpButton('overallfeedbackhdr', array('overallfeedback', get_string('overallfeedback', 'quiz'), 'quiz'));
 
+        $mform->addElement('hidden', 'grade', $CFG->quiz_maximumgrade);
+        if (empty($this->_cm)) {
+            $needwarning = $CFG->quiz_maximumgrade == 0;
+        } else {
+            $quizgrade = get_field('quiz', 'grade', 'id', $this->_instance);
+            $needwarning = $quizgrade == 0;
+        }
+        if ($needwarning) {
+            $mform->addElement('static', 'nogradewarning', '', get_string('nogradewarning', 'quiz'));
+        }
+
         $mform->addElement('static', 'gradeboundarystatic1', get_string('gradeboundary', 'quiz'), '100%');
 
-        $repeatarray=array();
+        $repeatarray = array();
         $repeatarray[] = &MoodleQuickForm::createElement('text', 'feedbacktext', get_string('feedback', 'quiz'), array('size' => 50));
+        $mform->setType('feedbacktext', PARAM_RAW);
         $repeatarray[] = &MoodleQuickForm::createElement('text', 'feedbackboundaries', get_string('gradeboundary', 'quiz'), array('size' => 10));
+        $mform->setType('feedbackboundaries', PARAM_NOTAGS);
 
         if (!empty($this->_instance)) {
             $this->_feedbacks = get_records('quiz_feedback', 'quizid', $this->_instance, 'mingrade DESC');
@@ -238,20 +247,24 @@
         }
         $numfeedbacks = max(count($this->_feedbacks) * 1.5, 5);
 
-        $mform->setType('feedbacktext', PARAM_RAW);
-        $mform->setType('feedbackboundaries', PARAM_NOTAGS);
-
-        $nextel=$this->repeat_elements($repeatarray, $numfeedbacks-1,
+        $nextel = $this->repeat_elements($repeatarray, $numfeedbacks - 1,
                 array(), 'boundary_repeats', 'boundary_add_fields', 3,
                 get_string('addmoreoverallfeedbacks', 'quiz'), true);
 
-        //put some extra elements in before the button
+        // Put some extra elements in before the button
         $insertEl = &MoodleQuickForm::createElement('text', "feedbacktext[$nextel]", get_string('feedback', 'quiz'), array('size' => 50));
         $mform->insertElementBefore($insertEl, 'boundary_add_fields');
 
         $insertEl = &MoodleQuickForm::createElement('static', 'gradeboundarystatic2', get_string('gradeboundary', 'quiz'), '0%');
         $mform->insertElementBefore($insertEl, 'boundary_add_fields');
 
+        // Add the disabledif rules. We cannot do this using the $repeatoptions parameter to
+        // repeat_elements becuase we don't want to dissable the first feedbacktext.
+        for ($i = 0; $i < $nextel; $i++) {
+            $mform->disabledIf('feedbackboundaries[' . $i . ']', 'grade', 'eq', 0);
+            $mform->disabledIf('feedbacktext[' . ($i + 1) . ']', 'grade', 'eq', 0);
+        }
+
 //-------------------------------------------------------------------------------
         // buttons
         $this->add_action_buttons();
@@ -344,12 +357,14 @@
         $numboundaries = $i;
 
         // Check there is nothing in the remaining unused fields.
-        for ($i = $numboundaries; $i < count($data['feedbackboundaries'] ); $i += 1) {
-            if (!empty($data['feedbackboundaries'][$i] ) && trim($data['feedbackboundaries'][$i] ) != '') {
-                $errors["feedbackboundaries[$i]"] = get_string('feedbackerrorjunkinboundary', 'quiz', $i + 1);
+        if (!empty($data['feedbackboundaries'])) {
+            for ($i = $numboundaries; $i < count($data['feedbackboundaries']); $i += 1) {
+                if (!empty($data['feedbackboundaries'][$i] ) && trim($data['feedbackboundaries'][$i] ) != '') {
+                    $errors["feedbackboundaries[$i]"] = get_string('feedbackerrorjunkinboundary', 'quiz', $i + 1);
+                }
             }
         }
-        for ($i = $numboundaries + 1; $i < count($data['feedbacktext'] ); $i += 1) {
+        for ($i = $numboundaries + 1; $i < count($data['feedbacktext']); $i += 1) {
             if (!empty($data['feedbacktext'][$i] ) && trim($data['feedbacktext'][$i] ) != '') {
                 $errors["feedbacktext[$i]"] = get_string('feedbackerrorjunkinfeedback', 'quiz', $i + 1);
             }
Index: temp_moodle_dev/moodle/mod/quiz/report.php
===================================================================
diff -u -r89659faa9ee2ac5d9c25fa5524f6925d923f00b3 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/quiz/report.php	(.../report.php)	(revision 89659faa9ee2ac5d9c25fa5524f6925d923f00b3)
+++ temp_moodle_dev/moodle/mod/quiz/report.php	(.../report.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -1,13 +1,16 @@
 <?php  // $Id$
 
 // This script uses installed report plugins to print quiz reports
-	
+
     require_once('../../config.php');
     require_once($CFG->dirroot.'/mod/quiz/locallib.php');
     require_once($CFG->dirroot.'/mod/quiz/report/reportlib.php');
+
     $id = optional_param('id',0,PARAM_INT);    // Course Module ID, or
     $q = optional_param('q',0,PARAM_INT);     // quiz ID
+
     $mode = optional_param('mode', 'overview', PARAM_ALPHA);        // Report mode
+
     if ($id) {
         if (! $cm = get_coursemodule_from_id('quiz', $id)) {
             error("There is no coursemodule with id $id");
@@ -32,13 +35,14 @@
             error("The course module for the quiz with id $q is missing");
         }
     }
+
     require_login($course, false, $cm);
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
     require_capability('mod/quiz:viewreports', $context);
 
     // if no questions have been set up yet redirect to edit.php
     if (!$quiz->questions and has_capability('mod/quiz:manage', $context)) {
-    		redirect('edit.php?cmid='.$cm->id);	
+        redirect('edit.php?cmid='.$cm->id);
     }
 
     // Upgrade any attempts that have not yet been upgraded to the
@@ -50,7 +54,9 @@
             quiz_upgrade_states($attempt);
         }
     }
-	add_to_log($course->id, "quiz", "report", 'report.php?id='.$cm->id, "$quiz->id", "$cm->id");
+
+    add_to_log($course->id, "quiz", "report", "report.php?id=$cm->id", "$quiz->id", "$cm->id");
+
 /// Open the selected quiz report and display it
 
     $mode = clean_param($mode, PARAM_SAFEDIR);
@@ -69,6 +75,7 @@
     }
 
 /// Print footer
-		//we pass a new parameter to the function so it won't we printed if is_lams=1
-	    print_footer($course,null, false,$quiz->is_lams);
+
+    print_footer($course,null, false,$quiz->is_lams);
+
 ?>
Index: temp_moodle_dev/moodle/mod/quiz/report/analysis/report.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/quiz/report/analysis/report.php	(.../report.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/quiz/report/analysis/report.php	(.../report.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -526,6 +526,10 @@
                         get_string('facilitytitle','quiz_analysis'), get_string('stddevtitle','quiz_analysis'),
                         get_string('dicsindextitle','quiz_analysis'), get_string('disccoefftitle','quiz_analysis'));
 
+        foreach ($headers as $key => $header) {
+            $headers[$key] = preg_replace('/<br[^>]*>/', ' ', $header);
+        }
+
         $col = 0;
         foreach ($headers as $item) {
             $myxls->write(2,$col,$item,$formatbc);
@@ -605,6 +609,10 @@
                         get_string('facilitytitle','quiz_analysis'), get_string('stddevtitle','quiz_analysis'),
                         get_string('dicsindextitle','quiz_analysis'), get_string('disccoefftitle','quiz_analysis'));
 
+        foreach ($headers as $key => $header) {
+            $headers[$key] = preg_replace('/<br[^>]*>/', ' ', $header);
+        }
+
         $col = 0;
         foreach ($headers as $item) {
             $myxls->write(2,$col,$item,$formatbc);
@@ -639,6 +647,10 @@
                         get_string('facilitytitle','quiz_analysis'), get_string('stddevtitle','quiz_analysis'),
                         get_string('dicsindextitle','quiz_analysis'), get_string('disccoefftitle','quiz_analysis'));
 
+        foreach ($headers as $key => $header) {
+            $headers[$key] = preg_replace('/<br[^>]*>/', ' ', $header);
+        }
+
         $text = implode("\t", $headers)." \n";
 
         $filename .= ".txt";
Index: temp_moodle_dev/moodle/mod/quiz/report/default.php
===================================================================
diff -u -r89659faa9ee2ac5d9c25fa5524f6925d923f00b3 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/quiz/report/default.php	(.../default.php)	(revision 89659faa9ee2ac5d9c25fa5524f6925d923f00b3)
+++ temp_moodle_dev/moodle/mod/quiz/report/default.php	(.../default.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -14,6 +14,7 @@
 ////////////////////////////////////////////////////////////////////
 
 // Included by ../report.php
+
 class quiz_default_report {
 
     function display($cm, $course, $quiz) {     /// This function just displays the report
@@ -27,24 +28,17 @@
         $strquiz  = get_string("modulename", "quiz");
     /// Print the page header
         $navigation = build_navigation('', $cm);
-    //if Lams we include a parameter to the header function so it won't we displayed
-    print_header_simple(format_string($quiz->name), "", $navigation,
-                     '', $meta, true, update_module_button($cm->id, $course->id, $strquiz), navmenu($course, $cm),false,'',false,$cm->is_lams);
-	//old print_header_simple(format_string($quiz->name), "", $navigation,
-                    // '', $meta, true, update_module_button($cm->id, $course->id, $strquiz), navmenu($course, $cm));
-	    
-    /// Print the tabs 
-
+        
+        print_header_simple(format_string($quiz->name), "", $navigation,
+                     '', $meta, true, update_module_button($cm->id, $course->id, $strquiz), navmenu($course, $cm));
+    /// Print the tabs    
         $currenttab = 'reports';
         $mode = $reportmode;
         require($CFG->dirroot . '/mod/quiz/tabs.php');
         $course_context = get_context_instance(CONTEXT_COURSE, $course->id);
         if (has_capability('gradereport/grader:view', $course_context) && has_capability('moodle/grade:viewall', $course_context)) {
-            //If is Lams we don't need to display 'see all course grades' 
-            if($cm->is_lams!=1){
-        	 echo '<div class="allcoursegrades"><a href="' . $CFG->wwwroot . '/grade/report/grader/index.php?id=' . $course->id . '">' 
+            echo '<div class="allcoursegrades"><a href="' . $CFG->wwwroot . '/grade/report/grader/index.php?id=' . $course->id . '">' 
                 . get_string('seeallcoursegrades', 'grades') . '</a></div>';
-            }
         }
 
     }
Index: temp_moodle_dev/moodle/mod/quiz/report/grading/report.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/quiz/report/grading/report.php	(.../report.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/quiz/report/grading/report.php	(.../report.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -27,18 +27,18 @@
     /**
      * Displays the report.
      */
-    function display($quiz, $cm, $course,$lamsupdateurl=null) {
+    function display($quiz, $cm, $course) {
         global $CFG, $QTYPES;
-        
+
         $viewoptions = array('mode'=>'grading', 'q'=>$quiz->id);
 
         if ($questionid = optional_param('questionid', 0, PARAM_INT)){
             $viewoptions += array('questionid'=>$questionid);
         }
-        
+
         // grade question specific parameters
         $gradeungraded  = optional_param('gradeungraded', 0, PARAM_INT);
-        
+
         if ($userid    = optional_param('userid', 0, PARAM_INT)){
             $viewoptions += array('userid'=>$userid);
         }
@@ -54,12 +54,12 @@
         if ($gradenextungraded  = optional_param('gradenextungraded', 0, PARAM_INT)){
             $viewoptions += array('gradenextungraded'=> $gradenextungraded);
         }
-        
-        
+
+
         $this->cm = $cm;
-        
-        $this->print_header_and_tabs($cm, $course, $quiz, $reportmode="grading",$lamsupdateurl);
 
+        $this->print_header_and_tabs($cm, $course, $quiz, $reportmode="grading");
+
         // Check permissions
         $this->context = get_context_instance(CONTEXT_MODULE, $cm->id);
         if (!has_capability('mod/quiz:grade', $this->context)) {
@@ -68,12 +68,13 @@
         }
 
         $gradeableqs = quiz_report_load_questions($quiz);
-        foreach ($gradeableqs as $qid => $questionformenu){
-            if (!$QTYPES[$questionformenu->qtype]->is_manual_graded()){
+        $questionsinuse = implode(',', array_keys($gradeableqs));
+        foreach ($gradeableqs as $qid => $question){
+            if (!$QTYPES[$question->qtype]->is_question_manual_graded($question, $questionsinuse)){
                 unset($gradeableqs[$qid]);
             }
         }
-        
+
         if (empty($gradeableqs)) {
             print_heading(get_string('noessayquestionsfound', 'quiz'));
             return true;
@@ -82,8 +83,8 @@
         }
 
         $currentgroup = groups_get_activity_group($this->cm, true);
-        $this->users     = get_users_by_capability($this->context, 'mod/quiz:attempt','','','','',$currentgroup,'',false);
-        $this->userids   = implode(',', array_keys($this->users));
+        $this->users = get_users_by_capability($this->context, array('mod/quiz:reviewmyattempts', 'mod/quiz:attempt'),'','','','',$currentgroup,'',false);
+        $this->userids = implode(',', array_keys($this->users));
 
 
         if (!empty($questionid)) {
@@ -152,7 +153,7 @@
                 notify(get_string('changessavedwitherrors', 'quiz'), 'notifysuccess');
             }
         }
-        $this->viewurl = new moodle_url($CFG->wwwroot.'/mod/quiz/report.php?lamsUpdateURL='.urlencode($lamsupdateurl), $viewoptions); 
+        $this->viewurl = new moodle_url($CFG->wwwroot.'/mod/quiz/report.php', $viewoptions); 
         /// find out current groups mode
 
         if ($groupmode = groups_get_activity_groupmode($this->cm)) {   // Groups are being used
@@ -216,7 +217,7 @@
 
         $ungraded = $qattempts[$questionid]->totalattempts- $qattempts[$questionid]->gradedattempts;
         if ($gradenextungraded ||$gradeungraded || $gradeall || $userid || $attemptid){
-            $this->print_questions_and_form($quiz, $question, $userid, $attemptid, $gradeungraded, $gradenextungraded, $ungraded,$lamsupdateurl);
+            $this->print_questions_and_form($quiz, $question, $userid, $attemptid, $gradeungraded, $gradenextungraded, $ungraded);
         } else {
             $this->view_question($quiz, $question, $qattempts[$questionid]->totalattempts, $ungraded);
         }
@@ -287,11 +288,11 @@
         // get the attempts and process them
         if ($attempts = get_records_sql($select.$from.$where.$sort,$table->get_page_start(), $table->get_page_size())) {
             // grade all link
-            $links = "<strong><a href=\"report.php?mode=grading&lamsUpdateURL=".urlencode($lamsupdateurl)."&amp;gradeall=1&amp;q=$quiz->id&amp;questionid=$question->id\">".get_string('gradeall', 'quiz_grading', $totalattempts).'</a></strong>';
+            $links = "<strong><a href=\"report.php?mode=grading&amp;gradeall=1&amp;q=$quiz->id&amp;questionid=$question->id\">".get_string('gradeall', 'quiz_grading', $totalattempts).'</a></strong>';
             if ($ungraded>0){
-                $links .="<br /><strong><a href=\"report.php?mode=grading&lamsUpdateURL=".urlencode($lamsupdateurl)."&amp;gradeungraded=1&amp;q=$quiz->id&amp;questionid=$question->id\">".get_string('gradeungraded', 'quiz_grading', $ungraded).'</a></strong>';
+                $links .="<br /><strong><a href=\"report.php?mode=grading&amp;gradeungraded=1&amp;q=$quiz->id&amp;questionid=$question->id\">".get_string('gradeungraded', 'quiz_grading', $ungraded).'</a></strong>';
                 if ($ungraded>QUIZ_REPORT_DEFAULT_GRADING_PAGE_SIZE){
-                    $links .="<br /><strong><a href=\"report.php?mode=grading&lamsUpdateURL=".urlencode($lamsupdateurl)."&amp;gradenextungraded=1&amp;q=$quiz->id&amp;questionid=$question->id\">".get_string('gradenextungraded', 'quiz_grading', QUIZ_REPORT_DEFAULT_GRADING_PAGE_SIZE).'</a></strong>';
+                    $links .="<br /><strong><a href=\"report.php?mode=grading&amp;gradenextungraded=1&amp;q=$quiz->id&amp;questionid=$question->id\">".get_string('gradenextungraded', 'quiz_grading', QUIZ_REPORT_DEFAULT_GRADING_PAGE_SIZE).'</a></strong>';
                 }
             }
             $table->add_data_keyed(array('grade'=> $links));
@@ -308,12 +309,12 @@
                 $gradedstring = question_state_is_graded($attempt)?(' '.get_string('graded','quiz_grading')):'';
 
                 // link for the attempt
-                $attemptlink = "<a {$gradedclass}href=\"report.php?mode=grading&lamsUpdateURL=".urlencode($lamsupdateurl)."&amp;q=$quiz->id&amp;questionid=$question->id&amp;attemptid=$attempt->attemptid\">".
+                $attemptlink = "<a {$gradedclass}href=\"report.php?mode=grading&amp;q=$quiz->id&amp;questionid=$question->id&amp;attemptid=$attempt->attemptid\">".
                         userdate($attempt->timefinish, get_string('strftimedatetime')).
                         $gradedstring.'</a>';
 
                 // grade all attempts for this user
-                $gradelink = "<a href=\"report.php?mode=grading&lamsUpdateURL=".urlencode($lamsupdateurl)."&amp;q=$quiz->id&amp;questionid=$question->id&amp;userid=$attempt->userid\">".
+                $gradelink = "<a href=\"report.php?mode=grading&amp;q=$quiz->id&amp;questionid=$question->id&amp;userid=$attempt->userid\">".
                         get_string('grade').'</a>';
 
                 $table->add_data( array($picture, $userlink, $attemptlink, $gradelink) );
@@ -336,7 +337,7 @@
      * @return void
      * @todo Finish documenting this function
      **/
-    function print_questions_and_form($quiz, $question, $userid, $attemptid, $gradeungraded, $gradenextungraded, $ungraded,$lamsupdateurl=null) {
+    function print_questions_and_form($quiz, $question, $userid, $attemptid, $gradeungraded, $gradenextungraded, $ungraded) {
         global $CFG;
 
         // TODO get the context, and put in proper roles an permissions checks.
@@ -348,7 +349,7 @@
         list($select, $from, $where) = $this->attempts_sql($quiz->id, false, $question->id, $userid, $attemptid, $gradeungraded, $gradenextungraded);
 
         $sort = 'ORDER BY u.firstname, u.lastname, qa.attempt ASC';
-        
+
         if ($gradenextungraded){
             $attempts = get_records_sql($select.$from.$where.$sort, 0, QUIZ_REPORT_DEFAULT_GRADING_PAGE_SIZE);
         } else {
@@ -371,62 +372,67 @@
             } else {
                 print_heading(get_string('gradingall','quiz_grading', count($attempts)), '', 3);
             }
-    
+
             // Display the form with one part for each selected attempt
-    
-            echo '<form method="post" action="report.php?lamsUpdateURL='.urlencode($lamsupdateurl).'">'.
+
+            echo '<form method="post" action="report.php">'.
                 '<input type="hidden" name="mode" value="grading" />'.
                 '<input type="hidden" name="q" value="'.$quiz->id.'" />'.
                 '<input type="hidden" name="sesskey" value="'.sesskey().'" />'.
                 '<input type="hidden" name="questionid" value="'.$question->id.'" />';
-    
+
             foreach ($attempts as $attempt) {
-    
+
                 // Load the state for this attempt (The questions array was created earlier)
                 $states = get_question_states($questions, $quiz, $attempt);
                 // The $states array is indexed by question id but because we are dealing
                 // with only one question there is only one entry in this array
                 $state = &$states[$question->id];
-    
+
                 $options = quiz_get_reviewoptions($quiz, $attempt, $context);
                 unset($options->questioncommentlink);
+                $options->noeditlink = true;
                 $copy = $state->manualcomment;
                 $state->manualcomment = '';
-    
+
                 $options->readonly = 1;
-                
+
                 $gradedclass = question_state_is_graded($state)?' class="highlightgraded" ':'';
                 $gradedstring = question_state_is_graded($state)?(' '.get_string('graded','quiz_grading')):'';
                 $a = new object();
                 $a->fullname = fullname($attempt, true);
                 $a->attempt = $attempt->attempt;
-                
+
                 // print the user name, attempt count, the question, and some more hidden fields
                 echo '<div class="boxaligncenter" width="80%" style="clear:left;padding:15px;">';
                 echo "<span$gradedclass>".get_string('gradingattempt','quiz_grading', $a);
                 echo $gradedstring."</span>";
-    
+
                 print_question($question, $state, '', $quiz, $options);
-    
-                $prefix         = "manualgrades[$attempt->uniqueid]";
-                $grade          = round($state->last_graded->grade, 3);
+
+                $prefix = "manualgrades[$attempt->uniqueid]";
+                if (!question_state_is_graded($state)) {
+                    $grade = '';
+                } else {
+                    $grade = round($state->last_graded->grade, 3);
+                }
                 $state->manualcomment = $copy;
-    
+
                 include($CFG->dirroot . '/question/comment.html');
-    
+
                 echo '</div>';
             }
             echo '<div class="boxaligncenter"><input type="submit" value="'.get_string('savechanges').'" /></div>'.
                 '</form>';
-    
+
             if ($usehtmleditor) {
                 use_html_editor();
             }
         } else {
             notify(get_string('noattemptstoshow', 'quiz'));
         }
     }
-    
+
     function attempts_sql($quizid, $wantstateevent=false, $questionid=0, $userid=0, $attemptid=0, $gradeungraded=0, $gradenextungraded=0){
         global $CFG;
         // this sql joins the attempts table and the user table
@@ -452,7 +458,7 @@
         } else { // get all user attempts
             $where  = 'WHERE u.id IN ('.$this->userids.') ';
         }
-        
+
         $where .= ' AND u.id = qa.userid AND qa.quiz = '.$quizid;
         // ignore previews
         $where .= ' AND preview = 0 ';
Index: temp_moodle_dev/moodle/mod/quiz/report/overview/overviewgraph.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/quiz/report/overview/overviewgraph.php	(.../overviewgraph.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/quiz/report/overview/overviewgraph.php	(.../overviewgraph.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -87,7 +87,7 @@
 $line->y_order = array('allusers');
 if ($groups){
     foreach (array_keys($groups) as $group){
-        $useridingroup = get_users_by_capability($modcontext, 'mod/quiz:attempt','','','','',$group,'',false);
+        $useridingroup = get_users_by_capability($modcontext, array('mod/quiz:reviewmyattempts', 'mod/quiz:attempt'),'','','','',$group,'',false);
         if ($useridingroup){
             $useridingrouplist = join(',',array_keys($useridingroup));
             $groupdata = quiz_report_grade_bands($bandwidth, $bands, $quizid, $useridingrouplist);
Index: temp_moodle_dev/moodle/mod/quiz/report/overview/report.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/quiz/report/overview/report.php	(.../report.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/quiz/report/overview/report.php	(.../report.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -119,7 +119,7 @@
             }
         }
         $nostudents = false;
-        if (!$students = get_users_by_capability($context, 'mod/quiz:attempt','','','','','','',false)){
+        if (!$students = get_users_by_capability($context, array('mod/quiz:reviewmyattempts', 'mod/quiz:attempt'),'','','','','','',false)){
             notify(get_string('nostudentsyet'));
             $nostudents = true;
             $studentslist = '';
@@ -337,8 +337,9 @@
                     "END) AS gradedattempt, ";
             }
             
-            $select .='qa.uniqueid AS attemptuniqueid, qa.id AS attempt, u.id AS userid, u.idnumber, u.firstname, u.lastname, u.picture, '.
-                'qa.sumgrades, qa.timefinish, qa.timestart, qa.timefinish - qa.timestart AS duration ';
+            $select .= 'qa.uniqueid AS attemptuniqueid, qa.id AS attempt, ' . 
+                    'u.id AS userid, u.idnumber, u.firstname, u.lastname, u.picture, u.imagealt, ' .
+                    'qa.sumgrades, qa.timefinish, qa.timestart, qa.timefinish - qa.timestart AS duration ';
     
             // This part is the same for all cases - join users and quiz_attempts tables
             $from = 'FROM '.$CFG->prefix.'user u ';
@@ -459,7 +460,8 @@
                         }
                     }
                     if (in_array('picture', $columns)){
-                        $picture = print_user_picture($attempt->userid, $course->id, $attempt->picture, false, true);
+                        $attempt->id = $attempt->userid;
+                        $picture = print_user_picture($attempt, $course->id, NULL, false, true);
                         $row[] = $picture;
                     }
                     if (!$download){
@@ -602,7 +604,7 @@
                     // Start form
                     echo '<div id="tablecontainer">';
                     echo '<form id="attemptsform" method="post" action="' . $reporturlwithdisplayoptions->out(true) .
-                            '" onsubmit="confirm(\''.$strreallydel.'\');">';
+                            '" onsubmit="return confirm(\''.$strreallydel.'\');">';
                     echo '<div style="display: none;">';
                     echo $reporturlwithdisplayoptions->hidden_params_out();
                     echo '</div>';
@@ -664,7 +666,7 @@
             $mform->set_data($displayoptions +compact('detailedmarks', 'pagesize'));
             $mform->display();
             //should be quicker than a COUNT to test if there is at least one record :
-            if ($showgrades && get_records('quiz_grades', 'quiz', $quiz->id, '', '*', 0, 1)){
+            if ($showgrades && record_exists('quiz_grades', 'quiz', $quiz->id)){
                 $imageurl = $CFG->wwwroot.'/mod/quiz/report/overview/overviewgraph.php?id='.$quiz->id;
                 print_heading(get_string('overviewreportgraph', 'quiz_overview'));
                 echo '<div class="mdl-align"><img src="'.$imageurl.'" alt="'.get_string('overviewreportgraph', 'quiz_overview').'" /></div>';
Index: temp_moodle_dev/moodle/mod/quiz/report/reportlib.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/quiz/report/reportlib.php	(.../reportlib.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/quiz/report/reportlib.php	(.../reportlib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -188,7 +188,7 @@
         {$CFG->prefix}quiz q
     WHERE qg.quiz = q.id AND qg.quiz = $quizid 
             ".($useridlist?"AND qg.userid IN ($useridlist) ":'')."
-    GROUP BY band
+    GROUP BY FLOOR(qg.grade/$bandwidth)
     ORDER BY band";
     if (!$data = get_records_sql_menu($sql)){
         $data= array();
Index: temp_moodle_dev/moodle/mod/quiz/review.php
===================================================================
diff -u -r89659faa9ee2ac5d9c25fa5524f6925d923f00b3 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/quiz/review.php	(.../review.php)	(revision 89659faa9ee2ac5d9c25fa5524f6925d923f00b3)
+++ temp_moodle_dev/moodle/mod/quiz/review.php	(.../review.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -52,6 +52,12 @@
         if ($attempt->userid != $USER->id) {
             error("This is not your attempt!", 'view.php?q=' . $quiz->id);
         }
+        // Check capabilities.
+        if ($options->quizstate == QUIZ_STATE_IMMEDIATELY) {
+            require_capability('mod/quiz:attempt', $context);
+        } else {
+            require_capability('mod/quiz:reviewmyattempts', $context);
+        }
         // Can't review if Student's may review ... Responses is turned on.
         if (!$options->responses) {
             if ($options->quizstate == QUIZ_STATE_IMMEDIATELY) {
@@ -74,8 +80,16 @@
         }
     }
 
-    add_to_log($course->id, "quiz", "review", "review.php?id=$cm->id&amp;attempt=$attempt->id", "$quiz->id", "$cm->id");
+/// Bits needed to print a good URL for this page.
+    $urloptions = '';
+    if ($showall) {
+        $urloptions .= '&amp;showall=true';
+    } else if ($page > 0) {
+        $urloptions .= '&amp;page=' . $page;
+    }
 
+    add_to_log($course->id, 'quiz', 'review', 'review.php?attempt=' . $attempt->id . $urloptions, $quiz->id, $cm->id);
+
 /// Load all the questions and states needed by this script
 
     // load the questions needed by page
@@ -121,10 +135,7 @@
                     : "";
         get_string('reviewofattempt', 'quiz', $attempt->attempt);
         $navigation = build_navigation($strreviewtitle, $cm);
-        //we pass a new parameter to the function so it won't we printed if is_lams=1
-	    print_header_simple(format_string($quiz->name), "", $navigation, "", $headtags, true, $strupdatemodule,'',false,'',false,$quiz->is_lams);
-		//old print_header_simple(format_string($quiz->name), "", $navigation, "", $headtags, true, $strupdatemodule);
-        
+	print_header_simple(format_string($quiz->name), "", $navigation, "", $headtags, true, $strupdatemodule,'',false,'',false,$quiz->is_lams);
     }
     echo '<div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>'; // for overlib
 
@@ -154,9 +165,7 @@
 
     // print javascript button to close the window, if necessary
 	//always include attempt_close_js.php so when we are doing a preview we can access to appearbutton() function in lams
-    //old if (!$isteacher) {
         include('attempt_close_js.php');
-    //old }
 
 /// Work out some time-related things.
     $timelimit = (int)$quiz->timelimit * 60;
@@ -190,12 +199,6 @@
     if (has_capability('mod/quiz:viewreports', $context) &&
             count($attempts = get_records_select('quiz_attempts', "quiz = '$quiz->id' AND userid = '$attempt->userid'", 'attempt ASC')) > 1) {
     /// List of all this user's attempts for people who can see reports.
-        $urloptions = '';
-        if ($showall) {
-            $urloptions .= '&amp;showall=true';
-        } else if ($page > 0) {
-            $urloptions .= '&amp;page=' . $page;
-        }
         $attemptlist = array();
         foreach ($attempts as $at) {
             if ($at->id == $attempt->id) {
@@ -273,6 +276,8 @@
     }
 
 /// Print all the questions
+    $quiz->thispageurl = $CFG->wwwroot . '/mod/quiz/review.php?attempt=' . $attempt->id . $urloptions;
+    $quiz->cmid = $cm->id;
     $number = quiz_first_questionnumber($attempt->layout, $pagelist);
     foreach ($pagequestions as $i) {
         if (!isset($questions[$i])) {
@@ -295,13 +300,11 @@
         print_paging_bar($numpages, $page, 1, 'review.php?attempt='.$attempt->id.'&amp;');
     }
 
-    // print javascript button to close the window always, so we can access to the appearbutton function
-   //m if (!$isteacher) {
+    // print javascript button to close the window, if necessary
+	// print javascript button to close the window always, so we can access to the appearbutton function
         include('attempt_close_js.php');
-    //m}
 
     if (empty($popup)) {
-    		//we pass a new parameter to the function so it won't we printed if is_lams=1
-			print_footer($course,null, false,$quiz->is_lams);
+        print_footer($course,null, false,$quiz->is_lams);
     }
 ?>
Index: temp_moodle_dev/moodle/mod/quiz/reviewquestion.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/quiz/reviewquestion.php	(.../reviewquestion.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/quiz/reviewquestion.php	(.../reviewquestion.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -63,6 +63,7 @@
         if (!$attempt->timefinish) {
             redirect('attempt.php?q='.$quiz->id);
         }
+        require_capability('mod/quiz:reviewmyattempts', $context);
         // If not even responses are to be shown in review then we
         // don't allow any review
         if (!($quiz->review & QUIZ_REVIEW_RESPONSES)) {
@@ -96,6 +97,10 @@
         error("Unable to load questiontype specific question information");
     }
 
+    $baseurl = $CFG->wwwroot . '/mod/quiz/reviewquestion.php?question=' . $question->id . '&amp;number=' . $number . '&amp;attempt=';
+    $quiz->thispageurl = $baseurl . $attempt->id;
+    $quiz->cmid = $cm->id;
+
     $session = get_record('question_sessions', 'attemptid', $attempt->uniqueid, 'questionid', $question->id);
     $state->sumpenalty = $session->sumpenalty;
     $state->manualcomment = $session->manualcomment;
@@ -132,7 +137,7 @@
         foreach ($attempts as $at) {
             $attemptlist .= ($at->id == $attempt->id)
                 ? '<b>'.$at->attempt.'</b>, '
-                : '<a href="reviewquestion.php?attempt='.$at->id.'&amp;question='.$question->id.'&amp;number='.$number.'">'.$at->attempt.'</a>, ';
+                : '<a href="' . $baseurl . $at->id . '">'.$at->attempt.'</a>, ';
         }
         $table->data[] = array(get_string('attempts', 'quiz').':', trim($attemptlist, ' ,'));
     }
Index: temp_moodle_dev/moodle/mod/quiz/tabs.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/quiz/tabs.php	(.../tabs.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/quiz/tabs.php	(.../tabs.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -6,6 +6,7 @@
  * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  * @package quiz
  */
+
 if (empty($quiz)) {
     error('You cannot call this script in that way');
 }
@@ -27,24 +28,25 @@
 $inactive = array();
 $activated = array();
 
-	if (has_capability('mod/quiz:view', $context)) {
-	    	$row[] = new tabobject('info', "$CFG->wwwroot/mod/quiz/view.php?q=$quiz->id", get_string('info', 'quiz')); 
-	}
-	if (has_capability('mod/quiz:viewreports', $context)) {
-	    	$row[] = new tabobject('reports', "$CFG->wwwroot/mod/quiz/report.php?q=$quiz->id", get_string('results', 'quiz'));
-	}
-	if (has_capability('mod/quiz:preview', $context)) {
-	    	$row[] = new tabobject('preview', "$CFG->wwwroot/mod/quiz/attempt.php?q=$quiz->id", get_string('preview', 'quiz'));
-	}
-	if (has_capability('mod/quiz:manage', $context)) {
-	    	$row[] = new tabobject('edit', "$CFG->wwwroot/mod/quiz/edit.php?cmid=$cm->id", get_string('edit'));
-	}
-	
-	if ($currenttab == 'info' && count($row) == 1) {
-	    // Don't show only an info tab (e.g. to students).
-	} else {
-	    $tabs[] = $row;
-	}
+if (has_capability('mod/quiz:view', $context)) {
+    $row[] = new tabobject('info', "$CFG->wwwroot/mod/quiz/view.php?q=$quiz->id", get_string('info', 'quiz'));
+}
+if (has_capability('mod/quiz:viewreports', $context)) {
+    $row[] = new tabobject('reports', "$CFG->wwwroot/mod/quiz/report.php?q=$quiz->id", get_string('results', 'quiz'));
+}
+if (has_capability('mod/quiz:preview', $context)) {
+    $row[] = new tabobject('preview', "$CFG->wwwroot/mod/quiz/attempt.php?q=$quiz->id", get_string('preview', 'quiz'));
+}
+if (has_capability('mod/quiz:manage', $context)) {
+    $row[] = new tabobject('edit', "$CFG->wwwroot/mod/quiz/edit.php?cmid=$cm->id", get_string('edit'));
+}
+
+if ($currenttab == 'info' && count($row) == 1) {
+    // Don't show only an info tab (e.g. to students).
+} else {
+    $tabs[] = $row;
+}
+
 if ($currenttab == 'reports' and isset($mode)) {
     $activated[] = 'reports';
 
@@ -66,9 +68,9 @@
     $row  = array();
     $currenttab = '';
     foreach ($reportlist as $report) {
-        if (!isset($reportrestrictions[$report]) || has_capability($reportrestrictions[$report], $context)) { 
-        	$row[] = new tabobject($report, "$CFG->wwwroot/mod/quiz/report.php?q=$quiz->id&amp;mode=$report",get_string($report, 'quiz_'.$report));	
-            
+        if (!isset($reportrestrictions[$report]) || has_capability($reportrestrictions[$report], $context)) {
+            $row[] = new tabobject($report, "$CFG->wwwroot/mod/quiz/report.php?q=$quiz->id&amp;mode=$report",
+                                    get_string($report, 'quiz_'.$report));
             if ($report == $mode) {
                 $currenttab = $report;
             }
@@ -89,7 +91,7 @@
     if (has_capability('mod/quiz:manage', $context) && $contexts->have_one_edit_tab_cap('editq')) {
         $row[] = new tabobject('editq', "$CFG->wwwroot/mod/quiz/edit.php?".$thispageurl->get_query_string(), $strquiz, $streditingquiz);
     }
-   questionbank_navigation_tabs($row, $contexts, $thispageurl->get_query_string());
+    questionbank_navigation_tabs($row, $contexts, $thispageurl->get_query_string());
     $tabs[] = $row;
 
 }
@@ -100,5 +102,4 @@
 
 print_tabs($tabs, $currenttab, $inactive, $activated);
 
-
 ?>
Index: temp_moodle_dev/moodle/mod/quiz/version.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/quiz/version.php	(.../version.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/quiz/version.php	(.../version.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -5,7 +5,7 @@
 //  This fragment is called by moodle_needs_upgrading() and /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2007101510;   // The (date) version of this module
+$module->version  = 2007101511;   // The (date) version of this module
 $module->requires = 2007101509;   // Requires this Moodle version
 $module->cron     = 0;            // How often should cron check this module (seconds)?
 
Index: temp_moodle_dev/moodle/mod/quiz/view.php
===================================================================
diff -u -rab4e88d19f9535e64732eadadfc109d88757ebdf -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/quiz/view.php	(.../view.php)	(revision ab4e88d19f9535e64732eadadfc109d88757ebdf)
+++ temp_moodle_dev/moodle/mod/quiz/view.php	(.../view.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -1,22 +1,22 @@
 <?php  // $Id$
 
 // This page prints a particular instance of quiz
-	
+
     require_once("../../config.php");
     require_once($CFG->libdir.'/blocklib.php');
     //add  new library so Lams can use their functions
     require_once($CFG->libdir.'/weblib.php');
-    //
     require_once($CFG->libdir.'/gradelib.php');
     require_once($CFG->dirroot.'/mod/quiz/locallib.php');
     require_once($CFG->dirroot.'/mod/quiz/pagelib.php');
+
     $id   = optional_param('id', 0, PARAM_INT); // Course Module ID, or
     $q    = optional_param('q',  0, PARAM_INT);  // quiz ID
     $edit = optional_param('edit', -1, PARAM_BOOL);
     $is_learner  = optional_param('is_learner',0, PARAM_INT);
     $editing  = optional_param('editing', 0, PARAM_INT);
     $returnurl   = optional_param('returnUrl', '', PARAM_TEXT);  // lams url to proceed to next in sequence 
-   
+
     if ($id) {
         if (! $cm = get_coursemodule_from_id('quiz', $id)) {
             error("There is no coursemodule with id $id");
@@ -38,21 +38,23 @@
             error("The course module for the quiz with id $q is missing");
         }
     }
-     //if is inside a Lams sequence we pass the Lams Update URL to be able to come back to Lams later
-   	if($quiz->is_lams==1){
-    		$lamsupdateurl = urlencode(optional_param('lamsUpdateURL', PARAM_TEXT));
-   	}
+
+    //if is inside a Lams sequence we pass the Lams Update URL to be able to come back to Lams later
+   if($quiz->is_lams==1){
+        $lamsupdateurl = urlencode(optional_param('lamsUpdateURL', PARAM_TEXT));
+    }
+
     // Check login and get context.
     require_login($course->id, false, $cm);
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 
     // if no questions have been set up yet redirect to edit.php
     if (!$quiz->questions and has_capability('mod/quiz:manage', $context)) {
-    	if($quiz->is_lams==1){ //if is inside a Lams sequence we pass the Lams Update URL to be able to come back to Lams later
-       		 redirect($CFG->wwwroot . '/mod/quiz/edit.php?cmid=' . $cm->id.'&lamsUpdateURL='.$lamsupdateurl);
-    	}else{
-    		redirect($CFG->wwwroot . '/mod/quiz/edit.php?cmid=' . $cm->id.'');
-    	}
+	if($quiz->is_lams==1){ //if is inside a Lams sequence we pass the Lams Update URL to be able to come back to Lams later
+		redirect($CFG->wwwroot . '/mod/quiz/edit.php?cmid=' . $cm->id.'&lamsUpdateURL='.$lamsupdateurl);
+	}else{
+		redirect($CFG->wwwroot . '/mod/quiz/edit.php?cmid=' . $cm->id.'');
+	}
     }
 
     add_to_log($course->id, "quiz", "view", "view.php?id=$cm->id", $quiz->id, $cm->id);
@@ -66,18 +68,17 @@
     if ($edit != -1 and $PAGE->user_allowed_editing()) {
         $USER->editing = $edit;
     }
-   
 
     //only check pop ups if the user is not a teacher, and popup is set
 
     $bodytags =(has_capability('mod/quiz:attempt', $context) && $quiz->popup)?'onload="popupchecker(\'' . get_string('popupblockerwarning', 'quiz') . '\');"':'';
-  	//if is a Lams sequence activity don't print the top header
+
+    //if is a Lams sequence activity don't print the top header
     if($quiz->is_lams==1){
-  		print_header();
+    		print_header();
     }else{
-    	$PAGE->print_header($course->shortname.': %fullname%','',$bodytags);
+	$PAGE->print_header($course->shortname.': %fullname%','',$bodytags);
     }
-    
 
     echo '<table id="layout-table"><tr>';
 
@@ -96,9 +97,8 @@
 
     // Print heading and tabs (if there is more than one).
     $currenttab = 'info';
-	
     include('tabs.php');
-	
+
     // Print quiz name
 
     print_heading(format_string($quiz->name));
@@ -108,6 +108,7 @@
         // Print quiz description
         if (trim(strip_tags($quiz->intro))) {
             $formatoptions->noclean = true;
+            $formatoptions->para    = false;
             print_box(format_text($quiz->intro, FORMAT_MOODLE, $formatoptions), 'generalbox', 'intro');
         }
 
@@ -120,23 +121,25 @@
         if ($quiz->attempts != 1) {
             echo "<p>".get_string("grademethod", "quiz").": ".quiz_get_grading_option_name($quiz->grademethod)."</p>";
         }
-        //if you are in lams and you've done more than one attempt display lams navigation buttons
-        if($quiz->is_lams==1){
-	         if ($quiz->attempts >= 1) {
-	         	if($editing == 1) {
-	         		//if you are editing, finish editing an go back to lams
-	         		include('showlamsfinish.php');
-	         	}else{
-	         		//if you a learner or a teacher that does the activity as a learner, go to the next activity
-	         		include('showlamsnext.php');
-	         	}
-	         	
-	         }
-        }
 
+	//if you are in lams and you've done more than one attempt display lams navigation buttons
+	if($quiz->is_lams==1){
+		if ($quiz->attempts >= 1) {
+			if($editing == 1) {
+				//if you are editing, finish editing an go back to lams
+				include('showlamsfinish.php');
+			 }else{
+				//if you a learner or a teacher that does the activity as a learner, go to the next activity
+				include('showlamsnext.php');
+			}
+		}
+
+	}
+	
+
         // Print information about timings.
         $timenow = time();
-        $available = ($quiz->timeopen < $timenow and ($timenow < $quiz->timeclose or !$quiz->timeclose));
+        $available = $quiz->timeopen < $timenow && ($timenow < $quiz->timeclose || !$quiz->timeclose);
         if ($available) {
             if ($quiz->timelimit) {
                 echo "<p>".get_string("quiztimelimit","quiz", format_time($quiz->timelimit * 60))."</p>";
@@ -153,14 +156,15 @@
             echo "<p>".get_string("quizclosed", "quiz", userdate($quiz->timeclose))."</p>";
         }
         echo '</div>';
+        $available = $available && has_any_capability(array('mod/quiz:attempt', 'mod/quiz:preview'), $context);
     } else {
         $available = false;
     }
 
     // Show number of attempts summary to those who can view reports.
     if (has_capability('mod/quiz:viewreports', $context)) {
         if ($strattemptnum = quiz_num_attempt_summary($quiz, $cm)) {
-        		echo '<div class="quizattemptcounts"><a href="report.php?mode=overview&amp;id=' .
+            echo '<div class="quizattemptcounts"><a href="report.php?mode=overview&amp;id=' .
                     $cm->id . '">' . $strattemptnum . '</a></div>';
         }
     }
@@ -177,12 +181,11 @@
         finish_page($course,$quiz);//we pass $quiz
     }
 
-    if (!(has_capability('mod/quiz:attempt', $context) || has_capability('mod/quiz:preview', $context))) {
-    	print_box('<p>' . get_string('youneedtoenrol', 'quiz') . '</p><p>' .
+    if (!has_any_capability(array('mod/quiz:reviewmyattempts', 'mod/quiz:attempt', 'mod/quiz:preview'), $context)) {
+        print_box('<p>' . get_string('youneedtoenrol', 'quiz') . '</p><p>' .
                 print_continue($CFG->wwwroot . '/course/view.php?id=' . $course->id, true) .
                 '</p>', 'generalbox', 'notice');
-        finish_page($course,$quiz);// we pass $quiz so later we can check the is_lams variable  
-        // old finish_page($course);
+        finish_page($course,$quiz);//we pass $quiz
     }
 
     // Get this user's attempts.
@@ -217,25 +220,26 @@
 
     // Print table with existing attempts
     if ($attempts) {
-    	if($quiz->is_lams==1){
-	    	if($editing==1){
-	    		include('showlamsfinish.php');
-	        }else{
-	        	 $isteacher = has_capability('mod/quiz:preview', get_context_instance(CONTEXT_MODULE, $cm->id)); // indicates if is a teacher, useful in lams
-	        	 if($isteacher){	
-	        	 	include('showlamsnext.php');
-	        	}
-	        }
-    	}
+	if($quiz->is_lams==1){
+		if($editing==1){
+			 include('showlamsfinish.php');
+		}else{
+			$isteacher = has_capability('mod/quiz:preview', get_context_instance(CONTEXT_MODULE, $cm->id)); // indicates if is a teacher, useful in lams
+			if($isteacher){  
+				include('showlamsnext.php');
+			}
+		}
+	}
+
         print_heading(get_string('summaryofattempts', 'quiz'));
 
-        // Get some strings.
-        $strattempt       = get_string("attempt", "quiz");
-        $strtimetaken     = get_string("timetaken", "quiz");
-        $strtimecompleted = get_string("timecompleted", "quiz");
-        $strgrade         = get_string("grade");
-        $strmarks         = get_string('marks', 'quiz');
-        $strfeedback      = get_string('feedback', 'quiz');
+	// Get some strings.
+	$strattempt       = get_string("attempt", "quiz");
+	$strtimetaken     = get_string("timetaken", "quiz");
+	$strtimecompleted = get_string("timecompleted", "quiz");
+	$strgrade         = get_string("grade");
+	$strmarks         = get_string('marks', 'quiz');
+	$strfeedback      = get_string('feedback', 'quiz');
 
         // Work out which columns we need, taking account what data is available in each attempt.
         list($someoptions, $alloptions) = quiz_get_combined_reviewoptions($quiz, $attempts, $context);
@@ -247,13 +251,13 @@
         $feedbackcolumn = quiz_has_feedback($quiz->id);
         $overallfeedback = $feedbackcolumn && $alloptions->overallfeedback;
 
-        // prepare table header
+        // Prepare table header
         $table->class = 'generaltable quizattemptsummary';
-        $table->head = array($strattempt, $strtimecompleted);
-        $table->align = array("center", "left");
-        $table->size = array("", "");
+	$table->head = array($strattempt, $strtimecompleted);
+	$table->align = array("center", "left");
+	$table->size = array("", "");
         if ($markcolumn) {
-            $table->head[] = "$strmarks / $quiz->sumgrades";
+	    $table->head[] = "$strmarks / $quiz->sumgrades";
             $table->align[] = 'center';
             $table->size[] = '';
         }
@@ -280,10 +284,9 @@
 
             // Add the attempt number, making it a link, if appropriate.
             if ($attempt->preview) {
-            
-                $row[] = make_review_link(get_string('preview', 'quiz'), $quiz, $attempt);
+                $row[] = make_review_link(get_string('preview', 'quiz'), $quiz, $attempt, $context);
             } else {
-                $row[] = make_review_link($attempt->attempt, $quiz, $attempt);
+                $row[] = make_review_link($attempt->attempt, $quiz, $attempt, $context);
             }
 
             // prepare strings for time taken and date completed
@@ -310,7 +313,7 @@
 
             if ($markcolumn && $attempt->timefinish > 0) {
                 if ($attemptoptions->scores) {
-                    $row[] = make_review_link(round($attempt->sumgrades, $quiz->decimalpoints), $quiz, $attempt);
+                    $row[] = make_review_link(round($attempt->sumgrades, $quiz->decimalpoints), $quiz, $attempt, $context);
                 } else {
                     $row[] = '';
                 }
@@ -327,7 +330,7 @@
                         $table->rowclass[$attempt->attempt] = 'bestrow';
                     }
 
-                    $row[] = make_review_link($formattedgrade, $quiz, $attempt);
+                    $row[] = make_review_link($formattedgrade, $quiz, $attempt, $context);
                 } else {
                     $row[] = '';
                 }
@@ -368,12 +371,12 @@
                 $resultinfo .= print_heading(get_string('gradesofar', 'quiz', $a), '', 2, 'main', true);
             } else {
                 $resultinfo .= print_heading(get_string('yourfinalgradeis', 'quiz', "$mygrade / $quiz->grade"), '', 2, 'main', true);
-                if ($mygradeoverridden) {
-                    $resultinfo .= '<p class="overriddennotice">'.get_string('overriddennotice', 'grades').'</p>';
-                }
             }
         }
 
+        if ($mygradeoverridden) {
+            $resultinfo .= '<p class="overriddennotice">'.get_string('overriddennotice', 'grades').'</p>';
+        }
         if ($gradebookfeedback) {
             $resultinfo .= print_heading(get_string('comment', 'quiz'), '', 3, 'main', true);
             $resultinfo .= '<p class="quizteacherfeedback">'.$gradebookfeedback.'</p>';
@@ -391,11 +394,11 @@
     // Print a button to start/continue an attempt, if appropriate.
     if (!$quiz->questions) {
         print_heading(get_string("noquestions", "quiz"));
-        
+
         //print button "next activity" to continue
-        if($quiz->is_lams==1){
-         	include('showlamsnext.php');
-        }
+	if($quiz->is_lams==1){
+		include('showlamsnext.php');
+	}
 
     } else if ($available && $moreattempts) {
         echo "<br />";
@@ -408,21 +411,22 @@
                 $buttontext = get_string('continueattemptquiz', 'quiz');
             }
         } else {
-        	
-        	// print next button to continue next activity in lams
-        	
-        	if($quiz->is_lams==1&&$editing==1){
-        				include('showlamsfinish.php');
-        	}
 
+		// print next button to continue next activity in lams
+		if($quiz->is_lams==1){
+			if($quiz->is_lams==1&&$editing==1){
+				include('showlamsfinish.php');
+			}
+		}
+
             // Work out the appropriate button caption.
             if (has_capability('mod/quiz:preview', $context)) {
-            	//lams: if you are a teacher and are doing a preview of the activity show next activity button 
-	            if($editing==1){
-	        		include('showlamsfinish.php');
-	        	}else{
-	        		include('showlamsnext.php');
-	        	}
+		//lams: if you are a teacher and are doing a preview of the activity show next activity button 
+		if($editing==1){
+			include('showlamsfinish.php');
+		}else{
+			include('showlamsnext.php');
+		}
                 $buttontext = get_string('previewquiznow', 'quiz');
             } else if ($numattempts == 0) {
                 $buttontext = get_string('attemptquiznow', 'quiz');
@@ -469,8 +473,8 @@
                 $strconfirmstartattempt =  '';
             }
             // Determine the URL to use.
-			$attempturl = "attempt.php?id=$cm->id";
-			
+            $attempturl = "attempt.php?id=$cm->id";
+
             // Prepare options depending on whether the quiz should be a popup.
             if (!empty($quiz->popup)) {
                 $window = 'quizpopup';
@@ -489,7 +493,7 @@
                 }
                 echo "window.open('$attempturl','$window','$windowoptions');", '" />';
             } else {
-            	print_single_button("attempt.php", array('id'=>$cm->id), $buttontext, 'get', '', false, '', false, $strconfirmstartattempt);
+                print_single_button("attempt.php", array('id'=>$cm->id), $buttontext, 'get', '', false, '', false, $strconfirmstartattempt);
             }
 
 
@@ -509,25 +513,26 @@
 
     // Should we not be seeing if we need to print right-hand-side blocks?
 
-    finish_page($course,$quiz);// we pass $quiz so later we can check the is_lams variable  
-    // old finish_page($course);
+    finish_page($course,$quiz);// we pass $quiz so later we can check the is_lams variable
 
 // Utility functions =================================================================
 
 function finish_page($course,$quiz=null) { // we pass $quiz so we can check the is_lams variable 
-	//old function finish_page($course) {
     global $THEME;
     print_container_end();
     echo '</td></tr></table>';
-	//we pass a new parameter to the function so it won't we printed if is_lams=1
-	print_footer($course,null, false,$quiz->is_lams);
+    print_footer($course,null, false,$quiz->is_lams);
     exit;
 }
 
 /** Make some text into a link to review the quiz, if that is appropriate. */
-function make_review_link($linktext, $quiz, $attempt) {
-    // If not even responses are to be shown in review then we don't allow any review
-    if (!($quiz->review & QUIZ_REVIEW_RESPONSES)) {
+function make_review_link($linktext, $quiz, $attempt, $context) {
+    static $canreview = null;
+    if (is_null($canreview)) {
+        $canreview = has_capability('mod/quiz:reviewmyattempts', $context);
+    }
+    // If not even responses are to be shown in review then we don't allow any review, or does not have review capability.
+    if (!$canreview || !($quiz->review & QUIZ_REVIEW_RESPONSES)) {
         return $linktext;
     }
 
Index: temp_moodle_dev/moodle/mod/scorm/aicc.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/scorm/aicc.php	(.../aicc.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/scorm/aicc.php	(.../aicc.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -1,16 +1,28 @@
 <?php
+	header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+	header("Cache-Control: no-cache");
+	header("Pragma: no-cache");
+
     require_once('../../config.php');
+    include_once('lib.php');
     require_once('locallib.php');
-    
+    require_once('datamodels/aicclib.php');
+
+	foreach ($_POST as $key => $value)
+		{
+			$tempkey = strtolower($key);
+			$_POST[$tempkey] = $value;
+	}
+
     $command = required_param('command', PARAM_ALPHA);
     $sessionid = required_param('session_id', PARAM_ALPHANUM);
     $aiccdata = optional_param('aicc_data', '', PARAM_RAW);
 
     require_login();
-    
+
     if (!empty($command) && confirm_sesskey($sessionid)) {
         $command = strtolower($command);
-       
+
         if (isset($SESSION->scorm_scoid)) {
             $scoid = $SESSION->scorm_scoid;
         } else {
@@ -46,7 +58,7 @@
                         $status = 'Running';
                     }
                     if ($status != 'Running') {
-                        echo "error = 101\nerror_text = Terminated\n";
+                        echo "error=101\r\nerror_text=Terminated\r\n";
                     } else {
                         if ($usertrack=scorm_get_tracks($scoid,$USER->id,$attempt)) {
                             $userdata = $usertrack;
@@ -61,25 +73,24 @@
                             $userdata->credit = 'credit';
                         } else {
                             $userdata->credit = 'no-credit';
-                        } 
-                
+                        }
+
                         if ($sco = scorm_get_sco($scoid)) {
                             $userdata->course_id = $sco->identifier;
                             $userdata->datafromlms = isset($sco->datafromlms)?$sco->datafromlms:'';
-                            $userdata->masteryscore = isset($sco->masteryscore)?$sco->masteryscore:'';
-                            $userdata->maxtimeallowed = isset($sco->maxtimeallowed)?$sco->maxtimeallowed:'';
-                            $userdata->timelimitaction = isset($sco->timelimitaction)?$sco->timelimitaction:'';
-                               
-                            echo "error = 0\nerror_text = Successful\naicc_data=\n";
-                            echo "[Core]\n";
-                            echo 'Student_ID = '.$userdata->student_id."\n";
-                            echo 'Student_Name = '.$userdata->student_name."\n";
+							$userdata->mastery_score = isset($sco->mastery_score)?$sco->mastery_score:'';
+                            $userdata->max_time_allowed = isset($sco->max_time_allowed)?$sco->max_time_allowed:'';
+                            $userdata->time_limit_action = isset($sco->time_limit_action)?$sco->time_limit_action:'';
+                            echo "error=0\r\nerror_text=Successful\r\naicc_data=";
+                            echo "[Core]\r\n";
+                            echo 'Student_ID='.$userdata->student_id."\r\n";
+                            echo 'Student_Name='.$userdata->student_name."\r\n";
                             if (isset($userdata->{'cmi.core.lesson_location'})) {
-                                echo 'Lesson_Location = '.$userdata->{'cmi.core.lesson_location'}."\n";
+                                echo 'Lesson_Location='.$userdata->{'cmi.core.lesson_location'}."\r\n";
                             } else {
-                                echo 'Lesson_Location = '."\n";
+                                echo 'Lesson_Location='."\r\n";
                             }
-                            echo 'Credit = '.$userdata->credit."\n";
+                            echo 'Credit='.$userdata->credit."\r\n";
                             if (isset($userdata->status)) {
                                 if ($userdata->status == '') {
                                     $userdata->entry = ', ab-initio';
@@ -92,10 +103,10 @@
                                 }
                             }
                             if (isset($userdata->{'cmi.core.lesson_status'})) {
-                                echo 'Lesson_Status = '.$userdata->{'cmi.core.lesson_status'}.$userdata->entry."\n";
+                                echo 'Lesson_Status='.$userdata->{'cmi.core.lesson_status'}.$userdata->entry."\r\n";
                                 $SESSION->scorm_lessonstatus = $userdata->{'cmi.core.lesson_status'};
                             } else {
-                                echo 'Lesson_Status = not attempted'.$userdata->entry."\n";
+                                echo 'Lesson_Status=not attempted'.$userdata->entry."\r\n";
                                 $SESSION->scorm_lessonstatus = 'not attempted';
                             }
                             if (isset($userdata->{'cmi.core.score.raw'})) {
@@ -107,27 +118,27 @@
                                         $min = ', '.$userdata->{'cmi.core.score.min'};
                                     }
                                 }
-                                echo 'Score = '.$userdata->{'cmi.core.score.raw'}.$max.$min."\n";
+                                echo 'Score='.$userdata->{'cmi.core.score.raw'}.$max.$min."\r\n";
                             } else {
-                                echo 'Score = '."\n";
+                                echo 'Score='."\r\n";
                             }
                             if (isset($userdata->{'cmi.core.total_time'})) {
-                                echo 'Time = '.$userdata->{'cmi.core.total_time'}."\n";
+                                echo 'Time='.$userdata->{'cmi.core.total_time'}."\r\n";
                             } else {
-                                echo 'Time = '.'00:00:00'."\n";
+                                echo 'Time='.'00:00:00'."\r\n";
                             }
-                            echo 'Lesson_Mode = '.$userdata->mode."\n";
+                            echo 'Lesson_Mode='.$userdata->mode."\r\n";
                             if (isset($userdata->{'cmi.suspend_data'})) {
-                                echo "[Core_Lesson]\n".$userdata->{'cmi.suspend_data'}."\n";
+                                echo "[Core_Lesson]\r\n".rawurldecode($userdata->{'cmi.suspend_data'})."\r\n";
                             } else {
-                                echo "[Core_Lesson]\n"."\n";
+                                echo "[Core_Lesson]\r\n";
                             }
-                            echo "[Core_Vendor]\n".$userdata->datafromlms."\n";
-                            echo "[Evaluation]\nCourse_ID = {".$userdata->course_id."}\n";
-                            echo "[Student_Data]\n";
-                            echo 'Mastery_Score = '.$userdata->masteryscore."\n";
-                            echo 'Max_Time_Allowed = '.$userdata->maxtimeallowed."\n";
-                            echo 'Time_Limit_Action = '.$userdata->timelimitaction."\n";
+                            echo "[Core_Vendor]\r\n".$userdata->datafromlms."\r\n";
+                            echo "[Evaluation]\r\nCourse_ID = {".$userdata->course_id."}\r\n";
+                            echo "[Student_Data]\r\n";
+							echo 'Mastery_Score='.$userdata->mastery_score."\r\n";
+                            echo 'Max_Time_Allowed='.$userdata->max_time_allowed."\r\n";
+                            echo 'Time_Limit_Action='.$userdata->time_limit_action."\r\n";
                         } else {
                             error('Sco not found');
                         }
@@ -136,7 +147,7 @@
                 case 'putparam':
                     if ($status == 'Running') {
                         if (! $cm = get_coursemodule_from_instance("scorm", $scorm->id, $scorm->course)) {
-                            echo "error = 1\nerror_text = Unknown\n"; // No one must see this error message if not hacked
+                            echo "error=1\r\nerror_text=Unknown\r\n"; // No one must see this error message if not hacked
                         }
                         if (!empty($aiccdata) && has_capability('mod/scorm:savetrack', get_context_instance(CONTEXT_MODULE, $cm->id))) {
                             $initlessonstatus = 'not attempted';
@@ -151,7 +162,7 @@
                             $datamodel['time'] = 'cmi.core.session_time';
                             $datamodel['[core_lesson]'] = 'cmi.suspend_data';
                             $datamodel['[comments]'] = 'cmi.comments';
-                            $datarows = explode("\n",$aiccdata);
+                            $datarows = explode("\r\n",$aiccdata);
                             reset($datarows);
                             while ((list(,$datarow) = each($datarows)) !== false) {
                                 if (($equal = strpos($datarow, '=')) !== false) {
@@ -190,6 +201,7 @@
                                                 $value = '';
                                                 if (count($values) > 1) {
                                                     $value = trim(strtolower($values[1]));
+                                                    $value = $value[0];
                                                     if (isset($exites[$value])) {
                                                         $value = $exites[$value];
                                                     }
@@ -199,6 +211,7 @@
                                                     $id = scorm_insert_track($USER->id, $scorm->id, $sco->id, $attempt, $subelement, $value);
                                                 }
                                                 $value = trim(strtolower($values[0]));
+                                                $value = $value[0];
                                                 if (isset($statuses[$value]) && ($mode == 'normal')) {
                                                     $value = $statuses[$value];
                                                     $id = scorm_insert_track($USER->id, $scorm->id, $sco->id, $attempt, $element, $value);
@@ -217,7 +230,7 @@
                                                          $id = scorm_insert_track($USER->id, $scorm->id, $sco->id, $attempt, $subelement, $value);
                                                      }
                                                  }
-                                              
+
                                                  $value = '';
                                                  if (is_numeric($values[0])) {
                                                      $value = trim($values[0]);
@@ -235,85 +248,92 @@
                                         $element = $datamodel[strtolower(trim($datarow))];
                                         $value = '';
                                         while ((($datarow = current($datarows)) !== false) && (substr($datarow,0,1) != '[')) {
-                                            $value .= $datarow;
+                                            $value .= $datarow."\r\n";
                                             next($datarows);
                                         }
+										$value = rawurlencode(stripslashes($value));
                                         $id = scorm_insert_track($USER->id, $scorm->id, $sco->id, $attempt, $element, $value);
                                     }
-                                }                               
+                                }
                             }
                             if (($mode == 'browse') && ($initlessonstatus == 'not attempted')){
                                 $lessonstatus = 'browsed';
                                 $id = scorm_insert_track($USER->id, $scorm->id, $sco->id, $attempt, 'cmi.core.lesson_status', 'browsed');
                             }
                             if ($mode == 'normal') {
                                 if ($lessonstatus == 'completed') {
-                                    if (!empty($sco->masteryscore) && !empty($score) && ($score >= $sco->masteryscore)) {
-                                        $lessonstatus = 'passed';
-                                    } else {
-                                        $lessonstatus = 'failed';
-                                    }
-                                    $id = scorm_insert_track($USER->id, $scorm->id, $sco->id, $attempt, 'cmi.core.lesson_status', $lessonstatus);
+									if ($sco = scorm_get_sco($scoid)) {
+                                        if (!empty($sco->mastery_score)) {
+                                            if (!empty($score)) {
+                                                if ($score >= $sco->mastery_score) {
+                                                    $lessonstatus = 'passed';
+                                                } else {
+                                                    $lessonstatus = 'failed';
+                                                }
+                                            }
+                                        }
+										$id = scorm_insert_track($USER->id, $scorm->id, $sco->id, $attempt, 'cmi.core.lesson_status', $lessonstatus);
+									}
                                 }
-                            }                  
+                            }
                         }
-                        echo "error = 0\nerror_text = Successful\n";
+                        echo "error=0\r\nerror_text=Successful\r\n";
                     } else if ($status == 'Terminated') {
-                        echo "error = 1\nerror_text = Terminated\n";
+                        echo "error=1\r\nerror_text=Terminated\r\n";
                     } else {
-                        echo "error = 1\nerror_text = Not Initialized\n";
+                        echo "error=1\r\nerror_text=Not Initialized\r\n";
                     }
                 break;
                 case 'putcomments':
                     if ($status == 'Running') {
-                        echo "error = 0\nerror_text = Successful\n";
+                        echo "error=0\r\nerror_text=Successful\r\n";
                     } else if ($status == 'Terminated') {
-                        echo "error = 1\nerror_text = Terminated\n";
+                        echo "error=1\r\nerror_text=Terminated\r\n";
                     } else {
-                        echo "error = 1\nerror_text = Not Initialized\n";
+                        echo "error=1\r\nerror_text=Not Initialized\r\n";
                     }
                 break;
                 case 'putinteractions':
                     if ($status == 'Running') {
-                        echo "error = 0\nerror_text = Successful\n";
+                        echo "error=0\r\nerror_text=Successful\r\n";
                     } else if ($status == 'Terminated') {
-                        echo "error = 1\nerror_text = Terminated\n";
+                        echo "error=1\r\nerror_text=Terminated\r\n";
                     } else {
-                        echo "error = 1\nerror_text = Not Initialized\n";
+                        echo "error=1\r\nerror_text=Not Initialized\r\n";
                     }
                 break;
                 case 'putobjectives':
                     if ($status == 'Running') {
-                        echo "error = 0\nerror_text = Successful\n";
+                        echo "error=0\r\nerror_text=Successful\r\n";
                     } else if ($status == 'Terminated') {
-                        echo "error = 1\nerror_text = Terminated\n";
+                        echo "error=1\r\nerror_text=Terminated\r\n";
                     } else {
-                        echo "error = 1\nerror_text = Not Initialized\n";
+                        echo "error=1\r\nerror_text=Not Initialized\r\n";
                     }
                 break;
                 case 'putpath':
                     if ($status == 'Running') {
-                        echo "error = 0\nerror_text = Successful\n";
+                        echo "error=0\r\nerror_text=Successful\r\n";
                     } else if ($status == 'Terminated') {
-                        echo "error = 1\nerror_text = Terminated\n";
+                        echo "error=1\r\nerror_text=Terminated\r\n";
                     } else {
-                        echo "error = 1\nerror_text = Not Initialized\n";
+                        echo "error=1\r\nerror_text=Not Initialized\r\n";
                     }
                 break;
                 case 'putperformance':
                     if ($status == 'Running') {
-                        echo "error = 0\nerror_text = Successful\n";
+                        echo "error=0\r\nerror_text=Successful\r\n";
                     } else if ($status == 'Terminated') {
-                        echo "error = 1\nerror_text = Terminated\n";
+                        echo "error=1\r\nerror_text=Terminated\r\n";
                     } else {
-                        echo "error = 1\nerror_text = Not Initialized\n";
+                        echo "error=1\r\nerror_text=Not Initialized\r\n";
                     }
                 break;
                 case 'exitau':
                     if ($status == 'Running') {
                         if (isset($SESSION->scorm_session_time) && ($SESSION->scorm_session_time != '')) {
                             if ($track = get_record_select('scorm_scoes_track',"userid='$USER->id' AND scormid='$scorm->id' AND scoid='$sco->id' AND element='cmi.core.total_time'")) {
-                                // Add session_time to total_time
+                               // Add session_time to total_time
                                 $value = scorm_add_time($track->value, $SESSION->scorm_session_time);
                                 $track->value = $value;
                                 $track->timemodified = time();
@@ -331,26 +351,25 @@
                             }
                             scorm_update_grades($scorm, $USER->id);
                         }
-                        
                         $SESSION->scorm_status = 'Terminated';
                         $SESSION->scorm_session_time = '';
-                        echo "error = 0\nerror_text = Successful\n";
+                        echo "error=0\r\nerror_text=Successful\r\n";
                     } else if ($status == 'Terminated') {
-                        echo "error = 1\nerror_text = Terminated\n";
+                        echo "error=1\r\nerror_text=Terminated\r\n";
                     } else {
-                        echo "error = 1\nerror_text = Not Initialized\n";
+                        echo "error=1\r\nerror_text=Not Initialized\r\n";
                     }
                 break;
                 default:
-                    echo "error = 1\nerror_text = Invalid Command\n";
+                    echo "error=1\r\nerror_text=Invalid Command\r\n";
                 break;
             }
         }
     } else {
         if (empty($command)) {
-            echo "error = 1\nerror_text = Invalid Command\n";
+            echo "error=1\r\nerror_text=Invalid Command\r\n";
         } else {
-            echo "error = 3\nerror_text = Invalid Session ID\n";
+            echo "error=3\r\nerror_text=Invalid Session ID\r\n";
         }
     }
 ?>
Index: temp_moodle_dev/moodle/mod/scorm/api.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/scorm/api.php	(.../api.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/scorm/api.php	(.../api.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -2,7 +2,7 @@
 
     require_once("../../config.php");
     require_once('locallib.php');
-    
+
     $id = optional_param('id', '', PARAM_INT);       // Course Module ID, or
     $a = optional_param('a', '', PARAM_INT);         // scorm ID
     $scoid = required_param('scoid', PARAM_INT);     // sco ID
@@ -34,7 +34,7 @@
     }
 
     require_login($course->id, false, $cm);
-    
+
     if ($usertrack = scorm_get_tracks($scoid,$USER->id,$attempt)) {
         if ((isset($usertrack->{'cmi.exit'}) && ($usertrack->{'cmi.exit'} != 'time-out')) || ($scorm->version != "SCORM_1.3")) {
             foreach ($usertrack as $key => $value) {
@@ -58,7 +58,7 @@
         $userdata->credit = 'credit';
     } else {
         $userdata->credit = 'no-credit';
-    }    
+    }
     if ($scodatas = scorm_get_sco($scoid, SCO_DATA)) {
         foreach ($scodatas as $key => $value) {
             $userdata->$key = addslashes_js($value);
@@ -75,6 +75,10 @@
     } else {
         include_once($CFG->dirroot.'/mod/scorm/datamodels/scorm_12.js.php');
     }
+
+    // set the start time of this SCO
+    scorm_insert_track($USER->id,$scorm->id,$scoid,$attempt,'x.start.time',time());
+
 ?>
 
 var errorCode = "0";
Index: temp_moodle_dev/moodle/mod/scorm/backuplib.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/scorm/backuplib.php	(.../backuplib.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/scorm/backuplib.php	(.../backuplib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -220,7 +220,7 @@
                 $status =fwrite ($bf,end_tag('SEQ_RULECOND',5,true));
             }
             //Write end tag
-            $status =fwrite ($bf,end_tag('SEQ_RULECOND',4,true));
+            $status =fwrite ($bf,end_tag('SEQ_RULECONDS',4,true));
         }
         return $status;
     }
Index: temp_moodle_dev/moodle/mod/scorm/datamodel.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/scorm/datamodel.php	(.../datamodel.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/scorm/datamodel.php	(.../datamodel.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -37,7 +37,7 @@
         $result = true;
         $request = null;
         if (has_capability('mod/scorm:savetrack', get_context_instance(CONTEXT_MODULE,$cm->id))) {
-            foreach ($_POST as $element => $value) {
+            foreach (data_submitted() as $element => $value) {
                 $element = str_replace('__','.',$element);
                 if (substr($element,0,3) == 'cmi') {
                     $netelement = preg_replace('/\.N(\d+)\./',"\.\$1\.",$element);
@@ -65,12 +65,12 @@
                         }
                     }
                 }
-//                // Log every datamodel update requested
-//                if (substr($element,0,15) == 'adl.nav.request' || substr($element,0,3) == 'cmi') {
-//                    if (debugging('',DEBUG_DEVELOPER)) {
-//                        add_to_log($course->id, 'scorm', 'trk: '.trim($scorm->name).' at: '.$attempt, 'view.php?id='.$cm->id, "$element => $value", $cm->id);
-//                    }
-//                }
+                // Log every datamodel update requested
+                if (substr($element,0,15) == 'adl.nav.request' || substr($element,0,3) == 'cmi') {
+                    if (debugging('',DEBUG_DEVELOPER)) {
+                        add_to_log($course->id, 'scorm', 'trk: '.trim($scorm->name).' at: '.$attempt, 'view.php?id='.$cm->id, "$element => $value", $cm->id);
+                    }
+                }
             }
         }
         if ($result) {
Index: temp_moodle_dev/moodle/mod/scorm/datamodels/aicc.js.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/scorm/datamodels/aicc.js.php	(.../aicc.js.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/scorm/datamodels/aicc.js.php	(.../aicc.js.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -91,9 +91,9 @@
         'cmi.student_data.tries.n.score.max':{'defaultvalue':'', 'pattern':CMIIndex, 'format':CMIDecimal, 'range':score_range, 'mod':'rw', 'writeerror':'405'},
         'cmi.student_data.tries.n.status':{'pattern':CMIIndex, 'format':CMIStatus2, 'mod':'rw', 'writeerror':'405'},
         'cmi.student_data.tries.n.time':{'pattern':CMIIndex, 'format':CMITime, 'mod':'rw', 'writeerror':'405'},
-        'cmi.student_data.mastery_score':{'defaultvalue':'<?php echo isset($userdata->masteryscore)?$userdata->masteryscore:'' ?>', 'mod':'r', 'writeerror':'403'},
-        'cmi.student_data.max_time_allowed':{'defaultvalue':'<?php echo isset($userdata->maxtimeallowed)?$userdata->maxtimeallowed:'' ?>', 'mod':'r', 'writeerror':'403'},
-        'cmi.student_data.time_limit_action':{'defaultvalue':'<?php echo isset($userdata->timelimitaction)?$userdata->timelimitaction:'' ?>', 'mod':'r', 'writeerror':'403'},
+        'cmi.student_data.mastery_score':{'defaultvalue':'<?php echo isset($userdata->mastery_score)?$userdata->mastery_score:'' ?>', 'mod':'r', 'writeerror':'403'},
+        'cmi.student_data.max_time_allowed':{'defaultvalue':'<?php echo isset($userdata->max_time_allowed)?$userdata->max_time_allowed:'' ?>', 'mod':'r', 'writeerror':'403'},
+        'cmi.student_data.time_limit_action':{'defaultvalue':'<?php echo isset($userdata->time_limit_action)?$userdata->time_limit_action:'' ?>', 'mod':'r', 'writeerror':'403'},
         'cmi.student_data.tries_during_lesson':{'defaultvalue':'<?php echo isset($userdata->{'cmi.student_data.tries_during_lesson'})?$userdata->{'cmi.student_data.tries_during_lesson'}:'' ?>', 'mod':'r', 'writeerror':'402'},
         'cmi.student_preference._children':{'defaultvalue':student_preference_children, 'mod':'r', 'writeerror':'402'},
         'cmi.student_preference.audio':{'defaultvalue':'0', 'format':CMISInteger, 'range':audio_range, 'mod':'rw', 'writeerror':'405'},
Index: temp_moodle_dev/moodle/mod/scorm/datamodels/aicclib.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/scorm/datamodels/aicclib.php	(.../aicclib.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/scorm/datamodels/aicclib.php	(.../aicclib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -200,7 +200,7 @@
     //print_r($courses);
 
     $oldscoes = get_records('scorm_scoes','scorm',$scormid);
-    
+
     $launch = 0;
     if (isset($courses)) {
         foreach ($courses as $course) {
@@ -231,7 +231,7 @@
                     $sco->scorm = $scormid;
                     $sco->organization = $course->id;
                     $sco->title = $element->title;
-                 
+
                     if (!isset($element->parent) || strtolower($element->parent) == 'root') {
                         $sco->parent = '/';
                     } else {
@@ -305,20 +305,20 @@
 
 function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='normal',$attempt='',$play=false) {
     global $CFG;
-    
+
     $strexpand = get_string('expcoll','scorm');
     $modestr = '';
     if ($mode == 'browse') {
         $modestr = '&amp;mode='.$mode;
-    } 
+    }
     $scormpixdir = $CFG->modpixpath.'/scorm/pix';
-    
+
     $result = new stdClass();
     $result->toc = "<ul id='s0' class='$liststyle'>\n";
     $tocmenus = array();
     $result->prerequisites = true;
     $incomplete = false;
-    
+
     //
     // Get the current organization infos
     //
@@ -338,7 +338,7 @@
     if ($scoes = scorm_get_scoes($scorm->id, $currentorg)){
         //
         // Retrieve user tracking data for each learning object
-        // 
+        //
         $usertracks = array();
         foreach ($scoes as $sco) {
             if (!empty($sco->launch)) {
@@ -357,7 +357,7 @@
         $nextid = 0;
         $findnext = false;
         $parents[$level]='/';
-        
+
         foreach ($scoes as $pos => $sco) {
             $isvisible = false;
             $sco->title = stripslashes($sco->title);
@@ -411,7 +411,7 @@
                 }
                 $result->toc .= '<a href="javascript:expandCollide(\'img'.$sublist.'\',\'s'.$sublist.'\','.$nextsco->id.');"><img id="img'.$sublist.'" src="'.$scormpixdir.'/'.$icon.'.gif" alt="'.$strexpand.'" title="'.$strexpand.'"/></a>';
             } else if ($isvisible) {
-                $result->toc .= '<img src="'.$scormpixdir.'/spacer.gif" />';
+                $result->toc .= '<img src="'.$scormpixdir.'/spacer.gif" alt="" />';
             }
             if (empty($sco->title)) {
                 $sco->title = $sco->identifier;
@@ -432,7 +432,7 @@
                         } else {
                             $statusicon = '<img src="'.$scormpixdir.'/assetc.gif" alt="'.get_string('assetlaunched','scorm').'" title="'.get_string('assetlaunched','scorm').'" />';
                         }
-                    
+
                         if (($usertrack->status == 'notattempted') || ($usertrack->status == 'incomplete') || ($usertrack->status == 'browsed')) {
                             $incomplete = true;
                             if ($play && empty($scoid)) {
@@ -464,7 +464,7 @@
                         $shownext = isset($sco->next) ? $sco->next : 0;
                         $showprev = isset($sco->previous) ? $sco->previous : 0;
                     }
-                
+
                     if (($nextid == 0) && (scorm_count_launchable($scorm->id,$currentorg) > 1) && ($nextsco!==false) && (!$findnext)) {
                         if (!empty($sco->launch)) {
                             $previd = $sco->id;
@@ -496,7 +496,7 @@
         for ($i=0;$i<$level;$i++) {
             $result->toc .= "\t\t</ul></li>\n";
         }
-        
+
         if ($play) {
             $sco = scorm_get_sco($scoid);
             $sco->previd = $previd;
@@ -529,7 +529,7 @@
           //]]>
           </script>'."\n";
     }
-    
+
     $url = $CFG->wwwroot.'/mod/scorm/player.php?a='.$scorm->id.'&amp;currentorg='.$currentorg.$modestr.'&amp;scoid=';
     $result->tocmenu = popup_form($url,$tocmenus, "tocmenu", $sco->id, '', '', '', true);
 
Index: temp_moodle_dev/moodle/mod/scorm/datamodels/debug.js.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/scorm/datamodels/debug.js.php	(.../debug.js.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/scorm/datamodels/debug.js.php	(.../debug.js.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -40,7 +40,7 @@
     new cookie("SCORMLoggingActive", flag, 365, "/").set();
 }
 
-// toggle the logging 
+// toggle the logging
 function toggleLog () {
     if (getLoggingActive() == "A") {
         AppendToLog("Moodle Logging Deactivated", 0);
@@ -59,12 +59,12 @@
 var logRow = 0;
 var logPopUpWindow = "N";
 var debugSCORMVersion = '<?php echo $scorm->version; ?>';
-<?php 
-   $LMS_prefix = $scorm->version == 'scorm_12' ? 'LMS' : '';
-   $LMS_api = $scorm->version == 'scorm_12' ? 'API' : 'API_1484_11';
-   
+<?php
+   $LMS_prefix = ($scorm->version == 'scorm_12' || $scorm->version == 'SCORM_1.2' || empty($scorm->version)) ? 'LMS' : '';
+   $LMS_api = ($scorm->version == 'scorm_12' || $scorm->version == 'SCORM_1.2' || empty($scorm->version)) ? 'API' : 'API_1484_11';
+
    $LMS_elements = array();
-   if ($scorm->version == 'scorm_12') {
+   if ($scorm->version == 'scorm_12' || $scorm->version == 'SCORM_1.2' || empty($scorm->version)) {
        $LMS_elements = array(   'cmi.core._children',
                                 'cmi.core.student_id',
                                 'cmi.core.student_name',
@@ -253,7 +253,7 @@
         + '      alert("Unable to locate the LMS\'s API Implementation.\\nLMSInitialize was not successful.");  \n'
         + '      return "false";  \n'
         + '   }  \n'
-        + '   var result = api.<?echo $LMS_prefix; ?>Initialize("");  \n'
+        + '   var result = api.<?php echo $LMS_prefix; ?>Initialize("");  \n'
         + '   if (result.toString() != "true") {  \n'
         + '      var err = ErrorHandler();  \n'
         + '   }  \n'
@@ -268,7 +268,7 @@
         + '      return "false";  \n'
         + '   } else {  \n'
         + '      // call the LMSFinish function that should be implemented by the API  \n'
-        + '      var result = api.<?echo $LMS_prefix; ?>Finish("");  \n'
+        + '      var result = api.<?php echo $LMS_prefix; ?>Finish("");  \n'
         + '      if (result.toString() != "true") {  \n'
         + '         var err = ErrorHandler();  \n'
         + '      }  \n'
@@ -299,12 +299,12 @@
         + '      alert("Unable to locate the LMS\'s API Implementation.\\nLMSGetValue was not successful.");  \n'
         + '      return "";  \n'
         + '   } else {  \n'
-        + '      var value = api.<?echo $LMS_prefix; ?>GetValue(name);  \n'
-        + '      var errCode = api.<?echo $LMS_prefix; ?>GetLastError().toString();  \n'
+        + '      var value = api.<?php echo $LMS_prefix; ?>GetValue(name);  \n'
+        + '      var errCode = api.<?php echo $LMS_prefix; ?>GetLastError().toString();  \n'
         + '      if (errCode != _NoError) {  \n'
         + '         // an error was encountered so display the error description  \n'
-        + '         var errDescription = api.<?echo $LMS_prefix; ?>GetErrorString(errCode);  \n'
-        + '         alert("<?echo $LMS_prefix; ?>GetValue("+name+") failed. \\n"+ errDescription);  \n'
+        + '         var errDescription = api.<?php echo $LMS_prefix; ?>GetErrorString(errCode);  \n'
+        + '         alert("<?php echo $LMS_prefix; ?>GetValue("+name+") failed. \\n"+ errDescription);  \n'
         + '         return "";  \n'
         + '      } else {  \n'
         + '         return value.toString();  \n'
@@ -319,7 +319,7 @@
         + '      alert("Unable to locate the LMS\'s API Implementation.\\nLMSSetValue was not successful.");  \n'
         + '      return;  \n'
         + '   } else {  \n'
-        + '      var result = api.<?echo $LMS_prefix; ?>SetValue(name, value);  \n'
+        + '      var result = api.<?php echo $LMS_prefix; ?>SetValue(name, value);  \n'
         + '      if (result.toString() != "true") {  \n'
         + '         var err = ErrorHandler();  \n'
         + '      }  \n'
@@ -334,7 +334,7 @@
         + '      alert("Unable to locate the LMS\'s API Implementation.\\nLMSCommit was not successful.");  \n'
         + '      return "false";  \n'
         + '   } else {  \n'
-        + '      var result = api.<?echo $LMS_prefix; ?>Commit("");  \n'
+        + '      var result = api.<?php echo $LMS_prefix; ?>Commit("");  \n'
         + '      if (result != "true") {  \n'
         + '         var err = ErrorHandler();  \n'
         + '      }  \n'
@@ -349,23 +349,23 @@
         + '      //since we can\'t get the error code from the LMS, return a general error  \n'
         + '      return _GeneralError;  \n'
         + '   }  \n'
-        + '   return api.<?echo $LMS_prefix; ?>GetLastError().toString();  \n'
+        + '   return api.<?php echo $LMS_prefix; ?>GetLastError().toString();  \n'
         + '}  \n'
         + '  \n'
         + 'function doLMSGetErrorString(errorCode) {  \n'
         + '   var api = getAPIHandle();  \n'
         + '   if (api == null) {  \n'
         + '      alert("Unable to locate the LMS\'s API Implementation.\\nLMSGetErrorString was not successful.");  \n'
         + '   }  \n'
-        + '   return api.<?echo $LMS_prefix; ?>GetErrorString(errorCode).toString();  \n'
+        + '   return api.<?php echo $LMS_prefix; ?>GetErrorString(errorCode).toString();  \n'
         + '}  \n'
         + '  \n'
         + 'function doLMSGetDiagnostic(errorCode) {  \n'
         + '   var api = getAPIHandle();  \n'
         + '   if (api == null) {  \n'
         + '      alert("Unable to locate the LMS\'s API Implementation.\\nLMSGetDiagnostic was not successful.");  \n'
         + '   }  \n'
-        + '   return api.<?echo $LMS_prefix; ?>GetDiagnostic(errorCode).toString();  \n'
+        + '   return api.<?php echo $LMS_prefix; ?>GetDiagnostic(errorCode).toString();  \n'
         + '}  \n'
         + '  \n'
         + 'function LMSIsInitialized() {  \n'
@@ -377,8 +377,8 @@
         + '      alert("Unable to locate the LMS\'s API Implementation.\\nLMSIsInitialized() failed.");  \n'
         + '      return false;  \n'
         + '   } else {  \n'
-        + '      var value = api.<?echo $LMS_prefix; ?>GetValue("cmi.core.student_name");  \n'
-        + '      var errCode = api.<?echo $LMS_prefix; ?>GetLastError().toString();  \n'
+        + '      var value = api.<?php echo $LMS_prefix; ?>GetValue("cmi.core.student_name");  \n'
+        + '      var errCode = api.<?php echo $LMS_prefix; ?>GetLastError().toString();  \n'
         + '      if (errCode == _NotInitialized) {  \n'
         + '         return false;  \n'
         + '      } else {  \n'
@@ -394,13 +394,13 @@
         + '      return;  \n'
         + '   }  \n'
         + '   // check for errors caused by or from the LMS  \n'
-        + '   var errCode = api.<?echo $LMS_prefix; ?>GetLastError().toString();  \n'
+        + '   var errCode = api.<?php echo $LMS_prefix; ?>GetLastError().toString();  \n'
         + '   if (errCode != _NoError) {  \n'
         + '      // an error was encountered so display the error description  \n'
-        + '      var errDescription = api.<?echo $LMS_prefix; ?>GetErrorString(errCode);  \n'
+        + '      var errDescription = api.<?php echo $LMS_prefix; ?>GetErrorString(errCode);  \n'
         + '      if (_Debug == true) {  \n'
         + '         errDescription += "\\n";  \n'
-        + '         errDescription += api.<?echo $LMS_prefix; ?>GetDiagnostic(null);  \n'
+        + '         errDescription += api.<?php echo $LMS_prefix; ?>GetDiagnostic(null);  \n'
         + '         // by passing null to LMSGetDiagnostic, we get any available diagnostics  \n'
         + '         // on the previous error.  \n'
         + '      }  \n'
@@ -417,7 +417,7 @@
         + '}  \n'
         + '  \n'
         + 'function findAPI(win) {  \n'
-        + '   while ((win.<?echo $LMS_api; ?> == null) && (win.parent != null) && (win.parent != win)) {  \n'
+        + '   while ((win.<?php echo $LMS_api; ?> == null) && (win.parent != null) && (win.parent != win)) {  \n'
         + '      findAPITries++;  \n'
         + '      // Note: 7 is an arbitrary number, but should be more than sufficient  \n'
         + '      if (findAPITries > 7) {  \n'
@@ -426,7 +426,7 @@
         + '      }  \n'
         + '      win = win.parent;  \n'
         + '   }  \n'
-        + '   return win.<?echo $LMS_api; ?>;  \n'
+        + '   return win.<?php echo $LMS_api; ?>;  \n'
         + '}  \n'
         + '  \n'
         + 'function getAPI() {  \n'
@@ -444,11 +444,11 @@
         + '      var result = doLMSInitialize();  \n'
         + '      var msg;  \n'
         + '      if(result == "true") {  \n'
-        + '         msg = "<?echo $LMS_prefix; ?>Initialize Successful!";  \n'
+        + '         msg = "<?php echo $LMS_prefix; ?>Initialize Successful!";  \n'
         + '      } else {  \n'
         + '         var err = doLMSGetLastError();  \n'
         + '         var errString = doLMSGetErrorString(err);  \n'
-        + '         msg = "<?echo $LMS_prefix; ?>Initialize Failed! Error Code: "+err;  \n'
+        + '         msg = "<?php echo $LMS_prefix; ?>Initialize Failed! Error Code: "+err;  \n'
         + '         msg += " Error Description: " + errString;  \n'
         + '      }  \n'
         + '      document.initForm.msgtxt.value= msg;  \n'
@@ -458,11 +458,11 @@
         + '      var result = doLMSCommit();  \n'
         + '      var msg;  \n'
         + '      if(result == "true") {  \n'
-        + '         msg = "<?echo $LMS_prefix; ?>Commit was Successful!";  \n'
+        + '         msg = "<?php echo $LMS_prefix; ?>Commit was Successful!";  \n'
         + '      } else {  \n'
         + '         var err = doLMSGetLastError();  \n'
         + '         var errString = doLMSGetErrorString(err);  \n'
-        + '         var msg = "<?echo $LMS_prefix; ?>Commit Failed! Error Code: "+err;  \n'
+        + '         var msg = "<?php echo $LMS_prefix; ?>Commit Failed! Error Code: "+err;  \n'
         + '         msg += " Error Description: " + errString;  \n'
         + '      }  \n'
         + '      document.otherForm.msgtxt.value = msg; \n'
@@ -509,7 +509,7 @@
         + '     var result = doLMSGetValue(value);  \n'
         + '     var err = doLMSGetLastError();  \n'
         + '     var errString = doLMSGetErrorString(err);  \n'
-        + '     msg = "<?echo $LMS_prefix; ?>GetValue Returned: " + result;  \n'
+        + '     msg = "<?php echo $LMS_prefix; ?>GetValue Returned: " + result;  \n'
         + '     msg += "\\nError Code: " + err;  \n'
         + '     msg += "\\nError Description: " + errString;  \n'
         + '     document.elemForm.msgtxt.value = msg;  \n'
@@ -524,14 +524,14 @@
         + '     var api = getAPIHandle();  \n'
         + '     if (api == null) {  \n'
         + '        alert("Unable to locate the LMS\'s API Implementation.\\n"+  \n'
-        + '              "<?echo $LMS_prefix; ?>SetValue was not successful.");  \n'
+        + '              "<?php echo $LMS_prefix; ?>SetValue was not successful.");  \n'
         + '        return false;  \n'
         + '     }  \n'
         + '     // Try to set the element  \n'
-        + '     var result = api.<?echo $LMS_prefix; ?>SetValue( item, setValue );  \n'
+        + '     var result = api.<?php echo $LMS_prefix; ?>SetValue( item, setValue );  \n'
         + '     var err = doLMSGetLastError();  \n'
         + '     var errString = doLMSGetErrorString(err);  \n'
-        + '     msg = "<?echo $LMS_prefix; ?>SetValue returned: " + result;  \n'
+        + '     msg = "<?php echo $LMS_prefix; ?>SetValue returned: " + result;  \n'
         + '     msg += "\\nError Code: " + err;  \n'
         + '     msg += "\\nError Description: " + errString;  \n'
         + '     document.elemForm.msgtxt.value = msg;  \n'
@@ -540,19 +540,19 @@
         + '  \n'
         + '   function tryLMSGetLastError() {  \n'
         + '      var err = doLMSGetLastError();  \n'
-        + '      document.otherForm.msgtxt.value = "<?echo $LMS_prefix; ?>GetLastError returned Error Code:  " + err;  \n'
+        + '      document.otherForm.msgtxt.value = "<?php echo $LMS_prefix; ?>GetLastError returned Error Code:  " + err;  \n'
         + '   }  \n'
         + '  \n'
         + '   function tryLMSGetErrorString() {  \n'
         + '      var err = doLMSGetLastError();  \n'
         + '      var errString = doLMSGetErrorString(err);  \n'
-        + '      document.otherForm.msgtxt.value = "<?echo $LMS_prefix; ?>GetErrorString returned:  " + errString;  \n'
+        + '      document.otherForm.msgtxt.value = "<?php echo $LMS_prefix; ?>GetErrorString returned:  " + errString;  \n'
         + '   }  \n'
         + '  \n'
         + '   function tryLMSGetDiagnostic() {  \n'
         + '      var err = doLMSGetLastError();  \n'
         + '      var diagnostic = doLMSGetDiagnostic(err);  \n'
-        + '      document.otherForm.msgtxt.value = "<?echo $LMS_prefix; ?>GetDiagnostic returned:  " + diagnostic;  \n'
+        + '      document.otherForm.msgtxt.value = "<?php echo $LMS_prefix; ?>GetDiagnostic returned:  " + diagnostic;  \n'
         + '   } \n'
         + ' \n'
         + '</script>\n'
@@ -565,7 +565,7 @@
         + '   <table width="100%" border="0">'
         + '      <tr>'
         + '         <td>'
-        + '            <input type = "button" value = "Call <?echo $LMS_prefix; ?>Initialize()" onclick = "tryLMSInitialize();" id="Initialize" name="Initialize" />'
+        + '            <input type = "button" value = "Call <?php echo $LMS_prefix; ?>Initialize()" onclick = "tryLMSInitialize();" id="Initialize" name="Initialize" />'
         + '         </td>'
         + '         <td>'
         + '            <label>Result: </label><input type="text" name="msgtxt" id="msgtxt" size="80" readonly value="NotCalled" />'
@@ -588,10 +588,10 @@
         + '            </select>'
         + '            <input type="text" name="API_ELEMENT" id="API_ELEMENT" size="40"><br />'
         + '            <br />'
-        + '            <label><b>Select API Function to Call</b></label> &nbsp;&nbsp;&nbsp;&nbsp; <input type = "button" value = "<?echo $LMS_prefix; ?>GetValue()"'
+        + '            <label><b>Select API Function to Call</b></label> &nbsp;&nbsp;&nbsp;&nbsp; <input type = "button" value = "<?php echo $LMS_prefix; ?>GetValue()"'
         + '                         onclick = "tryLMSGetValue();" id="lmsGetButton"'
         + '                         name="lmsGetButton">&nbsp;&nbsp;-- OR --&nbsp;&nbsp;'
-        + '            <input type="button" value="<?echo $LMS_prefix; ?>SetValue()"'
+        + '            <input type="button" value="<?php echo $LMS_prefix; ?>SetValue()"'
         + '                          onclick="tryLMSSetValue();" id="lmsSetButton"'
         + '                          name="lmsSetButton">'
         + '            <label><b>&nbsp; value to Set: </b></label>&nbsp; <input type="text" name="SET_VAL" id="SET_VAL" size="25">'
Index: temp_moodle_dev/moodle/mod/scorm/datamodels/scorm_12.js.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/scorm/datamodels/scorm_12.js.php	(.../scorm_12.js.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/scorm/datamodels/scorm_12.js.php	(.../scorm_12.js.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -540,7 +540,7 @@
                         if (eval('datamodel["'+elementmodel+'"].mod') != 'r') {
                             elementstring = '&'+underscore(element)+'='+encodeURIComponent(data[property]);
                             if ((typeof eval('datamodel["'+elementmodel+'"].defaultvalue')) != "undefined") {
-                                if (eval('datamodel["'+elementmodel+'"].defaultvalue') != data[property]) {
+                                if (eval('datamodel["'+elementmodel+'"].defaultvalue') != data[property] || eval('typeof(datamodel["'+elementmodel+'"].defaultvalue)') != typeof(data[property])) {
                                     datastring += elementstring;
                                 }
                             } else {
Index: temp_moodle_dev/moodle/mod/scorm/datamodels/scorm_12lib.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/scorm/datamodels/scorm_12lib.php	(.../scorm_12lib.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/scorm/datamodels/scorm_12lib.php	(.../scorm_12lib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -10,8 +10,8 @@
 * @return boolean
 */
 function scorm_eval_prerequisites($prerequisites, $usertracks) {
-    
-    // this is really a little language parser - AICC_SCRIPT is the reference 
+
+    // this is really a little language parser - AICC_SCRIPT is the reference
     // see 2.3.2.5.1. Sequencing/Navigation Today  - from the SCORM 1.2 spec
     $element = '';
     $stack = array();
@@ -29,7 +29,7 @@
                 'b' => 'browsed',
                 'n' => 'notattempted'
                 );
-    $i=0;  
+    $i=0;
 
     // expand the amp entities
     $prerequisites = preg_replace('/&amp;/', '&', $prerequisites);
@@ -51,7 +51,7 @@
         if (!preg_match('/^(&&|\|\||\(|\))$/', $element)) {
             // create each individual expression
             // search for ~ = <> X*{}
-    
+
             // sets like 3*{S34, S36, S37, S39}
             if (preg_match('/^(\d+)\*\{(.+)\}$/', $element, $matches)) {
                 $repeat = $matches[1];
@@ -68,11 +68,11 @@
                 } else {
                     $element = 'false';
                 }
-    
+
             // ~ Not
             } else if ($element == '~') {
                 $element = '!';
-    
+
             // = | <>
             } else if (preg_match('/^(.+)(\=|\<\>)(.+)$/', $element, $matches)) {
                 $element = trim($matches[1]);
@@ -90,7 +90,7 @@
                 } else {
                   $element = 'false';
                 }
-    
+
             // everything else must be an element defined like S45 ...
             } else {
                 if (isset($usertracks[$element]) &&
@@ -100,7 +100,7 @@
                     $element = 'false';
                 }
             }
-    
+
         }
         $stack []= ' '.$element.' ';
     }
@@ -109,20 +109,20 @@
 
 function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='normal',$attempt='',$play=false) {
     global $CFG;
-    
+
     $strexpand = get_string('expcoll','scorm');
     $modestr = '';
     if ($mode == 'browse') {
         $modestr = '&amp;mode='.$mode;
-    } 
+    }
     $scormpixdir = $CFG->modpixpath.'/scorm/pix';
-    
+
     $result = new stdClass();
     $result->toc = "<ul id='s0' class='$liststyle'>\n";
     $tocmenus = array();
     $result->prerequisites = true;
     $incomplete = false;
-    
+
     //
     // Get the current organization infos
     //
@@ -161,7 +161,7 @@
         $nextid = 0;
         $findnext = false;
         $parents[$level]='/';
-        
+
         foreach ($scoes as $pos => $sco) {
             $isvisible = false;
             $sco->title = stripslashes($sco->title);
@@ -215,7 +215,7 @@
                 }
                $result->toc .= '<a href="javascript:expandCollide(\'img'.$sublist.'\',\'s'.$sublist.'\','.$nextsco->id.');"><img id="img'.$sublist.'" src="'.$scormpixdir.'/'.$icon.'.gif" alt="'.$strexpand.'" title="'.$strexpand.'"/></a>';
             } else if ($isvisible) {
-                $result->toc .= '<img src="'.$scormpixdir.'/spacer.gif" />';
+                $result->toc .= '<img src="'.$scormpixdir.'/spacer.gif" alt=""/>';
             }
             if (empty($sco->title)) {
                 $sco->title = $sco->identifier;
@@ -236,7 +236,7 @@
                         } else {
                             $statusicon = '<img src="'.$scormpixdir.'/assetc.gif" alt="'.get_string('assetlaunched','scorm').'" title="'.get_string('assetlaunched','scorm').'" />';
                         }
-                    
+
                         if (($usertrack->status == 'notattempted') || ($usertrack->status == 'incomplete') || ($usertrack->status == 'browsed')) {
                             $incomplete = true;
                             if ($play && empty($scoid)) {
@@ -270,7 +270,7 @@
                         $shownext = isset($sco->next) ? $sco->next : 0;
                         $showprev = isset($sco->previous) ? $sco->previous : 0;
                     }
-                
+
                     if (($nextid == 0) && (scorm_count_launchable($scorm->id,$currentorg) > 1) && ($nextsco!==false) && (!$findnext)) {
                         if (!empty($sco->launch)) {
                             $previd = $sco->id;
@@ -302,7 +302,7 @@
         for ($i=0;$i<$level;$i++) {
             $result->toc .= "\t\t</ul></li>\n";
         }
-        
+
         if ($play) {
             // it is possible that scoid is still not set, in this case we dont want an empty object
             if ($scoid) {
@@ -338,7 +338,7 @@
           //]]>
           </script>'."\n";
     }
-    
+
     $url = $CFG->wwwroot.'/mod/scorm/player.php?a='.$scorm->id.'&amp;currentorg='.$currentorg.$modestr.'&amp;scoid=';
     $result->tocmenu = popup_form($url,$tocmenus, "tocmenu", $sco->id, '', '', '', true);
 
Index: temp_moodle_dev/moodle/mod/scorm/datamodels/scorm_13.js.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/scorm/datamodels/scorm_13.js.php	(.../scorm_13.js.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/scorm/datamodels/scorm_13.js.php	(.../scorm_13.js.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -1,8 +1,8 @@
 <?php
     require_once($CFG->dirroot.'/mod/scorm/locallib.php');
-    
+
     if (isset($userdata->status)) {
-        if (!isset($userdata->{'cmi.exit'}) || (($userdata->{'cmi.exit'} == 'time-out') || ($userdata->{'cmi.exit'} == 'normal'))) { 
+        if (!isset($userdata->{'cmi.exit'}) || (($userdata->{'cmi.exit'} == 'time-out') || ($userdata->{'cmi.exit'} == 'normal'))) {
                 $userdata->entry = 'ab-initio';
         } else {
             if (isset($userdata->{'cmi.exit'}) && (($userdata->{'cmi.exit'} == 'suspend') || ($userdata->{'cmi.exit'} == 'logout'))) {
@@ -15,26 +15,63 @@
 ?>
 
 // Used need to debug cmi content (if you uncomment this, you must comment the definition inside SCORMapi1_3)
-//var cmi = new Object(); 
+//var cmi = new Object();
 
 //
 // SCORM 1.3 API Implementation
 //
 function SCORMapi1_3() {
     // Standard Data Type Definition
-    var CMIString200 = '^.{0,200}$';
-    var CMIString250 = '^.{0,250}$';
-    var CMIString1000 = '^.{0,1500}$';
-    var CMIString4000 = '^.{0,4000}$';
-    var CMIString64000 = '^.{0,64000}$';
+
+    // language key has to be checked for language dependent strings
+    var validLanguages = {'aa':'aa', 'ab':'ab', 'ae':'ae', 'af':'af', 'ak':'ak', 'am':'am', 'an':'an', 'ar':'ar', 'as':'as', 'av':'av', 'ay':'ay', 'az':'az',
+                          'ba':'ba', 'be':'be', 'bg':'bg', 'bh':'bh', 'bi':'bi', 'bm':'bm', 'bn':'bn', 'bo':'bo', 'br':'br', 'bs':'bs',
+                          'ca':'ca', 'ce':'ce', 'ch':'ch', 'co':'co', 'cr':'cr', 'cs':'cs', 'cu':'cu', 'cv':'cv', 'cy':'cy',
+                          'da':'da', 'de':'de', 'dv':'dv', 'dz':'dz', 'ee':'ee', 'el':'el', 'en':'en', 'eo':'eo', 'es':'es', 'et':'et', 'eu':'eu',
+                          'fa':'fa', 'ff':'ff', 'fi':'fi', 'fj':'fj', 'fo':'fo', 'fr':'fr', 'fy':'fy', 'ga':'ga', 'gd':'gd', 'gl':'gl', 'gn':'gn', 'gu':'gu', 'gv':'gv',
+                          'ha':'ha', 'he':'he', 'hi':'hi', 'ho':'ho', 'hr':'hr', 'ht':'ht', 'hu':'hu', 'hy':'hy', 'hz':'hz',
+                          'ia':'ia', 'id':'id', 'ie':'ie', 'ig':'ig', 'ii':'ii', 'ik':'ik', 'io':'io', 'is':'is', 'it':'it', 'iu':'iu',
+                          'ja':'ja', 'jv':'jv', 'ka':'ka', 'kg':'kg', 'ki':'ki', 'kj':'kj', 'kk':'kk', 'kl':'kl', 'km':'km', 'kn':'kn', 'ko':'ko', 'kr':'kr', 'ks':'ks', 'ku':'ku', 'kv':'kv', 'kw':'kw', 'ky':'ky',
+                          'la':'la', 'lb':'lb', 'lg':'lg', 'li':'li', 'ln':'ln', 'lo':'lo', 'lt':'lt', 'lu':'lu', 'lv':'lv',
+                          'mg':'mg', 'mh':'mh', 'mi':'mi', 'mk':'mk', 'ml':'ml', 'mn':'mn', 'mo':'mo', 'mr':'mr', 'ms':'ms', 'mt':'mt', 'my':'my',
+                          'na':'na', 'nb':'nb', 'nd':'nd', 'ne':'ne', 'ng':'ng', 'nl':'nl', 'nn':'nn', 'no':'no', 'nr':'nr', 'nv':'nv', 'ny':'ny',
+                          'oc':'oc', 'oj':'oj', 'om':'om', 'or':'or', 'os':'os', 'pa':'pa', 'pi':'pi', 'pl':'pl', 'ps':'ps', 'pt':'pt',
+                          'qu':'qu', 'rm':'rm', 'rn':'rn', 'ro':'ro', 'ru':'ru', 'rw':'rw',
+                          'sa':'sa', 'sc':'sc', 'sd':'sd', 'se':'se', 'sg':'sg', 'sh':'sh', 'si':'si', 'sk':'sk', 'sl':'sl', 'sm':'sm', 'sn':'sn', 'so':'so', 'sq':'sq', 'sr':'sr', 'ss':'ss', 'st':'st', 'su':'su', 'sv':'sv', 'sw':'sw',
+                          'ta':'ta', 'te':'te', 'tg':'tg', 'th':'th', 'ti':'ti', 'tk':'tk', 'tl':'tl', 'tn':'tn', 'to':'to', 'tr':'tr', 'ts':'ts', 'tt':'tt', 'tw':'tw', 'ty':'ty',
+                          'ug':'ug', 'uk':'uk', 'ur':'ur', 'uz':'uz', 've':'ve', 'vi':'vi', 'vo':'vo',
+                          'wa':'wa', 'wo':'wo', 'xh':'xh', 'yi':'yi', 'yo':'yo', 'za':'za', 'zh':'zh', 'zu':'zu',
+                          'aar':'aar', 'abk':'abk', 'ave':'ave', 'afr':'afr', 'aka':'aka', 'amh':'amh', 'arg':'arg', 'ara':'ara', 'asm':'asm', 'ava':'ava', 'aym':'aym', 'aze':'aze',
+                          'bak':'bak', 'bel':'bel', 'bul':'bul', 'bih':'bih', 'bis':'bis', 'bam':'bam', 'ben':'ben', 'tib':'tib', 'bod':'bod', 'bre':'bre', 'bos':'bos',
+                          'cat':'cat', 'che':'che', 'cha':'cha', 'cos':'cos', 'cre':'cre', 'cze':'cze', 'ces':'ces', 'chu':'chu', 'chv':'chv', 'wel':'wel', 'cym':'cym',
+                          'dan':'dan', 'ger':'ger', 'deu':'deu', 'div':'div', 'dzo':'dzo', 'ewe':'ewe', 'gre':'gre', 'ell':'ell', 'eng':'eng', 'epo':'epo', 'spa':'spa', 'est':'est', 'baq':'baq', 'eus':'eus', 'per':'per',
+                          'fas':'fas', 'ful':'ful', 'fin':'fin', 'fij':'fij', 'fao':'fao', 'fre':'fre', 'fra':'fra', 'fry':'fry', 'gle':'gle', 'gla':'gla', 'glg':'glg', 'grn':'grn', 'guj':'guj', 'glv':'glv',
+                          'hau':'hau', 'heb':'heb', 'hin':'hin', 'hmo':'hmo', 'hrv':'hrv', 'hat':'hat', 'hun':'hun', 'arm':'arm', 'hye':'hye', 'her':'her',
+                          'ina':'ina', 'ind':'ind', 'ile':'ile', 'ibo':'ibo', 'iii':'iii', 'ipk':'ipk', 'ido':'ido', 'ice':'ice', 'isl':'isl', 'ita':'ita', 'iku':'iku',
+                          'jpn':'jpn', 'jav':'jav', 'geo':'geo', 'kat':'kat', 'kon':'kon', 'kik':'kik', 'kua':'kua', 'kaz':'kaz', 'kal':'kal', 'khm':'khm', 'kan':'kan', 'kor':'kor', 'kau':'kau', 'kas':'kas', 'kur':'kur', 'kom':'kom', 'cor':'cor', 'kir':'kir',
+                          'lat':'lat', 'ltz':'ltz', 'lug':'lug', 'lim':'lim', 'lin':'lin', 'lao':'lao', 'lit':'lit', 'lub':'lub', 'lav':'lav',
+                          'mlg':'mlg', 'mah':'mah', 'mao':'mao', 'mri':'mri', 'mac':'mac', 'mkd':'mkd', 'mal':'mal', 'mon':'mon', 'mol':'mol', 'mar':'mar', 'may':'may', 'msa':'msa', 'mlt':'mlt', 'bur':'bur', 'mya':'mya',
+                          'nau':'nau', 'nob':'nob', 'nde':'nde', 'nep':'nep', 'ndo':'ndo', 'dut':'dut', 'nld':'nld', 'nno':'nno', 'nor':'nor', 'nbl':'nbl', 'nav':'nav', 'nya':'nya',
+                          'oci':'oci', 'oji':'oji', 'orm':'orm', 'ori':'ori', 'oss':'oss', 'pan':'pan', 'pli':'pli', 'pol':'pol', 'pus':'pus', 'por':'por', 'que':'que',
+                          'roh':'roh', 'run':'run', 'rum':'rum', 'ron':'ron', 'rus':'rus', 'kin':'kin', 'san':'san', 'srd':'srd', 'snd':'snd', 'sme':'sme', 'sag':'sag', 'slo':'slo', 'sin':'sin', 'slk':'slk', 'slv':'slv', 'smo':'smo', 'sna':'sna', 'som':'som', 'alb':'alb', 'sqi':'sqi', 'srp':'srp', 'ssw':'ssw', 'sot':'sot', 'sun':'sun', 'swe':'swe', 'swa':'swa',
+                          'tam':'tam', 'tel':'tel', 'tgk':'tgk', 'tha':'tha', 'tir':'tir', 'tuk':'tuk', 'tgl':'tgl', 'tsn':'tsn', 'ton':'ton', 'tur':'tur', 'tso':'tso', 'tat':'tat', 'twi':'twi', 'tah':'tah',
+                          'uig':'uig', 'ukr':'ukr', 'urd':'urd', 'uzb':'uzb', 'ven':'ven', 'vie':'vie', 'vol':'vol', 'wln':'wln', 'wol':'wol', 'xho':'xho', 'yid':'yid', 'yor':'yor', 'zha':'zha', 'chi':'chi', 'zho':'zho', 'zul':'zul'};
+
+    var CMIString200 = '^[\\u0000-\\uFFFF]{0,200}$';
+    var CMIString250 = '^[\\u0000-\\uFFFF]{0,250}$';
+    var CMIString1000 = '^[\\u0000-\\uFFFF]{0,1000}$';
+    var CMIString4000 = '^[\\u0000-\\uFFFF]{0,4000}$';
+    var CMIString64000 = '^[\\u0000-\\uFFFF]{0,64000}$';
     var CMILang = '^([a-zA-Z]{2,3}|i|x)(\-[a-zA-Z0-9\-]{2,8})?$|^$';
     var CMILangString250 = '^(\{lang=([a-zA-Z]{2,3}|i|x)(\-[a-zA-Z0-9\-]{2,8})?\})?([^\{].{0,250}$)?';
+    var CMILangcr = '^((\{lang=([a-zA-Z]{2,3}|i|x)?(\-[a-zA-Z0-9\-]{2,8})?\}))(.*?)$';
+    var CMILangString250cr = '^((\{lang=([a-zA-Z]{2,3}|i|x)?(\-[a-zA-Z0-9\-]{2,8})?\})?(.{0,250})?)?$';
     var CMILangString4000 = '^(\{lang=([a-zA-Z]{2,3}|i|x)(\-[a-zA-Z0-9\-]{2,8})?\})?([^\{].{0,4000}$)?';
     var CMITime = '^(19[7-9]{1}[0-9]{1}|20[0-2]{1}[0-9]{1}|203[0-8]{1})((-(0[1-9]{1}|1[0-2]{1}))((-(0[1-9]{1}|[1-2]{1}[0-9]{1}|3[0-1]{1}))(T([0-1]{1}[0-9]{1}|2[0-3]{1})((:[0-5]{1}[0-9]{1})((:[0-5]{1}[0-9]{1})((\\.[0-9]{1,2})((Z|([+|-]([0-1]{1}[0-9]{1}|2[0-3]{1})))(:[0-5]{1}[0-9]{1})?)?)?)?)?)?)?)?$';
     var CMITimespan = '^P(\\d+Y)?(\\d+M)?(\\d+D)?(T(((\\d+H)(\\d+M)?(\\d+(\.\\d{1,2})?S)?)|((\\d+M)(\\d+(\.\\d{1,2})?S)?)|((\\d+(\.\\d{1,2})?S))))?$';
     var CMIInteger = '^\\d+$';
     var CMISInteger = '^-?([0-9]+)$';
-    var CMIDecimal = '^-?([0-9]{1,4})(\\.[0-9]{1,18})?$';
+    var CMIDecimal = '^-?([0-9]{1,5})(\\.[0-9]{1,18})?$';
     var CMIIdentifier = '^\\S{0,250}[a-zA-Z0-9]$';
     var CMIShortIdentifier = '^[\\w\.]{1,250}$';
     var CMILongIdentifier = '^\\S{0,4000}[a-zA-Z0-9]$';
@@ -67,7 +104,7 @@
     var progress_range = '0#1';
     var learner_response = {
         'true-false':{'format':'^true$|^false$', 'max':1, 'delimiter':'', 'unique':false},
-        'choice':{'format':CMIIdentifier, 'max':36, 'delimiter':'[,]', 'unique':true},
+        'choice':{'format':CMIShortIdentifier, 'max':36, 'delimiter':'[,]', 'unique':true},
         'fill-in':{'format':CMILangString250, 'max':10, 'delimiter':'[,]', 'unique':false},
         'long-fill-in':{'format':CMILangString4000, 'max':1, 'delimiter':'', 'unique':false},
         'matching':{'format':CMIShortIdentifier, 'format2':CMIShortIdentifier, 'max':36, 'delimiter':'[,]', 'delimiter2':'[.]', 'unique':false},
@@ -77,28 +114,30 @@
         'numeric':{'format':CMIDecimal, 'max':1, 'delimiter':'', 'unique':false},
         'other':{'format':CMIString4000, 'max':1, 'delimiter':'', 'unique':false}
     }
+
     var correct_responses = {
         'true-false':{'pre':'', 'max':1, 'delimiter':'', 'unique':false, 'duplicate':false,
-                      'format':'^true$|^false$', 
+                      'format':'^true$|^false$',
                       'limit':1},
         'choice':{'pre':'', 'max':36, 'delimiter':'[,]', 'unique':true, 'duplicate':false,
-                  'format':CMIIdentifier},
-        'fill-in':{'pre':'^(\{case_matters=(true|false)\})(\{order_matters=(true|false)\})?|^(\{order_matters=(true|false)\})(\{case_matters=(true|false)\})?',
+                  'format':CMIShortIdentifier},
+//        'fill-in':{'pre':'^(((\{case_matters=(true|false)\})(\{order_matters=(true|false)\})?)|((\{order_matters=(true|false)\})(\{case_matters=(true|false)\})?))(.*?)$',
+        'fill-in':{'pre':'',
                    'max':10, 'delimiter':'[,]', 'unique':false, 'duplicate':false,
-                   'format':CMILangString250},
+                   'format':CMILangString250cr},
         'long-fill-in':{'pre':'^(\{case_matters=(true|false)\})?', 'max':1, 'delimiter':'', 'unique':false, 'duplicate':true,
                         'format':CMILangString4000},
-        'matching':{'pre':'', 'max':36, 'delimiter':'[,]', 'delimiter2':'[.]', 'unique':false, 'duplicate':true,
+        'matching':{'pre':'', 'max':36, 'delimiter':'[,]', 'delimiter2':'[.]', 'unique':false, 'duplicate':false,
                     'format':CMIShortIdentifier, 'format2':CMIShortIdentifier},
         'performance':{'pre':'^(\{order_matters=(true|false)\})?',
-                       'max':250, 'delimiter':'[,]', 'delimiter2':'[.]', 'unique':false, 'duplicate':true,
+                       'max':250, 'delimiter':'[,]', 'delimiter2':'[.]', 'unique':false, 'duplicate':false,
                        'format':'^$|'+CMIShortIdentifier, 'format2':CMIDecimal+'|^$|'+CMIShortIdentifier},
         'sequencing':{'pre':'', 'max':36, 'delimiter':'[,]', 'unique':false, 'duplicate':false,
                       'format':CMIShortIdentifier},
         'likert':{'pre':'', 'max':1, 'delimiter':'', 'unique':false, 'duplicate':false,
                   'format':CMIShortIdentifier,
                   'limit':1},
-        'numeric':{'pre':'', 'max':1, 'delimiter':'', 'unique':false, 'duplicate':false,
+        'numeric':{'pre':'', 'max':2, 'delimiter':'[:]', 'unique':false, 'duplicate':false,
                    'format':CMIDecimal,
                    'limit':1},
         'other':{'pre':'', 'max':1, 'delimiter':'', 'unique':false, 'duplicate':false,
@@ -216,8 +255,8 @@
 
     if (cmi.completion_status == '') {
         cmi.completion_status = 'not attempted';
-    } 
-    
+    }
+
     //
     // API Methods definition
     //
@@ -231,7 +270,7 @@
             if ((!Initialized) && (!Terminated)) {
                 Initialized = true;
                 errorCode = "0";
-                <?php 
+                <?php
                     if (debugging('',DEBUG_DEVELOPER)) {
 //                        echo 'alert("Initialized SCORM 1.3");';
                         echo 'LogAPICall("Initialize", param, "", errorCode);';
@@ -248,20 +287,20 @@
         } else {
             errorCode = "201";
         }
-        <?php 
+        <?php
             if (debugging('',DEBUG_DEVELOPER)) {
 //                echo 'alert("Initialize: "+GetErrorString(errorCode));';
                 echo 'LogAPICall("Initialize", param, "", errorCode);';
             }
         ?>
         return "false";
     }
-    
+
     function Terminate (param) {
         errorCode = "0";
         if (param == "") {
             if ((Initialized) && (!Terminated)) {
-                <?php 
+                <?php
                     if (debugging('',DEBUG_DEVELOPER)) {
 //                        echo 'alert("Terminated SCORM 1.3");';
                         echo 'LogAPICall("Terminate", param, "", 0);';
@@ -293,7 +332,7 @@
                     if (<?php echo $scorm->auto ?> == 1) {
                         setTimeout('top.nextSCO();',500);
                     }
-                }    
+                }
                 return "true";
             } else {
                 if (Terminated) {
@@ -305,14 +344,14 @@
         } else {
             errorCode = "201";
         }
-        <?php 
+        <?php
             if (debugging('',DEBUG_DEVELOPER)) {
                 echo 'alert("Terminate: "+GetErrorString(errorCode));';
             }
         ?>
         return "false";
     }
-    
+
     function GetValue (element) {
         errorCode = "0";
         diagnostic = "";
@@ -337,7 +376,7 @@
 
                             if ((typeof eval(subelement) != "undefined") && (eval(subelement) != null)) {
                                 errorCode = "0";
-                                <?php 
+                                <?php
                                     if (debugging('',DEBUG_DEVELOPER)) {
 //                                        echo 'alert("GetValue("+element+") -> "+eval(element));';
                                         echo 'LogAPICall("GetValue", element, eval(element), 0);';
@@ -397,21 +436,21 @@
                 errorCode = "301";
             }
         } else {
-            if (Terminated) {                
+            if (Terminated) {
                 errorCode = "123";
             } else {
                 errorCode = "122";
             }
         }
-        <?php 
+        <?php
             if (debugging('',DEBUG_DEVELOPER)) {
 //                echo 'alert("GetValue("+element+") -> "+GetErrorString(errorCode));';
                 echo 'LogAPICall("GetValue", element, "", errorCode);';
             }
         ?>
         return "";
     }
-    
+
     function SetValue (element,value) {
         errorCode = "0";
         diagnostic = "";
@@ -472,7 +511,7 @@
 
                                     if ((typeof eval(subelement)) == "undefined") {
                                         switch (elementmodel) {
-                                            case 'cmi.objectives.n.id': 
+                                            case 'cmi.objectives.n.id':
                                                 if (!duplicatedID(element,parentelement,value)) {
                                                     if (elementIndexes[elementIndexes.length-2] == eval(parentelement+'._count')) {
                                                         eval(parentelement+'._count++;');
@@ -500,7 +539,7 @@
                                                     var subobject = eval(subelement);
                                                     subobject.objectives = new Object();
                                                     subobject.objectives._count = 0;
-                                                } 
+                                                }
                                             break;
                                             case 'cmi.interactions.n.objectives.n.id':
                                                 if (typeof eval(parentelement) != "undefined") {
@@ -519,70 +558,44 @@
                                             break;
                                             case 'cmi.interactions.n.correct_responses.n.pattern':
                                                 if (typeof eval(parentelement) != "undefined") {
-
                                                     // Use cmi.interactions.n.type value to check the right dataelement format
                                                     if (elementIndexes[elementIndexes.length-2] == eval(parentelement+'._count')) {
                                                         var interactiontype = eval(String(parentelement).replace('correct_responses','type'));
+                                                        var interactioncount = eval(parentelement+'._count');
+                                                        // trap duplicate values, which is not allowed for type choice
+                                                        if (interactiontype == 'choice') {
+                                                            for (var i=0; (i < interactioncount) && (errorCode=="0"); i++) {
+                                                               if (eval(parentelement+'.N'+i+'.pattern') == value) {
+                                                                   errorCode = "351";
+                                                               }
+                                                            }
+                                                        }
                                                         if ((typeof correct_responses[interactiontype].limit == 'undefined') ||
                                                             (eval(parentelement+'._count') < correct_responses[interactiontype].limit)) {
-                                                            if (correct_responses[interactiontype].pre != '') {
-                                                                matches = value.match(correct_responses[interactiontype].pre);
-                                                                if (matches != null) {
-                                                                    value = value.substr(0,matches[1].length);
-                                                                }
-                                                            }
                                                             var nodes = new Array();
                                                             if (correct_responses[interactiontype].delimiter != '') {
                                                                 nodes = value.split(correct_responses[interactiontype].delimiter);
                                                             } else {
                                                                 nodes[0] = value;
                                                             }
+                                                            if (interactiontype == 'choice' && nodes.length == 1) {
+                                                              alert('not enough choices: ' + element);
+                                                            }
                                                             if ((nodes.length > 0) && (nodes.length <= correct_responses[interactiontype].max)) {
-                                                                expression = new RegExp(correct_responses[interactiontype].format);
-                                                                for (var i=0; (i < nodes.length) && (errorCode=="0"); i++) {
-                                                                    if (typeof correct_responses[interactiontype].delimiter2 != 'undefined') {
-                                                                        values = nodes[i].split(correct_responses[interactiontype].delimiter2);
-                                                                        if (values.length == 2) {
-                                                                            matches = values[0].match(expression);
-                                                                            if (matches == null) {
-                                                                                errorCode = "406";
-                                                                            } else {
-                                                                                var expression2= new RegExp(correct_responses[interactiontype].format2);
-                                                                                matches = values[1].match(expression2);
-                                                                                if ((matches == null) || (matches.join('').length == 0)) {
-                                                                                    errorCode = "406";
-                                                                                }
-                                                                            }
-                                                                        } else {
-                                                                            errorCode = "406";
-                                                                        }
-                                                                    } else {
-                                                                        matches = nodes[i].match(expression);
-                                                                        if (matches == null) {
-                                                                            errorCode = "406";
-                                                                        } else {
-                                                                            if ((nodes[i] != '') && (correct_responses[interactiontype].unique)) {
-                                                                                for (var j=0; (j<i) && (errorCode=="0"); j++) {
-                                                                                    if (nodes[i] == nodes[j]) {
-                                                                                        errorCode = "406";
-                                                                                    }
-                                                                                }
-                                                                            }
-                                                                        }
-                                                                    }
-                                                                }
+                                                                errorCode = CRcheckValueNodes (element, interactiontype, nodes, value, errorCode);
                                                             } else if (nodes.length > correct_responses[interactiontype].max) {
                                                                 errorCode = "351";
                                                                 diagnostic = "Data Model Element Pattern Too Long";
                                                             }
-                                                            if ((errorCode == "0") &&
-                                                               ((correct_responses[interactiontype].duplicate == false) || 
-                                                               (!duplicatedPA(element,parentelement,value)))) {
+                                                            if ((errorCode == "0") && ((correct_responses[interactiontype].duplicate == false) ||
+                                                               (!duplicatedPA(element,parentelement,value))) || (errorCode == "0" && value == "")) {
                                                                eval(parentelement+'._count++;');
                                                                eval(subelement+' = new Object();');
                                                             } else {
-                                                                errorCode="351";
-                                                                diagnostic = "Data Model Element Pattern Already Exists";
+                                                                if (errorCode == "0") {
+                                                                    errorCode="351";
+                                                                    diagnostic = "Data Model Element Pattern Already Exists";
+                                                                }
                                                             }
                                                         } else {
                                                             errorCode="351";
@@ -604,7 +617,7 @@
                                                     } else {
                                                         errorCode="351";
                                                         diagnostic = "Data Model Element Collection Set Out Of Order";
-                                                    } 
+                                                    }
                                                 } else {
                                                     errorCode="408";
                                                 }
@@ -617,7 +630,7 @@
                                                     errorCode = "351";
                                                     diagnostic = "Write Once Violation";
                                                 }
-                                            break; 
+                                            break;
                                             case 'cmi.interactions.n.objectives.n.id':
                                                 if (duplicatedID(element,parentelement,value)) {
                                                     errorCode = "351";
@@ -681,80 +694,40 @@
                                                     }
                                                 }
                                              break;
-                                            case 'cmi.interactions.n.correct_responses.n.pattern':
+                                         case 'cmi.interactions.n.correct_responses.n.pattern':
 											 subel= subelement.split('.');
 											 subel1= 'cmi.interactions.'+subel[2];
-							
 
-                                                 if (typeof eval(subel1+'.type') == "undefined") {
-
+                                                if (typeof eval(subel1+'.type') == "undefined") {
                                                     errorCode="408";
                                                 } else {
-			
-	
                                                     // Use cmi.interactions.n.type value to check the right //dataelement format
-                                                    interactiontype = eval(subel1+'.type');
+                                                    var interactiontype = eval(subel1+'.type');
+                                                    var interactioncount = eval(parentelement+'._count');
+                                                    // trap duplicate values, which is not allowed for type choice
+                                                    if (interactiontype == 'choice') {
+                                                        for (var i=0; (i < interactioncount) && (errorCode=="0"); i++) {
+                                                           if (eval(parentelement+'.N'+i+'.pattern') == value) {
+                                                               errorCode = "351";
+                                                           }
+                                                        }
+                                                    }
                                                     var nodes = new Array();
                                                     if (correct_responses[interactiontype].delimiter != '') {
                                                         nodes = value.split(correct_responses[interactiontype].delimiter);
                                                     } else {
                                                         nodes[0] = value;
                                                     }
-	
-                                                    if ((nodes.length > 0) && (nodes.length <= correct_responses[interactiontype].max)) {
-                                                        expression = new RegExp(correct_responses[interactiontype].format);
-                                                        for (var i=0; (i < nodes.length) && (errorCode=="0"); i++) {
-                                                            if (typeof correct_responses[interactiontype].delimiter2 != 'undefined') {
-		
-	
-                                                                values = nodes[i].split(correct_responses[interactiontype].delimiter2);
-                                                                if (values.length == 2) {
-		
-                                                                    matches = values[0].match(expression);
-                                                                    if (matches == null) {
-		
-                                                                        errorCode = "406";
-                                                                    } else {
-		
-                                                                        var expression2 = new RegExp(correct_responses[interactiontype].format2);
-                                                                        matches = values[1].match(expression2);
-                                                                        if (matches == null) {
-	
-                                                                            errorCode = "406";
-                                                                        }
-                                                                    }
-                                                                } else {
-	                                                                 errorCode = "406";
-                                                                }
-                                                            } else {
 
-                                                                matches = nodes[i].match(expression);
-                                                                //if ((matches == null) || (matches.join('').length == 0)) {
-                                                                if ((matches == null && value != "")||(matches == null && interactiontype=="true-false")){
-
-                                                                    errorCode = "406";
-                                                                } else {
-
-                                                                    if ((nodes[i] != '') && (correct_responses[interactiontype].unique)) {
-                                                                        for (var j=0; (j<i) && (errorCode=="0"); j++) {
-                                                                            if (nodes[i] == nodes[j]) {
-	
-                                                                                errorCode = "406";
-                                                                            }
-                                                                        }
-                                                                    }
-	                                                            }
-                                                            }
-                                                        }
+                                                    if ((nodes.length > 0) && (nodes.length <= correct_responses[interactiontype].max)) {
+                                                        errorCode = CRcheckValueNodes (element, interactiontype, nodes, value, errorCode);
                                                     } else if (nodes.length > correct_responses[interactiontype].max) {
-	
                                                         errorCode = "351";
                                                         diagnostic = "Data Model Element Pattern Too Long";
                                                     }
-	
                                                 }
                                              break;
-                                        } 
+                                        }
                                     }
                                 }
                             }
@@ -769,7 +742,7 @@
                                         if ((ranges[1] == '*') || (value <= ranges[1])) {
                                             eval(element+'=value;');
                                             errorCode = "0";
-                                            <?php 
+                                            <?php
                                                 if (debugging('',DEBUG_DEVELOPER)) {
 //                                                    echo 'alert("SetValue("+element+","+value+") -> OK");';
                                                     echo 'LogAPICall("SetValue", element, value, errorCode);';
@@ -784,8 +757,8 @@
                                     }
                                 } else {
                                     eval(element+'=value;');
-                                    errorCode = "0"; 
-                                    <?php 
+                                    errorCode = "0";
+                                    <?php
                                         if (debugging('',DEBUG_DEVELOPER)) {
 //                                           echo 'alert("SetValue("+element+","+value+") -> OK");';
                                             echo 'LogAPICall("SetValue", element, value, errorCode);';
@@ -813,20 +786,134 @@
                 errorCode = "132";
             }
         }
-        <?php 
+        <?php
             if (debugging('',DEBUG_DEVELOPER)) {
                 echo 'LogAPICall("SetValue", element, value, errorCode);';
             }
         ?>
         return "false";
     }
-    
+
+
+    function CRremovePrefixes (node) {
+        // check for prefixes lang, case, order
+        // case and then order
+        var seenOrder = false;
+        var seenCase = false;
+        var seenLang = false;
+        var errorCode = "0";
+        while (matches = node.match('^(\{(lang|case_matters|order_matters)=([^\}]+)\})')) {
+            switch (matches[2]) {
+                case 'lang':
+                    // check for language prefix on each node
+                    langmatches = node.match(CMILangcr);
+                    if (langmatches != null) {
+                        lang = langmatches[3];
+                        // check that language string definition is valid
+                        if (lang.length > 0 && lang != undefined) {
+                            if (validLanguages[lang.toLowerCase()] == undefined) {
+                                errorCode = "406";
+                            }
+                        }
+                    }
+                    seenLang = true;
+                break;
+
+                case 'case_matters':
+                    // check for correct case answer
+                    if (! seenLang && ! seenOrder && ! seenCase) {
+                        if (matches[3] != 'true' && matches[3] != 'false') {
+                            errorCode = "406";
+                        }
+                    }
+                    seenCase = true;
+                break;
+
+                case 'order_matters':
+                    // check for correct case answer
+                    if (! seenCase && ! seenLang && ! seenOrder) {
+                        if (matches[3] != 'true' && matches[3] != 'false') {
+                            errorCode = "406";
+                        }
+                    }
+                    seenOrder = true;
+                break;
+
+                default:
+                break;
+            }
+            node = node.substr(matches[1].length);
+        }
+        return {'errorCode': errorCode, 'node': node};
+    }
+
+
+    function CRcheckValueNodes(element, interactiontype, nodes, value, errorCode) {
+        expression = new RegExp(correct_responses[interactiontype].format);
+        for (var i=0; (i < nodes.length) && (errorCode=="0"); i++) {
+            if (interactiontype.match('^(fill-in|long-fill-in|matching|performance|sequencing)$')) {
+                result = CRremovePrefixes(nodes[i]);
+                errorCode = result.errorCode;
+                nodes[i] = result.node;
+            }
+
+            // check for prefix on each node
+            if (correct_responses[interactiontype].pre != '') {
+                matches = nodes[i].match(correct_responses[interactiontype].pre);
+                if (matches != null) {
+                    nodes[i] = nodes[i].substr(matches[1].length);
+                }
+            }
+
+            if (correct_responses[interactiontype].delimiter2 != undefined) {
+                values = nodes[i].split(correct_responses[interactiontype].delimiter2);
+                if (values.length == 2) {
+                    matches = values[0].match(expression);
+                    if (matches == null) {
+                        errorCode = "406";
+                    } else {
+                        var expression2 = new RegExp(correct_responses[interactiontype].format2);
+                        matches = values[1].match(expression2);
+                        if (matches == null) {
+                            errorCode = "406";
+                        }
+                    }
+                } else {
+                     errorCode = "406";
+                }
+            } else {
+                matches = nodes[i].match(expression);
+                //if ((matches == null) || (matches.join('').length == 0)) {
+                if ((matches == null && value != "")||(matches == null && interactiontype=="true-false")){
+                    errorCode = "406";
+                } else {
+                    // numeric range - left must be <= right
+                    if (interactiontype == 'numeric' && nodes.length > 1) {
+                        if (parseFloat(nodes[0]) > parseFloat(nodes[1])) {
+                            errorCode = "406";
+                        }
+                    } else {
+                        if ((nodes[i] != '') && (correct_responses[interactiontype].unique)) {
+                            for (var j=0; (j < i) && (errorCode=="0"); j++) {
+                                if (nodes[i] == nodes[j]) {
+                                    errorCode = "406";
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        } // end of for each nodes
+        return errorCode;
+    }
+
+
     function Commit (param) {
         errorCode = "0";
         if (param == "") {
             if ((Initialized) && (!Terminated)) {
                 result = StoreData(cmi,false);
-                <?php 
+                <?php
                     if (debugging('',DEBUG_DEVELOPER)) {
                         echo 'LogAPICall("Commit", param, "", 0);';
                         //echo 'alert("Data Commited");';
@@ -843,24 +930,24 @@
         } else {
             errorCode = "201";
         }
-        <?php 
+        <?php
             if (debugging('',DEBUG_DEVELOPER)) {
                 echo 'LogAPICall("Commit", param, "", 0);';
 //                echo 'alert("Commit: "+GetErrorString(errorCode));';
             }
         ?>
         return "false";
     }
-    
+
     function GetLastError () {
-     <?php 
+     <?php
         if (debugging('',DEBUG_DEVELOPER)) {
             echo 'LogAPICall("GetLastError", "", "", errorCode);';
         }
     ?>
         return errorCode;
     }
-    
+
     function GetErrorString (param) {
         if (param != "") {
             var errorString = "";
@@ -944,32 +1031,32 @@
                     errorString = "Data Model Dependency Not Established";
                 break;
             }
-            <?php 
+            <?php
             if (debugging('',DEBUG_DEVELOPER)) {
                 echo 'LogAPICall("GetErrorString", param,  errorString, 0);';
             }
              ?>
             return errorString;
         } else {
-           <?php 
+           <?php
             if (debugging('',DEBUG_DEVELOPER)) {
                 echo 'LogAPICall("GetErrorString", param,  "No error string found!", 0);';
             }
              ?>
             return "";
         }
     }
-    
+
     function GetDiagnostic (param) {
         if (diagnostic != "") {
-            <?php 
+            <?php
                 if (debugging('',DEBUG_DEVELOPER)) {
                     echo 'LogAPICall("GetDiagnostic", param, diagnostic, 0);';
                 }
             ?>
             return diagnostic;
         }
-        <?php 
+        <?php
             if (debugging('',DEBUG_DEVELOPER)) {
                 echo 'LogAPICall("GetDiagnostic", param, param, 0);';
             }
@@ -984,7 +1071,7 @@
             if ((parent+'.N'+n+'.id' != element) && (eval(parent+'.N'+n+'.id') == value)) {
                 found = true;
             }
-        } 
+        }
         return found;
     }
 
@@ -995,7 +1082,7 @@
             if ((parent+'.N'+n+'.pattern' != element) && (eval(parent+'.N'+n+'.pattern') == value)) {
                 found = true;
             }
-        } 
+        }
         return found;
     }
 
@@ -1013,7 +1100,7 @@
     }
 
     function AddTime (first, second) {
-        <?php 
+        <?php
 //            if (debugging('',DEBUG_DEVELOPER)) {
 //                echo 'alert("AddTime: "+first+" + "+second);';
 //            }
@@ -1023,18 +1110,42 @@
         var firstarray = first.match(matchexpr);
         var secondarray = second.match(matchexpr);
         if ((firstarray != null) && (secondarray != null)) {
-            var secs = parseFloat(firstarray[13],10)+parseFloat(secondarray[13],10);  //Seconds
-            var change = Math.floor(secs / 60);
-            secs = secs - (change * 60);
-            var mins = parseInt(firstarray[11],10)+parseInt(secondarray[11],10)+change;   //Minutes
+            var firstsecs=0;
+            if(parseFloat(firstarray[13],10)>0){ firstsecs=parseFloat(firstarray[13],10); }
+            var secondsecs=0;
+            if(parseFloat(secondarray[13],10)>0){ secondsecs=parseFloat(secondarray[13],10); }
+            var secs = firstsecs+secondsecs;  //Seconds
+            var change = Math.floor(secs/60);
+            secs = Math.round((secs-(change*60))*100)/100;
+            var firstmins=0;
+            if(parseInt(firstarray[11],10)>0){ firstmins=parseInt(firstarray[11],10); }
+            var secondmins=0;
+            if(parseInt(secondarray[11],10)>0){ secondmins=parseInt(secondarray[11],10); }
+            var mins = firstmins+secondmins+change;   //Minutes
             change = Math.floor(mins / 60);
-            mins = mins - (change * 60);
-            var hours = parseInt(firstarray[9],10)+parseInt(secondarray[9],10)+change;  //Hours
-            change = Math.floor(hours / 24);
-            hours = hours - (change * 24);
-            var days = parseInt(firstarray[6],10)+parseInt(secondarray[6],10)+change; // Days
-            var months = parseInt(firstarray[4],10)+parseInt(secondarray[4],10)
-            var years = parseInt(firstarray[2],10)+parseInt(secondarray[2],10)
+            mins = Math.round(mins-(change*60));
+            var firsthours=0;
+            if(parseInt(firstarray[9],10)>0){ firsthours=parseInt(firstarray[9],10); }
+            var secondhours=0;
+            if(parseInt(secondarray[9],10)>0){ secondhours=parseInt(secondarray[9],10); }
+            var hours = firsthours+secondhours+change; //Hours
+            change = Math.floor(hours/24);
+            hours = Math.round(hours-(change*24));
+            var firstdays=0;
+            if(parseInt(firstarray[6],10)>0){ firstdays=parseInt(firstarray[6],10); }
+            var seconddays=0;
+            if(parseInt(secondarray[6],10)>0){ firstdays=parseInt(secondarray[6],10); }
+            var days = Math.round(firstdays+seconddays+change); // Days
+            var firstmonths=0;
+            if(parseInt(firstarray[4],10)>0){ firstmonths=parseInt(firstarray[4],10); }
+            var secondmonths=0;
+            if(parseInt(secondarray[4],10)>0){ secondmonths=parseInt(secondarray[4],10); }
+            var months = Math.round(firstmonths+secondmonths);
+            var firstyears=0;
+            if(parseInt(firstarray[2],10)>0){ firstyears=parseInt(firstarray[2],10); }
+            var secondyears=0;
+            if(parseInt(secondarray[2],10)>0){ secondyears=parseInt(secondarray[2],10); }
+            var years = Math.round(firstyears+secondyears);
         }
         if (years > 0) {
             timestring += years + 'Y';
@@ -1078,7 +1189,7 @@
                     if (eval('datamodel["'+elementmodel+'"].mod') != 'r') {
                         var elementstring = '&'+underscore(element)+'='+encodeURIComponent(data[property]);
                         if ((typeof eval('datamodel["'+elementmodel+'"].defaultvalue')) != "undefined") {
-                            if (eval('datamodel["'+elementmodel+'"].defaultvalue') != data[property]) {
+                            if (eval('datamodel["'+elementmodel+'"].defaultvalue') != data[property] || eval('typeof(datamodel["'+elementmodel+'"].defaultvalue)') != typeof(data[property])) {
                                 datastring += elementstring;
                             }
                         } else {
@@ -1139,7 +1250,7 @@
         errorCode = results[1];
         return results[0];
     }
-    
+
     this.Initialize = Initialize;
     this.Terminate = Terminate;
     this.GetValue = GetValue;
Index: temp_moodle_dev/moodle/mod/scorm/datamodels/scorm_13lib.php
===================================================================
diff -u -rcb3edb3900555e207e90f2b5b6decafbf8003ed3 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/scorm/datamodels/scorm_13lib.php	(.../scorm_13lib.php)	(revision cb3edb3900555e207e90f2b5b6decafbf8003ed3)
+++ temp_moodle_dev/moodle/mod/scorm/datamodels/scorm_13lib.php	(.../scorm_13lib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -7,15 +7,15 @@
     $modestr = '';
     if ($mode == 'browse') {
         $modestr = '&amp;mode='.$mode;
-    } 
+    }
     $scormpixdir = $CFG->modpixpath.'/scorm/pix';
-    
+
     $result = new stdClass();
     $result->toc = "<ul id='s0' class='$liststyle'>\n";
     $tocmenus = array();
     $result->prerequisites = true;
     $incomplete = false;
-    
+
     //
     // Get the current organization infos
     //
@@ -35,8 +35,8 @@
     if ($scoes = scorm_get_scoes($scorm->id, $currentorg)){
         //
         // Retrieve user tracking data for each learning object
-        // 
-    
+        //
+
         $usertracks = array();
         foreach ($scoes as $sco) {
             if (!empty($sco->launch)) {
@@ -97,7 +97,7 @@
             if (!isset($nextsco->isvisible) || (isset($nextsco->isvisible) && ($nextsco->isvisible == 'true'))) {
                 $nextisvisible = true;
             }
-            if ($nextisvisible && ($nextsco !== false) && ($sco->parent != $nextsco->parent) && 
+            if ($nextisvisible && ($nextsco !== false) && ($sco->parent != $nextsco->parent) &&
                (($level==0) || (($level>0) && ($nextsco->parent == $sco->identifier)))) {
                 $sublist++;
                 $icon = 'minus';
@@ -107,7 +107,7 @@
                 $result->toc .= "\t\t".'<li><a href="javascript:expandCollide(\'img'.$sublist.'\',\'s'.$sublist.'\','.$nextsco->id.');">'.
                                 '<img id="img'.$sublist.'" src="'.$scormpixdir.'/'.$icon.'.gif" alt="'.$strexpand.'" title="'.$strexpand.'"/></a>';
             } else if ($isvisible) {
-                $result->toc .= "\t\t".'<li><img src="'.$scormpixdir.'/spacer.gif" />';
+                $result->toc .= "\t\t".'<li><img src="'.$scormpixdir.'/spacer.gif" alt="" />';
             }
             if (empty($sco->title)) {
                 $sco->title = $sco->identifier;
@@ -128,7 +128,7 @@
                         } else {
                             $statusicon = '<img src="'.$scormpixdir.'/assetc.gif" alt="'.get_string('assetlaunched','scorm').'" title="'.get_string('assetlaunched','scorm').'" />';
                         }
-                        
+
                         if (($usertrack->status == 'notattempted') || ($usertrack->status == 'incomplete') || ($usertrack->status == 'browsed')) {
                             $incomplete = true;
                             if ($play && empty($scoid)) {
@@ -163,7 +163,7 @@
                         $shownext = isset($sco->next) ? $sco->next : 0;
                         $showprev = isset($sco->prev) ? $sco->prev : 0;
                     }
-                
+
                     if (($nextid == 0) && (scorm_count_launchable($scorm->id,$currentorg) > 1) && ($nextsco!==false) && (!$findnext)) {
                         if (!empty($sco->launch)) {
                             $previd = $sco->id;
@@ -197,7 +197,7 @@
         for ($i=0;$i<$level;$i++) {
             $result->toc .= "\t\t</ul></li>\n";
         }
-        
+
         if ($play) {
             $sco = get_record('scorm_scoes','id',$scoid);
             $sco->previd = $previd;
@@ -230,7 +230,7 @@
           //]]>
           </script>'."\n";
     }
-    
+
     $url = $CFG->wwwroot.'/mod/scorm/player.php?a='.$scorm->id.'&amp;currentorg='.$currentorg.$modestr.'&amp;scoid=';
     $result->tocmenu = popup_form($url,$tocmenus, "tocmenu", $sco->id, '', '', '', true);
 
Index: temp_moodle_dev/moodle/mod/scorm/datamodels/scormlib.php
===================================================================
diff -u -r2b0b9980518ec66fc86fb0bf4b528cb4c91d735d -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/scorm/datamodels/scormlib.php	(.../scormlib.php)	(revision 2b0b9980518ec66fc86fb0bf4b528cb4c91d735d)
+++ temp_moodle_dev/moodle/mod/scorm/datamodels/scormlib.php	(.../scormlib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -5,7 +5,7 @@
         if ($block['name'] == 'RESOURCES') {
             foreach ($block['children'] as $resource) {
                 if ($resource['name'] == 'RESOURCE') {
-                    $resources[addslashes($resource['attrs']['IDENTIFIER'])] = $resource['attrs'];
+                    $resources[addslashes_js($resource['attrs']['IDENTIFIER'])] = $resource['attrs'];
                 }
             }
         }
@@ -43,7 +43,7 @@
                     }
                 break;
                 case 'MANIFEST':
-                    $manifest = addslashes($block['attrs']['IDENTIFIER']);
+                    $manifest = addslashes_js($block['attrs']['IDENTIFIER']);
                     $organization = '';
                     $resources = array();
                     $resources = scorm_get_resources($block['children']);
@@ -56,22 +56,22 @@
                                 $sco->identifier = $item;
                                 $sco->title = $item;
                                 $sco->parent = '/';
-                                $sco->launch = addslashes($resource['HREF']);
-                                $sco->scormtype = addslashes($resource['ADLCP:SCORMTYPE']);
+                                $sco->launch = addslashes_js($resource['HREF']);
+                                $sco->scormtype = addslashes_js($resource['ADLCP:SCORMTYPE']);
                                 $scoes->elements[$manifest][$organization][$item] = $sco;
                             }
                         }
                     }
                 break;
                 case 'ORGANIZATIONS':
                     if (!isset($scoes->defaultorg) && isset($block['attrs']['DEFAULT'])) {
-                        $scoes->defaultorg = addslashes($block['attrs']['DEFAULT']);
+                        $scoes->defaultorg = addslashes_js($block['attrs']['DEFAULT']);
                     }
                     //we pass the variables "is_lams" and "scormid" to be able to modify the path of the launch property inside the scorm_get_manifest function
         			$scoes = scorm_get_manifest($block['children'],$scoes,$is_lams,$scormid);
                 break;
                 case 'ORGANIZATION':
-                    $identifier = addslashes($block['attrs']['IDENTIFIER']);
+                    $identifier = addslashes_js($block['attrs']['IDENTIFIER']);
                     $organization = '';
                     $scoes->elements[$manifest][$organization][$identifier]->identifier = $identifier;
                     $scoes->elements[$manifest][$organization][$identifier]->parent = '/';
@@ -94,22 +94,22 @@
                     $parent = array_pop($parents);
                     array_push($parents, $parent);
 
-                    $identifier = addslashes($block['attrs']['IDENTIFIER']);
+                    $identifier = addslashes_js($block['attrs']['IDENTIFIER']);
                     $scoes->elements[$manifest][$organization][$identifier]->identifier = $identifier;
                     $scoes->elements[$manifest][$organization][$identifier]->parent = $parent->identifier;
                     if (!isset($block['attrs']['ISVISIBLE'])) {
                         $block['attrs']['ISVISIBLE'] = 'true';
                     }
-                    $scoes->elements[$manifest][$organization][$identifier]->isvisible = addslashes($block['attrs']['ISVISIBLE']);
+                    $scoes->elements[$manifest][$organization][$identifier]->isvisible = addslashes_js($block['attrs']['ISVISIBLE']);
                     if (!isset($block['attrs']['PARAMETERS'])) {
                         $block['attrs']['PARAMETERS'] = '';
                     }
-                    $scoes->elements[$manifest][$organization][$identifier]->parameters = addslashes($block['attrs']['PARAMETERS']);
+                    $scoes->elements[$manifest][$organization][$identifier]->parameters = addslashes_js($block['attrs']['PARAMETERS']);
                     if (!isset($block['attrs']['IDENTIFIERREF'])) {
                         $scoes->elements[$manifest][$organization][$identifier]->launch = '';
                         $scoes->elements[$manifest][$organization][$identifier]->scormtype = 'asset';
                     } else {
-                        $idref = addslashes($block['attrs']['IDENTIFIERREF']);
+                        $idref = addslashes_js($block['attrs']['IDENTIFIERREF']);
                         $base = '';
                         if (isset($resources[$idref]['XML:BASE'])) {
                             $base = $resources[$idref]['XML:BASE'];
@@ -124,7 +124,7 @@
                         if (empty($resources[$idref]['ADLCP:SCORMTYPE'])) {
                             $resources[$idref]['ADLCP:SCORMTYPE'] = 'asset';
                         }
-                        $scoes->elements[$manifest][$organization][$identifier]->scormtype = addslashes($resources[$idref]['ADLCP:SCORMTYPE']);
+                        $scoes->elements[$manifest][$organization][$identifier]->scormtype = addslashes_js($resources[$idref]['ADLCP:SCORMTYPE']);
                     }
 
                     $parent = new stdClass();
@@ -142,7 +142,7 @@
                     if (!isset($block['tagData'])) {
                         $block['tagData'] = '';
                     }
-                    $scoes->elements[$manifest][$parent->organization][$parent->identifier]->title = addslashes($block['tagData']);
+                    $scoes->elements[$manifest][$parent->organization][$parent->identifier]->title = addslashes_js($block['tagData']);
                 break;
                 case 'ADLCP:PREREQUISITES':
                     if ($block['attrs']['TYPE'] == 'aicc_script') {
@@ -151,7 +151,7 @@
                         if (!isset($block['tagData'])) {
                             $block['tagData'] = '';
                         }
-                        $scoes->elements[$manifest][$parent->organization][$parent->identifier]->prerequisites = addslashes($block['tagData']);
+                        $scoes->elements[$manifest][$parent->organization][$parent->identifier]->prerequisites = addslashes_js($block['tagData']);
                     }
                 break;
                 case 'ADLCP:MAXTIMEALLOWED':
@@ -160,39 +160,39 @@
                     if (!isset($block['tagData'])) {
                         $block['tagData'] = '';
                     }
-                    $scoes->elements[$manifest][$parent->organization][$parent->identifier]->maxtimeallowed = addslashes($block['tagData']);
+                    $scoes->elements[$manifest][$parent->organization][$parent->identifier]->maxtimeallowed = addslashes_js($block['tagData']);
                 break;
                 case 'ADLCP:TIMELIMITACTION':
                     $parent = array_pop($parents);
                     array_push($parents, $parent);
                     if (!isset($block['tagData'])) {
                         $block['tagData'] = '';
                     }
-                    $scoes->elements[$manifest][$parent->organization][$parent->identifier]->timelimitaction = addslashes($block['tagData']);
+                    $scoes->elements[$manifest][$parent->organization][$parent->identifier]->timelimitaction = addslashes_js($block['tagData']);
                 break;
                 case 'ADLCP:DATAFROMLMS':
                     $parent = array_pop($parents);
                     array_push($parents, $parent);
                     if (!isset($block['tagData'])) {
                         $block['tagData'] = '';
                     }
-                    $scoes->elements[$manifest][$parent->organization][$parent->identifier]->datafromlms = addslashes($block['tagData']);
+                    $scoes->elements[$manifest][$parent->organization][$parent->identifier]->datafromlms = addslashes_js($block['tagData']);
                 break;
                 case 'ADLCP:MASTERYSCORE':
                     $parent = array_pop($parents);
                     array_push($parents, $parent);
                     if (!isset($block['tagData'])) {
                         $block['tagData'] = '';
                     }
-                    $scoes->elements[$manifest][$parent->organization][$parent->identifier]->masteryscore = addslashes($block['tagData']);
+                    $scoes->elements[$manifest][$parent->organization][$parent->identifier]->masteryscore = addslashes_js($block['tagData']);
                 break;
                 case 'ADLCP:COMPLETIONTHRESHOLD':
                     $parent = array_pop($parents);
                     array_push($parents, $parent);
                     if (!isset($block['tagData'])) {
                         $block['tagData'] = '';
                     }
-                    $scoes->elements[$manifest][$parent->organization][$parent->identifier]->threshold = addslashes($block['tagData']);
+                    $scoes->elements[$manifest][$parent->organization][$parent->identifier]->threshold = addslashes_js($block['tagData']);
                 break;
                 case 'ADLNAV:PRESENTATION':
                     $parent = array_pop($parents);
@@ -203,25 +203,25 @@
                                 foreach ($adlnav['children'] as $adlnavInterface) {
                                     if ($adlnavInterface['name'] == 'ADLNAV:HIDELMSUI') {
                                         if ($adlnavInterface['tagData'] == 'continue') {
-                                            $scoes->elements[$manifest][$parent->organization][$parent->identifier]->hidecontinue = 1; 
+                                            $scoes->elements[$manifest][$parent->organization][$parent->identifier]->hidecontinue = 1;
                                         }
                                         if ($adlnavInterface['tagData'] == 'previous') {
-                                            $scoes->elements[$manifest][$parent->organization][$parent->identifier]->hideprevious = 1; 
+                                            $scoes->elements[$manifest][$parent->organization][$parent->identifier]->hideprevious = 1;
                                         }
                                         if ($adlnavInterface['tagData'] == 'exit') {
-                                            $scoes->elements[$manifest][$parent->organization][$parent->identifier]->hideexit = 1; 
+                                            $scoes->elements[$manifest][$parent->organization][$parent->identifier]->hideexit = 1;
                                         }
                                         if ($adlnavInterface['tagData'] == 'exitAll') {
-                                            $scoes->elements[$manifest][$parent->organization][$parent->identifier]->hideexitall = 1; 
+                                            $scoes->elements[$manifest][$parent->organization][$parent->identifier]->hideexitall = 1;
                                         }
                                         if ($adlnavInterface['tagData'] == 'abandon') {
-                                            $scoes->elements[$manifest][$parent->organization][$parent->identifier]->hideabandon = 1; 
+                                            $scoes->elements[$manifest][$parent->organization][$parent->identifier]->hideabandon = 1;
                                         }
                                         if ($adlnavInterface['tagData'] == 'abandonAll') {
-                                            $scoes->elements[$manifest][$parent->organization][$parent->identifier]->hideabandonall = 1; 
+                                            $scoes->elements[$manifest][$parent->organization][$parent->identifier]->hideabandonall = 1;
                                         }
                                         if ($adlnavInterface['tagData'] == 'suspendAll') {
-                                            $scoes->elements[$manifest][$parent->organization][$parent->identifier]->hidesuspendall = 1; 
+                                            $scoes->elements[$manifest][$parent->organization][$parent->identifier]->hidesuspendall = 1;
                                         }
                                     }
                                 }
@@ -328,23 +328,23 @@
                             }
                             if ($sequencing['name']=='IMSSS:LIMITCONDITIONS') {
                                 if (isset($sequencing['attrs']['ATTEMPTLIMIT'])) {
-                                    $scoes->elements[$manifest][$parent->organization][$parent->identifier]->attemptLimit = $sequencing['attrs']['ATTEMPTLIMIT'];                                
+                                    $scoes->elements[$manifest][$parent->organization][$parent->identifier]->attemptLimit = $sequencing['attrs']['ATTEMPTLIMIT'];
                                 }
                                 if (isset($sequencing['attrs']['ATTEMPTABSOLUTEDURATIONLIMIT'])) {
-                                    $scoes->elements[$manifest][$parent->organization][$parent->identifier]->attemptAbsoluteDurationLimit = $sequencing['attrs']['ATTEMPTABSOLUTEDURATIONLIMIT'];                                
+                                    $scoes->elements[$manifest][$parent->organization][$parent->identifier]->attemptAbsoluteDurationLimit = $sequencing['attrs']['ATTEMPTABSOLUTEDURATIONLIMIT'];
                                 }
                             }
                             if ($sequencing['name']=='IMSSS:ROLLUPRULES') {
                                 if (isset($sequencing['attrs']['ROLLUPOBJECTIVESATISFIED'])) {
                                     $scoes->elements[$manifest][$parent->organization][$parent->identifier]->rollupobjectivesatisfied = $sequencing['attrs']['ROLLUPOBJECTIVESATISFIED'] == 'true'?1:0;;
                                 }
                                 if (isset($sequencing['attrs']['ROLLUPPROGRESSCOMPLETION'])) {
-                                    $scoes->elements[$manifest][$parent->organization][$parent->identifier]->rollupprogresscompletion = $sequencing['attrs']['ROLLUPPROGRESSCOMPLETION'] == 'true'?1:0; 
+                                    $scoes->elements[$manifest][$parent->organization][$parent->identifier]->rollupprogresscompletion = $sequencing['attrs']['ROLLUPPROGRESSCOMPLETION'] == 'true'?1:0;
                                 }
                                 if (isset($sequencing['attrs']['OBJECTIVEMEASUREWEIGHT'])) {
-                                    $scoes->elements[$manifest][$parent->organization][$parent->identifier]->objectivemeasureweight = $sequencing['attrs']['OBJECTIVEMEASUREWEIGHT'];                    
+                                    $scoes->elements[$manifest][$parent->organization][$parent->identifier]->objectivemeasureweight = $sequencing['attrs']['OBJECTIVEMEASUREWEIGHT'];
                                 }
-    
+
                                 if (!empty($sequencing['children'])){
                                     $rolluprules = array();
                                     foreach ($sequencing['children'] as $sequencingrolluprule) {
@@ -380,7 +380,7 @@
                                                                 if (isset($rolluprulecondition['attrs']['OPERATOR'])) {
                                                                     $condition->operator = $rolluprulecondition['attrs']['OPERATOR'];
                                                                 }
-                                                                array_push($conditions,$condition);    
+                                                                array_push($conditions,$condition);
                                                             }
                                                         }
                                                         $rolluprule->conditions = $conditions;
@@ -396,7 +396,7 @@
                                     $scoes->elements[$manifest][$parent->organization][$parent->identifier]->rolluprules = $rolluprules;
                                 }
                             }
-                            
+
                             if ($sequencing['name']=='IMSSS:SEQUENCINGRULES') {
                                 if (!empty($sequencing['children'])) {
                                     $sequencingrules = array();
@@ -439,7 +439,7 @@
                                                             $condition->referencedobjective = '';
                                                             if (isset($rulecondition['attrs']['REFERENCEDOBJECTIVE'])) {
                                                                 $condition->referencedobjective = $rulecondition['attrs']['REFERENCEDOBJECTIVE'];
-                                                            } 
+                                                            }
                                                             array_push($ruleconditions,$condition);
                                                         }
                                                     }
@@ -450,7 +450,7 @@
                                                 }
                                                 $sequencingrule->type = $conditiontype;
                                             }
-                                            array_push($sequencingrules,$sequencingrule);                                        
+                                            array_push($sequencingrules,$sequencingrule);
                                         }
                                     }
                                     $scoes->elements[$manifest][$parent->organization][$parent->identifier]->sequencingrules = $sequencingrules;
@@ -467,12 +467,12 @@
 
 function scorm_parse_scorm($pkgdir,$scormid,$is_lams=null) {
     global $CFG;
-    
+
     $launch = 0;
     $manifestfile = $pkgdir.'/imsmanifest.xml';
 
     if (is_file($manifestfile)) {
-    
+
         $xmltext = file_get_contents($manifestfile);
 
         $pattern = '/&(?!\w{2,6};)/';
@@ -481,7 +481,7 @@
 
         $objXML = new xml2Array();
         $manifests = $objXML->parse($xmltext);
-//print_object($manifests); 
+//print_object($manifests);
         $scoes = new stdClass();
         $scoes->version = '';
         //we pass the variables "is_lams" and "scormid" to be able to modify the path of the launch property inside the scorm_get_manifest function
@@ -493,30 +493,30 @@
                 foreach ($organizations as $organization => $items) {
                     foreach ($items as $identifier => $item) {
                         // This new db mngt will support all SCORM future extensions
-                        $newitem = new stdClass(); 
+                        $newitem = new stdClass();
                         $newitem->scorm = $scormid;
                         $newitem->manifest = $manifest;
                         $newitem->organization = $organization;
                         $standarddatas = array('parent', 'identifier', 'launch', 'scormtype', 'title');
                         foreach ($standarddatas as $standarddata) {
                             if (isset($item->$standarddata)) {
-                                $newitem->$standarddata = addslashes($item->$standarddata);
+                                $newitem->$standarddata = addslashes_js($item->$standarddata);
                             }
                         }
-                        
+
                         // Insert the new SCO, and retain the link between the old and new for later adjustment
                         $id = insert_record('scorm_scoes',$newitem);
                         if (!empty($olditems) && ($olditemid = scorm_array_search('identifier',$newitem->identifier,$olditems))) {
                             $olditems[$olditemid]->newid = $id;
                         }
-                        
+
                         if ($optionaldatas = scorm_optionals_data($item,$standarddatas)) {
                             $data = new stdClass();
                             $data->scoid = $id;
                             foreach ($optionaldatas as $optionaldata) {
                                 if (isset($item->$optionaldata)) {
                                     $data->name =  $optionaldata;
-                                    $data->value = addslashes($item->$optionaldata);
+                                    $data->value = addslashes_js($item->$optionaldata);
                                     $dataid = insert_record('scorm_scoes_data',$data);
                                 }
                             }
@@ -541,9 +541,9 @@
                                         $rulecondid = insert_record('scorm_seq_rulecond',$rulecond);
                                     }
                                 }
-                            }                        
+                            }
                         }
-                        
+
                         if (isset($item->rolluprules)) {
                             foreach($item->rolluprules as $rolluprule) {
                                 $rollup = new stdClass();
@@ -565,7 +565,7 @@
                                         $conditionid = insert_record('scorm_seq_rolluprulecond',$cond);
                                     }
                                 }
-                            } 
+                            }
                         }
 
                         if (isset($item->objectives)) {
@@ -575,7 +575,7 @@
                                 $obj->primaryobj = $objective->primaryobj;
                                 $obj->satisfiedbumeasure = $objective->satisfiedbymeasure;
                                 $obj->objectiveid = $objective->objectiveid;
-                                $obj->minnormalizedmeasure = $objective->minnormalizedmeasure; 
+                                $obj->minnormalizedmeasure = $objective->minnormalizedmeasure;
                                 $objectiveid = insert_record('scorm_seq_objective',$obj);
                                 if (isset($objective->mapinfos)) {
 //print_object($objective->mapinfos);
@@ -616,10 +616,14 @@
                     delete_records('scorm_seq_rolluprulecond','scoid',$olditem->id);
                 }
             }
+            if (empty($scoes->version)) {
+                $scoes->version = 'SCORM_1.2';
+            }
             set_field('scorm','version',$scoes->version,'id',$scormid);
+            $scorm->version = $scoes->version;
         }
-    } 
-    
+    }
+
     return $launch;
 }
 
@@ -717,7 +721,7 @@
 }
 
 function scorm_find_common_ancestor($ancestors, $sco) {
-    $pos = scorm_array_search('identifier',$sco->parent,$ancestors); 
+    $pos = scorm_array_search('identifier',$sco->parent,$ancestors);
     if ($sco->parent != '/') {
         if ($pos === false) {
             return scorm_find_common_ancestor($ancestors,scorm_get_parent($sco));
@@ -732,14 +736,14 @@
  $objXML = new xml2Array();
  $arrOutput = $objXML->parse($strYourXML);
  print_r($arrOutput); //print it out, or do whatever!
-  
+
 */
 class xml2Array {
-   
+
    var $arrOutput = array();
    var $resParser;
    var $strXmlData;
-   
+
    /**
    * Convert a utf-8 string to html entities
    *
@@ -766,26 +770,26 @@
            $this->resParser = xml_parser_create ('UTF-8');
            xml_set_object($this->resParser,$this);
            xml_set_element_handler($this->resParser, "tagOpen", "tagClosed");
-           
+
            xml_set_character_data_handler($this->resParser, "tagData");
-       
+
            $this->strXmlData = xml_parse($this->resParser,$strInputXML );
            if(!$this->strXmlData) {
                die(sprintf("XML error: %s at line %d",
                            xml_error_string(xml_get_error_code($this->resParser)),
                            xml_get_current_line_number($this->resParser)));
            }
-                           
+
            xml_parser_free($this->resParser);
-           
+
            return $this->arrOutput;
    }
-   
+
    function tagOpen($parser, $name, $attrs) {
-       $tag=array("name"=>$name,"attrs"=>$attrs); 
+       $tag=array("name"=>$name,"attrs"=>$attrs);
        array_push($this->arrOutput,$tag);
    }
-   
+
    function tagData($parser, $tagData) {
        if(trim($tagData)) {
            if(isset($this->arrOutput[count($this->arrOutput)-1]['tagData'])) {
@@ -795,7 +799,7 @@
            }
        }
    }
-   
+
    function tagClosed($parser, $name) {
        $this->arrOutput[count($this->arrOutput)-2]['children'][] = $this->arrOutput[count($this->arrOutput)-1];
        array_pop($this->arrOutput);
Index: temp_moodle_dev/moodle/mod/scorm/datamodels/sequencinglib.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/scorm/datamodels/sequencinglib.php	(.../sequencinglib.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/scorm/datamodels/sequencinglib.php	(.../sequencinglib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -1628,7 +1628,7 @@
 	$sib = scorm_get_siblings($seq->currentactivity);
 	$pos = array_search($sib, $sco);
 
-	if (pos !== false){
+	if ($pos !== false){
 
 		$siblings = array_slice($sib, 0, $pos-1);
 
@@ -1853,9 +1853,9 @@
 		}
 		else{
 			$i=0;
-			while(i < sizeof($avchildren)){
-				if ($avchildren [i]->id == $constrained->id){
-					$seq->nextactivity = $avchildren [i+1];
+			while($i < sizeof($avchildren)){
+				if ($avchildren [$i]->id == $constrained->id){
+					$seq->nextactivity = $avchildren [$i+1];
 					return $seq;
 				}
 				else{
@@ -1880,8 +1880,8 @@
 		else{
 			$i=sizeof($avchildren)-1;
 			while($i >=0){
-				if ($avchildren [i]->id == $constrained->id){
-					$seq->nextactivity = $avchildren [i-1];
+				if ($avchildren [$i]->id == $constrained->id){
+					$seq->nextactivity = $avchildren [$i-1];
 					return $seq;
 				}
 				else{
@@ -2069,7 +2069,7 @@
 							$i = ($res->value)-1;
 							$children = scorm_get_children ($sco);
 
-							while (i>=0){
+							while ($i>=0){
 								$pos = array_rand($children);
 								array_push($childlist,$children [$pos]);
 								array_splice($children,$pos,1);
@@ -2113,7 +2113,7 @@
 							$i = sizeof($res)-1;
 							$children = $res->value;
 
-							while (i>=0){
+							while ($i>=0){
 								$pos = array_rand($children);
 								array_push($childlist,$children [$pos]);
 								array_splice($children,$pos,1);
@@ -2339,4 +2339,4 @@
 
 
 
-?>
\ No newline at end of file
+?>
Index: temp_moodle_dev/moodle/mod/scorm/db/access.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/scorm/db/access.php	(.../access.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/scorm/db/access.php	(.../access.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -75,8 +75,17 @@
             'editingteacher' => CAP_ALLOW,
             'admin' => CAP_ALLOW
         )
-    )
+    ),
+    'mod/scorm:deleteresponses' => array(
 
+        'captype' => 'read',
+        'contextlevel' => CONTEXT_MODULE,
+        'legacy' => array(
+            'teacher' => CAP_ALLOW,
+            'editingteacher' => CAP_ALLOW,
+            'admin' => CAP_ALLOW
+        )
+    )
 );
 
-?>
+?>
\ No newline at end of file
Index: temp_moodle_dev/moodle/mod/scorm/lib.php
===================================================================
diff -u -r17aeb24df970e8ef79a7872f4447e6e921dd2411 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/scorm/lib.php	(.../lib.php)	(revision 17aeb24df970e8ef79a7872f4447e6e921dd2411)
+++ temp_moodle_dev/moodle/mod/scorm/lib.php	(.../lib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -387,7 +387,7 @@
     }
 
     $timenow = time();
-    $updatetime = usergetmidnight($timenow, $sitetimezone) + ($CFG->scorm_updatetime * 3600);
+    $updatetime = usergetmidnight($timenow, $sitetimezone) + ($CFG->scorm_updatetimelast * 3600);
 
     if ($CFG->scorm_updatetimelast < $updatetime and $timenow > $updatetime) {
 
@@ -545,11 +545,12 @@
 }
 
 function scorm_option2text($scorm) {
-    global $SCORM_POPUP_OPTIONS;
+    $scorm_popoup_options = scorm_get_popup_options_array();
+
     if (isset($scorm->popup)) {
         if ($scorm->popup == 1) {
             $optionlist = array();
-            foreach ($SCORM_POPUP_OPTIONS as $name => $option) {
+            foreach ($scorm_popoup_options as $name => $option) {
                 if (isset($scorm->$name)) {
                     $optionlist[] = $name.'='.$scorm->$name;
                 } else {
Index: temp_moodle_dev/moodle/mod/scorm/loadSCO.php
===================================================================
diff -u -rd12b9e433f54f9f97f0c46aa03e3db09b9226233 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/scorm/loadSCO.php	(.../loadSCO.php)	(revision d12b9e433f54f9f97f0c46aa03e3db09b9226233)
+++ temp_moodle_dev/moodle/mod/scorm/loadSCO.php	(.../loadSCO.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -56,11 +56,11 @@
 
     if ($sco->scormtype == 'asset') {
        $attempt = scorm_get_last_attempt($scorm->id,$USER->id);
-       $element = $scorm->version == 'scorm_13'?'cmi.completion_status':'cmi.core.lesson_status';
+       $element = ($scorm->version == 'scorm_13' || $scorm->version == 'SCORM_1.3') ?'cmi.completion_status':'cmi.core.lesson_status';
        $value = 'completed';
        $result = scorm_insert_track($USER->id, $scorm->id, $sco->id, $attempt, $element, $value);
     }
-    
+
     //
     // Forge SCO URL
     //
@@ -76,7 +76,7 @@
             $sco->parameters = substr($sco->parameters,1);
         }
     }
-    
+
     if ($version == 'AICC') {
         if (isset($sco->parameters) && (!empty($sco->parameters))) {
             $sco->parameters = '&'. $sco->parameters;
@@ -89,7 +89,7 @@
             $launcher = $sco->launch;
         }
     }
-    
+
     if (scorm_external_link($sco->launch)) {
         // Remote learning activity
         $result = $launcher;
@@ -117,38 +117,81 @@
             }
         }
     }
-    
+
     $scormpixdir = $CFG->modpixpath.'/scorm/pix';
+
+    // which API are we looking for
+    $LMS_api = ($scorm->version == 'scorm_12' || $scorm->version == 'SCORM_1.2' || empty($scorm->version)) ? 'API' : 'API_1484_11';
 ?>
 <html>
     <head>
         <title>LoadSCO</title>
         <script type="text/javascript">
         //<![CDATA[
+        var apiHandle = null;
+        var findAPITries = 0;
+
+        function getAPIHandle() {
+           if (apiHandle == null) {
+              apiHandle = getAPI();
+           }
+           return apiHandle;
+        }
+
+        function findAPI(win) {
+           while ((win.<?php echo $LMS_api; ?> == null) && (win.parent != null) && (win.parent != win)) {
+              findAPITries++;
+              // Note: 7 is an arbitrary number, but should be more than sufficient
+              if (findAPITries > 7) {
+                 return null;
+              }
+              win = win.parent;
+           }
+           return win.<?php echo $LMS_api; ?>;
+        }
+
+        // hun for the API - needs to be loaded before we can launch the package
+        function getAPI() {
+           var theAPI = findAPI(window);
+           if ((theAPI == null) && (window.opener != null) && (typeof(window.opener) != "undefined")) {
+              theAPI = findAPI(window.opener);
+           }
+           if (theAPI == null) {
+              return null;
+           }
+           return theAPI;
+        }
+
         function doredirect() {
-            var e = document.getElementById("countdown");
-            var cSeconds = parseInt(e.innerHTML);
-            var timer = setInterval(function() {
-                                            if( cSeconds ) {
-                                                e.innerHTML = --cSeconds;
-                                            } else {
-                                                clearInterval(timer);
-                                                document.body.innerHTML = "<?php echo get_string('activitypleasewait', 'scorm');?>";
-                                                location = "<?php echo $result ?>";
-                                            }
-                                        }, 1000);
+            if (getAPI() != null) {
+                location = "<?php echo $result ?>";
+            }
+            else {
+                document.body.innerHTML = "<p><?php echo get_string('activityloading', 'scorm');?> <span id='countdown'><?php echo $delayseconds ?></span> <?php echo get_string('numseconds');?>. &nbsp; <img src='<?php echo $scormpixdir;?>/wait.gif'><p>";
+                var e = document.getElementById("countdown");
+                var cSeconds = parseInt(e.innerHTML);
+                var timer = setInterval(function() {
+                                                if( cSeconds && getAPI() == null ) {
+                                                    e.innerHTML = --cSeconds;
+                                                } else {
+                                                    clearInterval(timer);
+                                                    document.body.innerHTML = "<p><?php echo get_string('activitypleasewait', 'scorm');?></p>";
+                                                    location = "<?php echo $result ?>";
+                                                }
+                                            }, 1000);
+            }
         }
-        //]]>         
+        //]]>
         </script>
         <noscript>
-            <meta http-equiv="refresh" content="<?php echo $delayseconds ?>;url=<?php echo $result ?>" />
-        </noscript> 
+            <meta http-equiv="refresh" content="0;url=<?php echo $result ?>" />
+        </noscript>
     </head>
     <body onload="doredirect();">
-        <p><?php echo get_string('activityloading', 'scorm');?> <span id="countdown"><?php echo $delayseconds ?></span> <?php echo get_string('numseconds');?>. &nbsp; <img src='<?php echo $scormpixdir;?>/wait.gif'><p>
+        <p><?php echo get_string('activitypleasewait', 'scorm');?></p>
         <?php if (debugging('',DEBUG_DEVELOPER)) {
                   add_to_log($course->id, 'scorm', 'launch', 'view.php?id='.$cm->id, $result, $cm->id);
               }
         ?>
-    </body> 
-</html>
+    </body>
+</html>
\ No newline at end of file
Index: temp_moodle_dev/moodle/mod/scorm/locallib.php
===================================================================
diff -u -r146563e0853fa97dc0d4bab2214908820c71285a -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/scorm/locallib.php	(.../locallib.php)	(revision 146563e0853fa97dc0d4bab2214908820c71285a)
+++ temp_moodle_dev/moodle/mod/scorm/locallib.php	(.../locallib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -14,61 +14,112 @@
 define('GRADEHIGHEST', '1');
 define('GRADEAVERAGE', '2');
 define('GRADESUM', '3');
-$SCORM_GRADE_METHOD = array (GRADESCOES => get_string('gradescoes', 'scorm'),
-                             GRADEHIGHEST => get_string('gradehighest', 'scorm'),
-                             GRADEAVERAGE => get_string('gradeaverage', 'scorm'),
-                             GRADESUM => get_string('gradesum', 'scorm'));
 
 define('HIGHESTATTEMPT', '0');
 define('AVERAGEATTEMPT', '1');
 define('FIRSTATTEMPT', '2');
 define('LASTATTEMPT', '3');
-$SCORM_WHAT_GRADE = array (HIGHESTATTEMPT => get_string('highestattempt', 'scorm'),
-                           AVERAGEATTEMPT => get_string('averageattempt', 'scorm'),
-                           FIRSTATTEMPT => get_string('firstattempt', 'scorm'),
-                           LASTATTEMPT => get_string('lastattempt', 'scorm'));
 
-$SCORM_POPUP_OPTIONS = array('resizable'=>1, 
-                             'scrollbars'=>1, 
-                             'directories'=>0, 
-                             'location'=>0,
-                             'menubar'=>0, 
-                             'toolbar'=>0, 
-                             'status'=>0);
-$stdoptions = '';
-foreach ($SCORM_POPUP_OPTIONS as $popupopt => $value) {
-    $stdoptions .= $popupopt.'='.$value;
-    if ($popupopt != 'status') {
-        $stdoptions .= ',';
-    }
+/**
+ * Returns an array of the popup options for SCORM and each options default value
+ *
+ * @return array an array of popup options as the key and their defaults as the value
+ */
+function scorm_get_popup_options_array(){
+    global $CFG;
+    return array('resizable'=> isset($CFG->scorm_resizable) ? $CFG->scorm_resizable : 0,
+                 'scrollbars'=> isset($CFG->scorm_scrollbars) ? $CFG->scorm_scrollbars : 0,
+                 'directories'=> isset($CFG->scorm_directories) ? $CFG->scorm_directories : 0,
+                 'location'=> isset($CFG->scorm_location) ? $CFG->scorm_location : 0,
+                 'menubar'=> isset($CFG->scorm_menubar) ? $CFG->scorm_menubar : 0,
+                 'toolbar'=> isset($CFG->scorm_toolbar) ? $CFG->scorm_toolbar : 0,
+                 'status'=> isset($CFG->scorm_status) ? $CFG->scorm_status : 0);
 }
 
-if (!isset($CFG->scorm_maxattempts)) {
-    set_config('scorm_maxattempts','6');
+/// Local Library of functions for module scorm
+/**
+ * Returns an array of the array of what grade options
+ *
+ * @return array an array of what grade options
+ */
+function scorm_get_grade_method_array(){
+    return array (GRADESCOES => get_string('gradescoes', 'scorm'),
+                  GRADEHIGHEST => get_string('gradehighest', 'scorm'),
+                  GRADEAVERAGE => get_string('gradeaverage', 'scorm'),
+                  GRADESUM => get_string('gradesum', 'scorm'));
 }
 
-if (!isset($CFG->scorm_frameheight)) {
-    set_config('scorm_frameheight','500');
+/**
+ * Returns an array of the array of what grade options
+ *
+ * @return array an array of what grade options
+ */
+function scorm_get_what_grade_array(){
+    return array (HIGHESTATTEMPT => get_string('highestattempt', 'scorm'),
+                  AVERAGEATTEMPT => get_string('averageattempt', 'scorm'),
+                  FIRSTATTEMPT => get_string('firstattempt', 'scorm'),
+                  LASTATTEMPT => get_string('lastattempt', 'scorm'));
 }
 
-if (!isset($CFG->scorm_framewidth)) {
-    set_config('scorm_framewidth','100%');
+/**
+ * Returns an array of the array of skip view options
+ *
+ * @return array an array of skip view options
+ */
+function scorm_get_skip_view_array(){
+   return array(0 => get_string('never'),
+                 1 => get_string('firstaccess','scorm'),
+                 2 => get_string('always'));
 }
 
-if (!isset($CFG->scorm_updatetime)) {
-    set_config('scorm_updatetime','2');
+/**
+ * Returns an array of the array of hide table of contents options
+ *
+ * @return array an array of hide table of contents options
+ */
+function scorm_get_hidetoc_array(){
+     return array(0 =>get_string('sided','scorm'),
+                  1 => get_string('hidden','scorm'),
+                  2 => get_string('popupmenu','scorm'));
 }
 
-if (!isset($CFG->scorm_advancedsettings)) {
-    set_config('scorm_advancedsettings','0');
+/**
+ * Returns an array of the array of update frequency options
+ *
+ * @return array an array of update frequency options
+ */
+function scorm_get_updatefreq_array(){
+    return array(0 => get_string('never'),
+                 1 => get_string('everyday','scorm'),
+                 2 => get_string('everytime','scorm'));
 }
 
-if (!isset($CFG->scorm_windowsettings)) {
-    set_config('scorm_windowsettings','0');
+/**
+ * Returns an array of the array of popup display options
+ *
+ * @return array an array of popup display options
+ */
+function scorm_get_popup_display_array(){
+    return array(0 => get_string('iframe', 'scorm'),
+                 1 => get_string('popup', 'scorm'));
 }
 
-/// Local Library of functions for module scorm
+/**
+ * Returns an array of the array of attempt options
+ *
+ * @return array an array of attempt options
+ */
+function scorm_get_attempts_array(){
+    $attempts = array(0 => get_string('nolimit','scorm'),
+                      1 => get_string('attempt1','scorm'));
 
+    for ($i=2; $i<=6; $i++) {
+        $attempts[$i] = get_string('attemptsx','scorm', $i);
+    }
+
+    return $attempts;
+}
+
 /**
 * This function will permanently delete the given
 * directory and all files and subdirectories.
@@ -140,7 +191,7 @@
                     }
                     $randstring .= $char;
                     $lchar = $char;
-            } 
+            }
             $datadir='/'.$randstring;
         } while (file_exists($strPath.$datadir));
         mkdir($strPath.$datadir, $CFG->directorypermissions);
@@ -208,7 +259,7 @@
                 $sco->{$scodata->name} = $scodata->value;
             }
         } else if (($what != SCO_ONLY) && (!($scodatas = get_records('scorm_scoes_data','scoid',$id)))) {
-            $sco->parameters = ''; 
+            $sco->parameters = '';
         }
         return $sco;
     } else {
@@ -248,7 +299,7 @@
 function scorm_insert_track($userid,$scormid,$scoid,$attempt,$element,$value) {
     $id = null;
     if ($track = get_record_select('scorm_scoes_track',"userid='$userid' AND scormid='$scormid' AND scoid='$scoid' AND attempt='$attempt' AND element='$element'")) {
-        $track->value = $value;
+        $track->value = addslashes_js($value);
         $track->timemodified = time();
         $id = update_record('scorm_scoes_track',$track);
     } else {
@@ -257,23 +308,19 @@
         $track->scoid = $scoid;
         $track->attempt = $attempt;
         $track->element = $element;
-        $track->value = addslashes($value);
+        $track->value = addslashes_js($value);
         $track->timemodified = time();
         $id = insert_record('scorm_scoes_track',$track);
     }
-    
-    // MDL-9552, update the gradebook everything raw score is sent
-    // Scoring by learning objects also needs to be included in the gradebook update
-    if (strstr($element, '.score.raw') || 
+
+    if (strstr($element, '.score.raw') ||
         (($element == 'cmi.core.lesson_status' || $element == 'cmi.completion_status') && ($track->value == 'completed' || $track->value == 'passed'))) {
         $scorm = get_record('scorm', 'id', $scormid);
         $grademethod = $scorm->grademethod % 10;
-        if (strstr($element, '.score.raw') || $grademethod == GRADESCOES) {
-            include_once('lib.php');
-            scorm_update_grades($scorm, $userid);
-        }
+        include_once('lib.php');
+        scorm_update_grades($scorm, $userid);
     }
-    
+
     return $id;
 }
 
@@ -291,7 +338,7 @@
     $attemptsql = ' AND attempt=' . $attempt;
     if ($tracks = get_records_select('scorm_scoes_track',"userid=$userid AND scoid=$scoid".$attemptsql,'element ASC')) {
         $usertrack->userid = $userid;
-        $usertrack->scoid = $scoid; 
+        $usertrack->scoid = $scoid;
         // Defined in order to unify scorm1.2 and scorm2004
         $usertrack->score_raw = '';
         $usertrack->status = '';
@@ -300,33 +347,37 @@
         $usertrack->timemodified = 0;
         foreach ($tracks as $track) {
             $element = $track->element;
+            $track->value = stripslashes_safe($track->value);
             $usertrack->{$element} = $track->value;
             switch ($element) {
+                case 'x.start.time':
+                    $usertrack->x_start_time = $track->value;
+                    break;
                 case 'cmi.core.lesson_status':
                 case 'cmi.completion_status':
                     if ($track->value == 'not attempted') {
                         $track->value = 'notattempted';
-                    }       
+                    }
                     $usertrack->status = $track->value;
-                break;  
+                break;
                 case 'cmi.core.score.raw':
                 case 'cmi.score.raw':
-                    $usertrack->score_raw = $track->value;
-                break;  
+                    $usertrack->score_raw = sprintf('%0d', $track->value);
+                    break;
                 case 'cmi.core.session_time':
                 case 'cmi.session_time':
                     $usertrack->session_time = $track->value;
-                break;  
+                break;
                 case 'cmi.core.total_time':
                 case 'cmi.total_time':
                     $usertrack->total_time = $track->value;
-                break;  
-            }       
+                break;
+            }
             if (isset($track->timemodified) && ($track->timemodified > $usertrack->timemodified)) {
                 $usertrack->timemodified = $track->timemodified;
-            }       
+            }
         }
-        if (is_array($usertrack)) {       
+        if (is_array($usertrack)) {
             ksort($usertrack);
         }
         return $usertrack;
@@ -335,6 +386,45 @@
     }
 }
 
+/* Find the start and finsh time for a a given SCO attempt
+ *
+ * @param int $scormid SCORM Id
+ * @param int $scoid SCO Id
+ * @param int $userid User Id
+ * @param int $attemt Attempt Id
+ *
+ * @return object start and finsh time EPOC secods
+ *
+ */
+function scorm_get_sco_runtime($scormid, $scoid, $userid, $attempt=1) {
+
+    $timedata = new object();
+    $sql = !empty($scoid) ? "userid=$userid AND scormid=$scormid AND scoid=$scoid AND attempt=$attempt" : "userid=$userid AND scormid=$scormid AND attempt=$attempt";
+    $tracks = get_records_select('scorm_scoes_track',"$sql ORDER BY timemodified ASC");
+    if ($tracks) {
+        $tracks = array_values($tracks);
+    }
+
+    if ($start_track = get_records_select('scorm_scoes_track',"$sql AND element='x.start.time' ORDER BY scoid ASC")) {
+        $start_track = array_values($start_track);
+        $timedata->start = $start_track[0]->value;
+    }
+    else if ($tracks) {
+        $timedata->start = $tracks[0]->timemodified;
+    }
+    else {
+        $timedata->start = false;
+    }
+    if ($tracks && $track = array_pop($tracks)) {
+        $timedata->finish = $track->timemodified;
+    }
+    else {
+        $timedata->finish = $timedata->start;
+    }
+    return $timedata;
+}
+
+
 function scorm_get_user_data($userid) {
 /// Gets user info required to display the table of scorm results
 /// for report.php
@@ -343,13 +433,13 @@
 }
 
 function scorm_grade_user_attempt($scorm, $userid, $attempt=1, $time=false) {
-    $attemptscore = NULL; 
+    $attemptscore = NULL;
     $attemptscore->scoes = 0;
     $attemptscore->values = 0;
     $attemptscore->max = 0;
     $attemptscore->sum = 0;
     $attemptscore->lastmodify = 0;
-    
+
     if (!$scoes = get_records('scorm_scoes','scorm',$scorm->id)) {
         return NULL;
     }
@@ -359,11 +449,11 @@
     // and 1s are grademethod
     $grademethod = $scorm->grademethod % 10;
 
-    foreach ($scoes as $sco) { 
+    foreach ($scoes as $sco) {
         if ($userdata = scorm_get_tracks($sco->id, $userid, $attempt)) {
             if (($userdata->status == 'completed') || ($userdata->status == 'passed')) {
                 $attemptscore->scoes++;
-            }       
+            }
             if (!empty($userdata->score_raw)) {
                 $attemptscore->values++;
                 $attemptscore->sum += $userdata->score_raw;
@@ -373,23 +463,23 @@
                 } else {
                     $attemptscore->lastmodify = 0;
                 }
-            }       
-        }       
+            }
+        }
     }
     switch ($grademethod) {
         case GRADEHIGHEST:
             $score = $attemptscore->max;
-        break;  
+        break;
         case GRADEAVERAGE:
             if ($attemptscore->values > 0) {
                 $score = $attemptscore->sum/$attemptscore->values;
             } else {
                 $score = 0;
-            }       
-        break;  
+            }
+        break;
         case GRADESUM:
             $score = $attemptscore->sum;
-        break;  
+        break;
         case GRADESCOES:
             $score = $attemptscore->scoes;
         break;
@@ -413,17 +503,17 @@
     // and so whatgrade and grademethod are combined in grademethod 10s are whatgrade
     // and 1s are grademethod
     $whatgrade = intval($scorm->grademethod / 10);
-    
+
     // insure we dont grade user beyond $scorm->maxattempt settings
     $lastattempt = scorm_get_last_attempt($scorm->id, $userid);
     if($scorm->maxattempt != 0 && $lastattempt >= $scorm->maxattempt){
         $lastattempt = $scorm->maxattempt;
     }
-    
+
     switch ($whatgrade) {
         case FIRSTATTEMPT:
             return scorm_grade_user_attempt($scorm, $userid, 1, $time);
-        break;    
+        break;
         case LASTATTEMPT:
             return scorm_grade_user_attempt($scorm, $userid, scorm_get_last_attempt($scorm->id, $userid), $time);
         break;
@@ -508,7 +598,7 @@
 
     echo '<div class="mod-scorm">';
     if ($scorms = get_all_instances_in_course('scorm', $course)) {
-        // The module SCORM activity with the least id is the course  
+        // The module SCORM activity with the least id is the course
         $scorm = current($scorms);
         if (! $cm = get_coursemodule_from_instance('scorm', $scorm->id, $course->id)) {
             error('Course Module ID was incorrect');
@@ -534,7 +624,7 @@
                 $headertext .= '<td class="reportlink">'.get_string('noreports','scorm');
             }
             $colspan = ' colspan="2"';
-        } 
+        }
         $headertext .= '</td></tr><tr><td'.$colspan.'>'.format_text(get_string('summary').':<br />'.$scorm->summary).'</td></tr></table>';
         print_simple_box($headertext,'','100%');
         scorm_view_display($user, $scorm, 'view.php?id='.$course->id, $cm, '100%');
@@ -639,24 +729,27 @@
 <?php
 }
 function scorm_simple_play($scorm,$user) {
-   $result = false;
-  
-   $scoes = get_records_select('scorm_scoes','scorm='.$scorm->id.' AND launch<>\''.sql_empty().'\'');
-   
-   if ($scoes && (count($scoes) == 1)) {
-       if ($scorm->skipview >= 1) {
-           $sco = current($scoes);
-           //lams: we pass a new variable (editing) to the function so the page player.php can know we are editing or ot in aim to display the correct lams' button
-           if (scorm_get_tracks($sco->id,$user->id) === false) {
-               header('Location: player.php?a='.$scorm->id.'&scoid='.$sco->id.'&editing='.$editing);
-               $result = true;
-           } else if ($scorm->skipview == 2) {
-               header('Location: player.php?a='.$scorm->id.'&scoid='.$sco->id.'&editing='.$editing);
-               $result = true;
-           }
-       }
-   }
-   return $result;
+    $result = false;
+
+    if ($scorm->updatefreq == UPDATE_EVERYTIME) {
+        scorm_parse($scorm);
+    }
+
+    $scoes = get_records_select('scorm_scoes','scorm='.$scorm->id.' AND launch<>\''.sql_empty().'\'');
+
+    if ($scoes) {
+        if ($scorm->skipview >= 1) {
+            $sco = current($scoes);
+            if (scorm_get_tracks($sco->id,$user->id) === false) {
+                header('Location: player.php?a='.$scorm->id.'&scoid='.$sco->id.'&editing='.$editing);
+                $result = true;
+            } else if ($scorm->skipview == 2) {
+                header('Location: player.php?a='.$scorm->id.'&scoid='.$sco->id.'&editing='.$editing);
+                $result = true;
+            }
+        }
+    }
+    return $result;
 }
 /*
 function scorm_simple_play($scorm,$user) {
@@ -770,7 +863,7 @@
     }
     $reference = $data['reference'];              // Package/manifest path/location
 
-    $scormid = $data['instance'];                 // scorm ID 
+    $scormid = $data['instance'];                 // scorm ID
     $scorm = new stdClass();
     if (!empty($scormid)) {
         if (!$scorm = get_record('scorm','id',$scormid)) {
@@ -834,7 +927,7 @@
                             $validation->result = false;
                         }
                     break;
-                    default: 
+                    default:
                         $validation->errors['reference'] = get_string('badpackage','scorm');
                         $validation->result = false;
                     break;
@@ -858,9 +951,11 @@
 function scorm_check_package($data) {
     global $CFG, $COURSE;
 
+    require_once($CFG->libdir.'/filelib.php');
+
     $courseid = $data->course;                  // Course Module ID
     $reference = $data->reference;              // Package path
-    $scormid = $data->instance;                 // scorm ID 
+    $scormid = $data->instance;                 // scorm ID
 
     $validation = new stdClass();
 
@@ -882,24 +977,27 @@
             $reference = $CFG->dataroot.'/'.$courseid.'/'.$reference;
         }
 
-        if (!empty($scormid)) {  
+        if (!empty($scormid)) {
         //
         // SCORM Update
         //
             if ((!empty($validation)) && (is_file($reference) || $externalpackage)){
-                
+
                 if (!$externalpackage) {
                     $mdcheck = md5_file($reference);
                 } else if ($externalpackage){
                     if ($scormdir = make_upload_directory("$courseid/$CFG->moddata/scorm")) {
                         if ($tempdir = scorm_tempdir($scormdir)) {
-                            copy ("$reference", $tempdir.'/'.basename($reference));
+                            $content = download_file_content($reference);
+                            $file = fopen($tempdir.'/'.basename($reference), 'x');
+                            fwrite($file, $content);
+                            fclose($file);
                             $mdcheck = md5_file($tempdir.'/'.basename($reference));
                             scorm_delete_files($tempdir);
                         }
                     }
                 }
-                
+
                 if ($scorm = get_record('scorm','id',$scormid)) {
                     if ($scorm->reference[0] == '#') {
                         if (isset($CFG->repositoryactivate) && $CFG->repositoryactivate) {
@@ -945,7 +1043,14 @@
                     $scormdir = '';
                     if ($scormdir = make_upload_directory("$courseid/$CFG->moddata/scorm")) {
                         if ($tempdir = scorm_tempdir($scormdir)) {
-                            copy ("$reference", $tempdir.'/'.basename($reference));
+                            if ($externalpackage){
+                                $content = download_file_content($reference);
+                                $file = fopen($tempdir.'/'.basename($reference), 'x');
+                                fwrite($file, $content);
+                                fclose($file);
+                            } else {
+                                copy ("$reference", $tempdir.'/'.basename($reference));
+                            }
                             unzip_file($tempdir.'/'.basename($reference), $tempdir, false);
                             if (!$externalpackage) {
                                 unlink ($tempdir.'/'.basename($reference));
@@ -969,7 +1074,10 @@
                         if ($externalpackage) {
                             if ($scormdir = make_upload_directory("$courseid/$CFG->moddata/scorm")) {
                                 if ($tempdir = scorm_tempdir($scormdir)) {
-                                    copy ("$reference", $tempdir.'/'.basename($reference));
+                                    $content = download_file_content($reference);
+                                    $file = fopen($tempdir.'/'.basename($reference), 'x');
+                                    fwrite($file, $content);
+                                    fclose($file);
                                     if (is_file($tempdir.'/'.basename($reference))) {
                                         $validation = scorm_validate_manifest($tempdir.'/'.basename($reference));
                                     } else {
@@ -985,7 +1093,7 @@
                         $validation = null;
                     }
                 break;
-                default: 
+                default:
                     $validation = null;
                 break;
             }
@@ -1011,23 +1119,23 @@
 
 
 function scorm_get_count_users($scormid, $groupingid=null) {
-    
+
     global $CFG;
-    
+
     if (!empty($CFG->enablegroupings) && !empty($groupingid)) {
         $sql = "SELECT COUNT(DISTINCT st.userid)
                 FROM {$CFG->prefix}scorm_scoes_track st
                     INNER JOIN {$CFG->prefix}groups_members gm ON st.userid = gm.userid
-                    INNER JOIN {$CFG->prefix}groupings_groups gg ON gm.groupid = gg.groupid 
+                    INNER JOIN {$CFG->prefix}groupings_groups gg ON gm.groupid = gg.groupid
                 WHERE st.scormid = $scormid AND gg.groupingid = $groupingid
                 ";
     } else {
         $sql = "SELECT COUNT(DISTINCT st.userid)
-                FROM {$CFG->prefix}scorm_scoes_track st 
+                FROM {$CFG->prefix}scorm_scoes_track st
                 WHERE st.scormid = $scormid
                 ";
     }
-    
+
     return(count_records_sql($sql));
 }
 
@@ -1039,26 +1147,26 @@
 * @param string $element_name Name of array element to get values for
 * @param array $children list of sub elements of this array element that also need instantiating
 * @return None
-*/   
+*/
 function scorm_reconstitute_array_element($sversion, $userdata, $element_name, $children) {
     // reconstitute comments_from_learner and comments_from_lms
     $current = '';
     $current_subelement = '';
     $current_sub = '';
     $count = 0;
     $count_sub = 0;
-    
+
     // filter out the ones we want
     $element_list = array();
     foreach($userdata as $element => $value){
         if (substr($element,0,strlen($element_name)) == $element_name) {
             $element_list[$element] = $value;
         }
     }
-    
+
     // sort elements in .n array order
     uksort($element_list, "scorm_element_cmp");
-    
+
     // generate JavaScript
     foreach($element_list as $element => $value){
         if ($sversion == 'scorm_13') {
@@ -1072,7 +1180,7 @@
             if ($count_sub > 0) {
                 echo '    '.$element_name.'_'.$current.'.'.$current_subelement.'._count = '.$count_sub.";\n";
             }
-            $current = $matches[1];            
+            $current = $matches[1];
             $count++;
             $current_subelement = '';
             $current_sub = '';
@@ -1086,7 +1194,7 @@
                 echo '    '.$subelement.".".$child."._children = ".$child."_children;\n";
             }
         }
-        
+
         // now - flesh out the second level elements if there are any
         if ($sversion == 'scorm_13') {
             $element = preg_replace('/(.*?\.N\d+\..*?)\.(\d+)\./', "\$1.N\$2.", $element);
@@ -1095,7 +1203,7 @@
             $element = preg_replace('/(.*?\_\d+\..*?)\.(\d+)\./', "\$1_\$2.", $element);
             preg_match('/.*?\_\d+\.(.*?)\_(\d+)\./', $element, $matches);
         }
-        
+
         // check the sub element type
         if (count($matches) > 0 && $current_subelement != $matches[1]) {
             if ($count_sub > 0) {
@@ -1108,16 +1216,16 @@
             $subelement = substr($element,0,$end);
             echo '    '.$subelement." = new Object();\n";
         }
-        
+
         // now check the subelement subscript
         if (count($matches) > 0 && $current_sub != $matches[2]) {
-            $current_sub = $matches[2];            
+            $current_sub = $matches[2];
             $count_sub++;
             $end = strrpos($element,$matches[2])+strlen($matches[2]);
             $subelement = substr($element,0,$end);
             echo '    '.$subelement." = new Object();\n";
         }
-        
+
         echo '    '.$element.' = \''.$value."';\n";
     }
     if ($count_sub > 0) {
@@ -1134,7 +1242,7 @@
 * @param string $a left array element
 * @param string $b right array element
 * @return comparator - 0,1,-1
-*/   
+*/
 function scorm_element_cmp($a, $b) {
     preg_match('/.*?(\d+)\./', $a, $matches);
     $left = intval($matches[1]);
@@ -1170,4 +1278,51 @@
     }
 }
 
+/**
+* Delete Scorm tracks for selected users
+*
+* @param array $attemptids list of attempts that need to be deleted
+* @param int $scormid ID of Scorm
+*
+* return bool true deleted all responses, false failed deleting an attempt - stopped here
+*/
+function scorm_delete_responses($attemptids, $scormid) {
+    if(!is_array($attemptids) || empty($attemptids)) {
+        return false;
+    }
+
+    foreach($attemptids as $num => $attemptid) {
+        if(empty($attemptid)) {
+            unset($attemptids[$num]);
+        }
+    }
+
+    foreach($attemptids as $attempt) {
+        $keys = explode(':', $attempt);
+        if (count($keys) == 2) {
+            $userid = clean_param($keys[0], PARAM_INT);
+            $attemptid = clean_param($keys[1], PARAM_INT);
+            if (!$userid || !$attemptid || !scorm_delete_attempt($userid, $scormid, $attemptid)) {
+                    return false;
+            }
+        } else {
+            return false;
+        }
+    }
+    return true;
+}
+
+/**
+* Delete Scorm tracks for selected users
+*
+* @param int $userid ID of User
+* @param int $scormid ID of Scorm
+* @param int $attemptid user attempt that need to be deleted
+*
+* return bool true suceeded
+*/
+function scorm_delete_attempt($userid, $scormid, $attemptid) {
+    delete_records('scorm_scoes_track', 'userid', $userid, 'scormid', $scormid, 'attempt', $attemptid);
+    return true;
+}
 ?>
\ No newline at end of file
Index: temp_moodle_dev/moodle/mod/scorm/mod_form.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/scorm/mod_form.php	(.../mod_form.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/scorm/mod_form.php	(.../mod_form.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -6,11 +6,15 @@
 
     function definition() {
 
-        global $CFG, $COURSE, $SCORM_GRADE_METHOD, $SCORM_WHAT_GRADE;
+        global $CFG, $COURSE;
         $mform    =& $this->_form;
         if (isset($CFG->slasharguments) && !$CFG->slasharguments) {
             $mform->addElement('static', '', '',notify(get_string('slashargs', 'scorm'), 'notifyproblem', 'center', true));
         }
+        $zlib = ini_get('zlib.output_compression'); //check for zlib compression - if used, throw error because of IE bug. - SEE MDL-16185
+        if (isset($zlib) && $zlib) {
+            $mform->addElement('static', '', '',notify(get_string('zlibwarning', 'scorm'), 'notifyproblem', 'center', true));
+        }
 //-------------------------------------------------------------------------------
         $mform->addElement('header', 'general', get_string('general', 'form'));
 
@@ -40,39 +44,31 @@
         $mform->addElement('header', 'advanced', get_string('othersettings', 'form'));
 
 // Grade Method
-        $mform->addElement('select', 'grademethod', get_string('grademethod', 'scorm'), $SCORM_GRADE_METHOD);
+        $mform->addElement('select', 'grademethod', get_string('grademethod', 'scorm'), scorm_get_grade_method_array());
         $mform->setHelpButton('grademethod', array('grademethod',get_string('grademethod', 'scorm'),'scorm'));
-        $mform->setDefault('grademethod', 0);
+        $mform->setDefault('grademethod', $CFG->scorm_grademethod);
 
 // Maximum Grade
         for ($i=0; $i<=100; $i++) {
           $grades[$i] = "$i";
         }
         $mform->addElement('select', 'maxgrade', get_string('maximumgrade'), $grades);
-        $mform->setDefault('maxgrade', 0);
+        $mform->setDefault('maxgrade', $CFG->scorm_maxgrade);
         $mform->disabledIf('maxgrade', 'grademethod','eq',GRADESCOES);
 
 // Attempts
         $mform->addElement('static', '', '' ,'<hr />');
 
 // Max Attempts
-        $attempts = array(0 => get_string('nolimit','scorm'));
-        for ($i=1; $i<=$CFG->scorm_maxattempts; $i++) {
-            if ($i == 1) {
-                $attempts[$i] = get_string('attempt1','scorm');
-            } else {
-                $attempts[$i] = get_string('attemptsx','scorm', $i);
-            }
-        }
-        $mform->addElement('select', 'maxattempt', get_string('maximumattempts', 'scorm'), $attempts);
+        $mform->addElement('select', 'maxattempt', get_string('maximumattempts', 'scorm'), scorm_get_attempts_array());
         $mform->setHelpButton('maxattempt', array('maxattempt',get_string('maximumattempts', 'scorm'), 'scorm'));
-        $mform->setDefault('maxattempt', 1);
+        $mform->setDefault('maxattempt', $CFG->scorm_maxattempts);
 
 // What Grade
-        $mform->addElement('select', 'whatgrade', get_string('whatgrade', 'scorm'), $SCORM_WHAT_GRADE);
+        $mform->addElement('select', 'whatgrade', get_string('whatgrade', 'scorm'), scorm_get_what_grade_array());
         $mform->disabledIf('whatgrade', 'maxattempt','eq',1);
         $mform->setHelpButton('whatgrade', array('whatgrade',get_string('whatgrade', 'scorm'), 'scorm'));
-        $mform->setDefault('whatgrade', 0);
+        $mform->setDefault('whatgrade', $CFG->scorm_whatgrade);
         $mform->setAdvanced('whatgrade');
 
 // Activation period
@@ -109,77 +105,51 @@
         $mform->setType('height', PARAM_INT);
 
 // Framed / Popup Window
-        $options = array();
-        $options[0] = get_string('iframe', 'scorm');
-        $options[1] = get_string('popup', 'scorm');
-        $mform->addElement('select', 'popup', get_string('display','scorm'), $options);
-        $mform->setDefault('popup', 0);
+        $mform->addElement('select', 'popup', get_string('display','scorm'), scorm_get_popup_display_array());
+        $mform->setDefault('popup', $CFG->scorm_popup);
         $mform->setAdvanced('popup');
 
 // Window Options
         $winoptgrp = array();
-        $winoptgrp[] = &$mform->createElement('checkbox', 'resizable', '', get_string('resizable', 'scorm'));
-        $winoptgrp[] = &$mform->createElement('checkbox', 'scrollbars', '', get_string('scrollbars', 'scorm'));
-        $winoptgrp[] = &$mform->createElement('checkbox', 'directories', '', get_string('directories', 'scorm'));
-        $winoptgrp[] = &$mform->createElement('checkbox', 'location', '', get_string('location', 'scorm'));
-        $winoptgrp[] = &$mform->createElement('checkbox', 'menubar', '', get_string('menubar', 'scorm'));
-        $winoptgrp[] = &$mform->createElement('checkbox', 'toolbar', '', get_string('toolbar', 'scorm'));
-        $winoptgrp[] = &$mform->createElement('checkbox', 'status', '', get_string('status', 'scorm'));
+        foreach(scorm_get_popup_options_array() as $key => $value){
+            $winoptgrp[] = &$mform->createElement('checkbox', $key, '', get_string($key, 'scorm'));
+            $mform->setDefault($key, $value);
+        }
         $mform->addGroup($winoptgrp, 'winoptgrp', get_string('options','scorm'), '<br />', false);
-        $mform->setDefault('resizable', 1);
-        $mform->setDefault('scrollbars', 1);
-        $mform->setDefault('directories', 0);
-        $mform->setDefault('location', 0);
-        $mform->setDefault('menubar', 0);
-        $mform->setDefault('toolbar', 0);
-        $mform->setDefault('status', 0);
         $mform->setAdvanced('winoptgrp');
         $mform->disabledIf('winoptgrp', 'popup', 'eq', 0);
 
 // Skip view page
-        $options = array();
-        $options[0]=get_string('never');
-        $options[1]=get_string('firstaccess','scorm');
-        $options[2]=get_string('always');
-        $mform->addElement('select', 'skipview', get_string('skipview', 'scorm'), $options);
+        $mform->addElement('select', 'skipview', get_string('skipview', 'scorm'), scorm_get_skip_view_array());
         $mform->setHelpButton('skipview', array('skipview',get_string('skipview', 'scorm'), 'scorm'));
-        $mform->setDefault('skipview', 1);
+        $mform->setDefault('skipview', $CFG->scorm_skipview);
         $mform->setAdvanced('skipview');
 
 // Hide Browse
         $mform->addElement('selectyesno', 'hidebrowse', get_string('hidebrowse', 'scorm'));
         $mform->setHelpButton('hidebrowse', array('hidebrowse',get_string('hidebrowse', 'scorm'), 'scorm'));
-        $mform->setDefault('hidebrowse', 0);
+        $mform->setDefault('hidebrowse', $CFG->scorm_hidebrowse);
         $mform->setAdvanced('hidebrowse');
 
 // Toc display
-        $options = array();
-        $options[1]=get_string('hidden','scorm');
-        $options[0]=get_string('sided','scorm');
-        $options[2]=get_string('popupmenu','scorm');
-        $mform->addElement('select', 'hidetoc', get_string('hidetoc', 'scorm'), $options);
-        $mform->setDefault('hidetoc', 0);
+        $mform->addElement('select', 'hidetoc', get_string('hidetoc', 'scorm'), scorm_get_hidetoc_array());
+        $mform->setDefault('hidetoc', $CFG->scorm_hidetoc);
         $mform->setAdvanced('hidetoc');
 
 // Hide Navigation panel
         $mform->addElement('selectyesno', 'hidenav', get_string('hidenav', 'scorm'));
-        $mform->setDefault('hidenav', 0);
+        $mform->setDefault('hidenav', $CFG->scorm_hidenav);
         $mform->setAdvanced('hidenav');
 
 // Autocontinue
         $mform->addElement('selectyesno', 'auto', get_string('autocontinue', 'scorm'));
         $mform->setHelpButton('auto', array('autocontinue',get_string('autocontinue', 'scorm'), 'scorm'));
-        $mform->setDefault('auto', 0);
+        $mform->setDefault('auto', $CFG->scorm_auto);
         $mform->setAdvanced('auto');
 
 // Update packages timing
-        $options = array();
-        $options[0]=get_string('never');
-        // $options[1]=get_string('onchanges','scorm'); - nolonger required, but dont change the sequence
-        $options[2]=get_string('everyday','scorm');
-        $options[3]=get_string('everytime','scorm');
-        $mform->addElement('select', 'updatefreq', get_string('updatefreq', 'scorm'), $options);
-        $mform->setDefault('updatefreq', 0);
+        $mform->addElement('select', 'updatefreq', get_string('updatefreq', 'scorm'), scorm_get_updatefreq_array());
+        $mform->setDefault('updatefreq', $CFG->scorm_updatefreq);
         $mform->setAdvanced('updatefreq');
 
 //-------------------------------------------------------------------------------
@@ -207,11 +177,13 @@
         global $COURSE;
 
         if (isset($default_values['popup']) && ($default_values['popup'] == 1) && isset($default_values['options'])) {
-            $options = explode(',',$default_values['options']);
-            foreach ($options as $option) {
-                list($element,$value) = explode('=',$option);
-                $element = trim($element);
-                $default_values[$element] = trim($value); 
+            if (!empty($default_values['options'])) {
+                $options = explode(',',$default_values['options']);
+                foreach ($options as $option) {
+                    list($element,$value) = explode('=',$option);
+                    $element = trim($element);
+                    $default_values[$element] = trim($value); 
+                }
             }
         }
         if (isset($default_values['grademethod'])) {
Index: temp_moodle_dev/moodle/mod/scorm/player.php
===================================================================
diff -u -r78055c8ef63fbfbae43b081b741dbe922a5cba36 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/scorm/player.php	(.../player.php)	(revision 78055c8ef63fbfbae43b081b741dbe922a5cba36)
+++ temp_moodle_dev/moodle/mod/scorm/player.php	(.../player.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -331,6 +331,9 @@
                     </iframe>
                     </noscript>
 <?php            
+            //Added incase javascript popups are blocked
+            $link = '<a href="'.$CFG->wwwroot.'/mod/scorm/loadSCO.php?id='.$cm->id.$scoidstr.$modestr.'" target="new">'.get_string('popupblockedlinkname','scorm').'</a>';
+            print_simple_box(get_string('popupblocked','scorm',$link),'center');         
         }
     } else {
         print_simple_box(get_string('noprerequisites','scorm'),'center');
Index: temp_moodle_dev/moodle/mod/scorm/report.php
===================================================================
diff -u -rf542d2691eb2d6e19fdad2b2a7f6af436f95eba8 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/scorm/report.php	(.../report.php)	(revision f542d2691eb2d6e19fdad2b2a7f6af436f95eba8)
+++ temp_moodle_dev/moodle/mod/scorm/report.php	(.../report.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -10,6 +10,8 @@
     $b = optional_param('b', '', PARAM_INT);     // SCO ID
     $user = optional_param('user', '', PARAM_INT);  // User ID
     $attempt = optional_param('attempt', '1', PARAM_INT);  // attempt number
+    $action     = optional_param('action', '', PARAM_ALPHA);
+    $attemptids = optional_param('attemptid', array(), PARAM_RAW); //get array of responses to delete.
 
     if (!empty($id)) {
         if (! $cm = get_coursemodule_from_id('scorm', $id)) {
@@ -43,10 +45,10 @@
 
     require_login($course->id, false, $cm);
 
-    if (!has_capability('mod/scorm:viewreport', get_context_instance(CONTEXT_MODULE,$cm->id))) {
-        error('You are not allowed to use this script');
-    }
+    $contextmodule = get_context_instance(CONTEXT_MODULE,$cm->id);
 
+    require_capability('mod/scorm:viewreport', $contextmodule);
+
     add_to_log($course->id, 'scorm', 'report', 'report.php?id='.$cm->id, $scorm->id, $cm->id);
 
     if (!empty($user)) {
@@ -63,10 +65,10 @@
         $strreport  = get_string('report', 'scorm');
         $strattempt  = get_string('attempt', 'scorm');
         $strname  = get_string('name');
-        
+
         if (empty($b)) {
             if (empty($a)) {
-                $navigation = build_navigation('', $cm);
+                $navigation = build_navigation($strreport, $cm);
                 //if is_lams=1 hide Moodle's headers
                 if($scorm->is_lams==0){
                 print_header("$course->shortname: ".format_string($scorm->name), $course->fullname,$navigation,
@@ -75,9 +77,9 @@
                 	print_header();
                 }
             } else {
-                
+
                 $navlinks = array();
-                $navlinks[] = array('name' => $strreport, 'link' => "report.php?id=$cm->id", 'type' => 'title');    
+                $navlinks[] = array('name' => $strreport, 'link' => "report.php?id=$cm->id", 'type' => 'title');
                 $navlinks[] = array('name' => "$strattempt $attempt - ".fullname($userdata), 'link' => '', 'type' => 'title');
                 $navigation = build_navigation($navlinks, $cm);
                 //if is_lams=1 hide Moodle's headers
@@ -91,7 +93,7 @@
         } else {
 
             $navlinks = array();
-            $navlinks[] = array('name' => $strreport, 'link' => "report.php?id=$cm->id", 'type' => 'title');    
+            $navlinks[] = array('name' => $strreport, 'link' => "report.php?id=$cm->id", 'type' => 'title');
             $navlinks[] = array('name' => "$strattempt $attempt - ".fullname($userdata), 'link' => "report.php?a=$a&amp;user=$user&amp;attempt=$attempt", 'type' => 'title');
             $navlinks[] = array('name' => $sco->title, 'link' => '', 'type' => 'title');
             $navigation = build_navigation($navlinks, $cm);
@@ -106,36 +108,55 @@
         print_heading(format_string($scorm->name));
     }
 
+    if ($action == 'delete' && has_capability('mod/scorm:deleteresponses',$contextmodule)) {
+        if (scorm_delete_responses($attemptids, $scorm->id)) { //delete responses.
+            notify(get_string('scormresponsedeleted', 'scorm'), 'notifysuccess');
+        }
+    }
+
     $scormpixdir = $CFG->modpixpath.'/scorm/pix';
 
     if (empty($b)) {
         if (empty($a)) {
             // No options, show the global scorm report
-            
+
             if (!empty($CFG->enablegroupings) && !empty($cm->groupingid)) {
                 $sql = "SELECT st.userid, st.scormid
                         FROM {$CFG->prefix}scorm_scoes_track st
                             INNER JOIN {$CFG->prefix}groups_members gm ON st.userid = gm.userid
-                            INNER JOIN {$CFG->prefix}groupings_groups gg ON gm.groupid = gg.groupid 
+                            INNER JOIN {$CFG->prefix}groupings_groups gg ON gm.groupid = gg.groupid
                         WHERE st.scormid = {$scorm->id} AND gg.groupingid = {$cm->groupingid}
                         GROUP BY st.userid,st.scormid
                         ";
             } else {
                 $sql = "SELECT st.userid, st.scormid
-                        FROM {$CFG->prefix}scorm_scoes_track st 
+                        FROM {$CFG->prefix}scorm_scoes_track st
                         WHERE st.scormid = {$scorm->id}
                         GROUP BY st.userid,st.scormid
                         ";
             }
-            
+
             if ($scousers=get_records_sql($sql)) {
                 $table = new stdClass();
-                $table->head = array('&nbsp;', get_string('name'));
-                $table->align = array('center', 'left');
-                $table->wrap = array('nowrap', 'nowrap');
+                $table->head = array();
                 $table->width = '100%';
-                $table->size = array(10, '*');
+                if (has_capability('mod/scorm:deleteresponses',$contextmodule)) {
+                    $table->head[]  = '&nbsp;';
+                    $table->align[] = 'center';
+                    $table->wrap[]  = 'nowrap';
+                    $table->size[]  = '10';
+                }
 
+                $table->head[]  = '&nbsp;';
+                $table->align[] = 'center';
+                $table->wrap[]  = 'nowrap';
+                $table->size[]  = '10';
+
+                $table->head[]  = get_string('name');
+                $table->align[] = 'left';
+                $table->wrap[]  = 'nowrap';
+                $table->size[]  = '*';
+
                 $table->head[]= get_string('attempt','scorm');
                 $table->align[] = 'center';
                 $table->wrap[] = 'nowrap';
@@ -158,31 +179,61 @@
 
                 foreach($scousers as $scouser){
                     $userdata = scorm_get_user_data($scouser->userid);
-                    $attempt = scorm_get_last_attempt($scorm->id,$scouser->userid);    
+                    $attempt = scorm_get_last_attempt($scorm->id,$scouser->userid);
                     for ($a = 1; $a<=$attempt; $a++) {
                         $row = array();
+                        if (has_capability('mod/scorm:deleteresponses',$contextmodule)) {
+                            $row[] = '<input type="checkbox" name="attemptid[]" value="'. $scouser->userid . ':' . $a . '" />';
+                        }
                         $row[] = print_user_picture($scouser->userid, $course->id, $userdata->picture, false, true);
                         $row[] = '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$scouser->userid.'&amp;course='.$course->id.'">'.
                                  fullname($userdata).'</a>';
                         $row[] = '<a href="report.php?a='.$scorm->id.'&amp;user='.$scouser->userid.'&amp;attempt='.$a.'">'.$a.'</a>';
                         $select = 'scormid = '.$scorm->id.' and userid = '.$scouser->userid.' and attempt = '.$a;
-                        $timetracks = get_record_select('scorm_scoes_track', $select,'min(timemodified) as started, max(timemodified) as last');      
-                        $row[] = userdate($timetracks->started, get_string('strftimedaydatetime'));
-                        $row[] = userdate($timetracks->last, get_string('strftimedaydatetime'));
- 
+//                        $timetracks = get_record_select('scorm_scoes_track', $select,'min(timemodified) as started, max(timemodified) as last');
+                        $timetracks = scorm_get_sco_runtime($scorm->id, false, $scouser->userid, $a);
+                        // jump out here if this attempt doesnt exist
+//                        if (!$timetracks->started) {
+                        if (!$timetracks->start) {
+                            continue;
+                        }
+//                        $row[] = userdate($timetracks->started, get_string('strftimedaydatetime'));
+//                        $row[] = userdate($timetracks->last, get_string('strftimedaydatetime'));
+                        $row[] = userdate($timetracks->start, get_string('strftimedaydatetime'));
+                        $row[] = userdate($timetracks->finish, get_string('strftimedaydatetime'));
                         $row[] = scorm_grade_user_attempt($scorm, $scouser->userid, $a);
                         $table->data[] = $row;
                     }
                 }
+                echo '<div id="scormtablecontainer">';
+                if (has_capability('mod/scorm:deleteresponses',$contextmodule)) {
+                    echo '<form id="attemptsform" method="post" action="'.$_SERVER['PHP_SELF'].'" onsubmit="var menu = document.getElementById(\'menuaction\'); return (menu.options[menu.selectedIndex].value == \'delete\' ? \''.addslashes_js(get_string('deleteattemptcheck','quiz')).'\' : true);">';
+                    echo '<input type="hidden" name="id" value="'.$id.'">';
+                    print_table($table);
+                    echo '<a href="javascript:select_all_in(\'DIV\',null,\'scormtablecontainer\');">'.get_string('selectall', 'quiz').'</a> / ';
+                    echo '<a href="javascript:deselect_all_in(\'DIV\',null,\'scormtablecontainer\');">'.get_string('selectnone', 'quiz').'</a> ';
+                    echo '&nbsp;&nbsp;';
+                    $options = array('delete' => get_string('delete'));
+                    echo choose_from_menu($options, 'action', '', get_string('withselected', 'quiz'), 'if(this.selectedIndex > 0) submitFormById(\'attemptsform\');', '', true);
+                    echo '<noscript id="noscriptmenuaction" style="display: inline;">';
+                    echo '<div>';
+                    echo '<input type="submit" value="'.get_string('go').'" /></div></noscript>';
+                    echo '<script type="text/javascript">'."\n<!--\n".'document.getElementById("noscriptmenuaction").style.display = "none";'."\n-->\n".'</script>';
+                    echo '</form>';
+                } else {
+                    print_table($table);
+                }
+                echo '</div>';
+            } else {
+                notify(get_string('noactivity', 'scorm'));
             }
-            print_table($table);
         } else {
             if (!empty($user)) {
                 // User SCORM report
                 if ($scoes = get_records_select('scorm_scoes',"scorm='$scorm->id' ORDER BY id")) {
                     if (!empty($userdata)) {
                         print_simple_box_start('center');
-                        echo '<div align="center">'."\n";
+                        echo '<div class="mdl-align">'."\n";
                         print_user_picture($user, $course->id, $userdata->picture, false, false);
                         echo "<a href=\"$CFG->wwwroot/user/view.php?id=$user&amp;course=$course->id\">".
                              "$userdata->firstname $userdata->lastname</a><br />";
@@ -243,8 +294,8 @@
         if (!empty($userdata)) {
             print_simple_box_start('center');
             //print_heading(format_string($sco->title));
-            print_heading('<a href="'.$CFG->wwwroot.'/mod/scorm/player.php?a='.$scorm->id.'&amp;mode=browse&amp;scoid='.$sco->id.'" target="_new">'.format_string($sco->title).'</a>'); 
-            echo '<div align="center">'."\n";
+            print_heading('<a href="'.$CFG->wwwroot.'/mod/scorm/player.php?a='.$scorm->id.'&amp;mode=browse&amp;scoid='.$sco->id.'" target="_new">'.format_string($sco->title).'</a>');
+            echo '<div class="mdl-align">'."\n";
             print_user_picture($user, $course->id, $userdata->picture, false, false);
             echo "<a href=\"$CFG->wwwroot/user/view.php?id=$user&amp;course=$course->id\">".
                  "$userdata->firstname $userdata->lastname</a><br />";
@@ -265,15 +316,15 @@
             $strstatus.'" />&nbsp;'.$trackdata->total_time.'<br />'.$scoreview.'<br />';
             echo '</div>'."\n";
             echo '<hr /><h2>'.get_string('details','scorm').'</h2>';
-            
+
             // Print general score data
             $table = new stdClass();
             $table->head = array(get_string('element','scorm'), get_string('value','scorm'));
             $table->align = array('left', 'left');
             $table->wrap = array('nowrap', 'nowrap');
             $table->width = '100%';
             $table->size = array('*', '*');
-            
+
             $existelements = false;
             if ($scorm->version == 'SCORM_1.3') {
                 $elements = array('raw' => 'cmi.score.raw',
@@ -302,8 +353,8 @@
             if ($existelements) {
                 echo '<h3>'.get_string('general','scorm').'</h3>';
                 print_table($table);
-            }                
-            
+            }
+
             // Print Interactions data
             $table = new stdClass();
             $table->head = array(get_string('identifier','scorm'),
@@ -314,12 +365,12 @@
             $table->wrap = array('nowrap', 'nowrap', 'nowrap', 'nowrap');
             $table->width = '100%';
             $table->size = array('*', '*', '*', '*', '*');
-            
+
             $existinteraction = false;
-            
+
             $i = 0;
             $interactionid = 'cmi.interactions.'.$i.'.id';
-            
+
             while (isset($trackdata->$interactionid)) {
                 $existinteraction = true;
                 $printedelements[]=$interactionid;
@@ -337,16 +388,15 @@
                     }
                 }
                 $table->data[] = $row;
-                
+
                 $i++;
                 $interactionid = 'cmi.interactions.'.$i.'.id';
             }
             if ($existinteraction) {
                 echo '<h3>'.get_string('interactions','scorm').'</h3>';
-                echo '<h3>'.get_string('interactions','scorm').'</h3>';
                 print_table($table);
             }
-            
+
             // Print Objectives data
             $table = new stdClass();
             $table->head = array(get_string('identifier','scorm'),
@@ -358,12 +408,12 @@
             $table->wrap = array('nowrap', 'nowrap', 'nowrap', 'nowrap', 'nowrap');
             $table->width = '100%';
             $table->size = array('*', '*', '*', '*', '*');
-            
+
             $existobjective = false;
-            
+
             $i = 0;
             $objectiveid = 'cmi.objectives.'.$i.'.id';
-            
+
             while (isset($trackdata->$objectiveid)) {
                 $existobjective = true;
                 $printedelements[]=$objectiveid;
@@ -382,7 +432,7 @@
                     }
                 }
                 $table->data[] = $row;
-                
+
                 $i++;
                 $objectiveid = 'cmi.objectives.'.$i.'.id';
             }
@@ -396,11 +446,11 @@
             $table->wrap = array('nowrap', 'wrap');
             $table->width = '100%';
             $table->size = array('*', '*');
-            
+
             $existelements = false;
-            
+
             foreach($trackdata as $element => $value) {
-                if (substr($element,0,3) == 'cmi') { 
+                if (substr($element,0,3) == 'cmi') {
                     if (!(in_array ($element, $printedelements))) {
                         $existelements = true;
                         $row = array();
@@ -413,7 +463,7 @@
             if ($existelements) {
                 echo '<h3>'.get_string('othertracks','scorm').'</h3>';
                 print_table($table);
-            }                
+            }
             print_simple_box_end();
         } else {
             error('Missing script parameter');
Index: temp_moodle_dev/moodle/mod/scorm/restorelib.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/scorm/restorelib.php	(.../restorelib.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/scorm/restorelib.php	(.../restorelib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -831,7 +831,7 @@
 
                 if ($result != $content) {
                     //Update record
-                    $scorm->summary = addslashes($result);
+                    $scorm->summary = addslashes_js($result);
                     $status = update_record("scorm",$scorm);
                     if (debugging()) {
                         if (!defined('RESTORE_SILENTLY')) {
Index: temp_moodle_dev/moodle/mod/scorm/settings.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/scorm/settings.php	(.../settings.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/scorm/settings.php	(.../settings.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -1,9 +1,42 @@
 <?php  //$Id$
 
+require_once($CFG->dirroot . '/mod/scorm/locallib.php');
+
+$settings->add(new admin_setting_configselect('scorm_grademethod', get_string('grademethod', 'scorm'),get_string('grademethoddesc', 'scorm'), GRADEHIGHEST, scorm_get_grade_method_array()));
+
+for ($i=0; $i<=100; $i++) {
+  $grades[$i] = "$i";
+}
+$settings->add(new admin_setting_configselect('scorm_maxgrade', get_string('maximumgrade'),get_string('maximumgradedesc','scorm'), 100, $grades));
+
+$settings->add(new admin_setting_configselect('scorm_maxattempts', get_string('maximumattempts', 'scorm'), get_string('maximumattemptsdesc', 'scorm'), 0, scorm_get_attempts_array()));
+
+$settings->add(new admin_setting_configselect('scorm_whatgrade', get_string('whatgrade', 'scorm'), get_string('whatgradedesc', 'scorm'), HIGHESTATTEMPT, scorm_get_what_grade_array()));
+
 $settings->add(new admin_setting_configtext('scorm_framewidth', get_string('width', 'scorm'),
                    get_string('framewidth', 'scorm'), '100%'));
 
 $settings->add(new admin_setting_configtext('scorm_frameheight', get_string('height', 'scorm'),
                    get_string('frameheight', 'scorm'), 500));
 
-?>
+$settings->add(new admin_setting_configselect('scorm_popup', get_string('display','scorm'), get_string('displaydesc','scorm'), 0, scorm_get_popup_display_array()));
+
+foreach(scorm_get_popup_options_array() as $key => $value){
+    $settings->add(new admin_setting_configcheckbox('scorm_'.$key, get_string($key, 'scorm'),'',$value));
+}
+
+$settings->add(new admin_setting_configselect('scorm_skipview', get_string('skipview', 'scorm'), get_string('skipviewdesc', 'scorm'), 0, scorm_get_skip_view_array()));
+
+$yesno = array(0 => get_string('no'),
+               1 => get_string('yes'));
+
+$settings->add(new admin_setting_configselect('scorm_hidebrowse', get_string('hidebrowse', 'scorm'), get_string('hidebrowsedesc', 'scorm'), 0, $yesno));
+
+$settings->add(new admin_setting_configselect('scorm_hidetoc', get_string('hidetoc', 'scorm'), get_string('hidetocdesc', 'scorm'), 0, scorm_get_hidetoc_array()));
+
+$settings->add(new admin_setting_configselect('scorm_hidenav', get_string('hidenav', 'scorm'), get_string('hidenavdesc', 'scorm'), 0, $yesno));
+
+$settings->add(new admin_setting_configselect('scorm_auto', get_string('autocontinue', 'scorm'), get_string('autocontinuedesc', 'scorm'), 0, $yesno));
+
+$settings->add(new admin_setting_configselect('scorm_updatefreq', get_string('updatefreq', 'scorm'), get_string('updatefreqdesc', 'scorm'), 0, scorm_get_updatefreq_array()));
+?>
\ No newline at end of file
Index: temp_moodle_dev/moodle/mod/scorm/version.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/scorm/version.php	(.../version.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/scorm/version.php	(.../version.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -10,8 +10,8 @@
 //       catch up now, so until 27th October please only increment in very tiny steps 
 //       in HEAD, until we get past that date..
 
-$module->version  = 2007110501;   // The (date) version of this module
+$module->version  = 2007110502;   // The (date) version of this module
 $module->requires = 2007101509;   // The version of Moodle that is required
 $module->cron     = 300;            // How often should cron check this module (seconds)?
 
-?>
+?>
\ No newline at end of file
Index: temp_moodle_dev/moodle/mod/scorm/view.php
===================================================================
diff -u -rf6e00dfa1fec6ce7d78ffb443add070854e542cd -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/scorm/view.php	(.../view.php)	(revision f6e00dfa1fec6ce7d78ffb443add070854e542cd)
+++ temp_moodle_dev/moodle/mod/scorm/view.php	(.../view.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -44,16 +44,6 @@
     $strscorms = get_string("modulenameplural", "scorm");
     $strscorm  = get_string("modulename", "scorm");
 
-    if ($course->id != SITEID) { 
-        
-        if ($scorms = get_all_instances_in_course('scorm', $course)) {
-            // The module SCORM activity with the least id is the course  
-            $firstscorm = current($scorms);
-            if (!(($course->format == 'scorm') && ($firstscorm->id == $scorm->id))) {
-                $navlinks[] = array('name' => $strscorms, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-            }       
-        }
-    }
     $pagetitle = strip_tags($course->shortname.': '.format_string($scorm->name));
 
     add_to_log($course->id, 'scorm', 'pre-view', 'view.php?id='.$cm->id, "$scorm->id", $cm->id);
@@ -66,8 +56,7 @@
     // Print the page header
     //
     $navlinks = array();
-    $navlinks[] = array('name' => format_string($scorm->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
-    $navigation = build_navigation($navlinks);
+    $navigation = build_navigation($navlinks,$cm);
     //if is_lams=1 hide Moodle's headers
     if($scorm->is_lams==0){
     	print_header($pagetitle, $course->fullname, $navigation,
Index: temp_moodle_dev/moodle/mod/wiki/admin.php
===================================================================
diff -u -r505b6bba0c99f46d4ca7df4a8f4a9c8c7b9090f8 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/wiki/admin.php	(.../admin.php)	(revision 505b6bba0c99f46d4ca7df4a8f4a9c8c7b9090f8)
+++ temp_moodle_dev/moodle/mod/wiki/admin.php	(.../admin.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -116,13 +116,12 @@
     }
 
     $navigation = build_navigation(get_string("administration","wiki"), $cm);
-    
     //we pass a new parameter to the function so it won't we printed if is_lams=1
     print_header_simple("$wiki_entry->pagename", "", $navigation,
                 $focus, "", true, update_module_button($cm->id, $course->id, $strwiki),
                 navmenu($course, $cm),false,'',false,$cm->is_lams);
-	
 
+
     ////////////////////////////////////////////////////////////
     /// Check if the Form has been submitted and display confirmation
     ////////////////////////////////////////////////////////////
@@ -155,8 +154,7 @@
               if(!$confirm && $form->pagestodelete) {
                 notice_yesno(get_string("removepagecheck", "wiki")."<br />".join(", ", $form->pagestodelete),
                   $link."&amp;confirm=".urlencode(join(" ",$form->pagestodelete)), $link);
-                //we pass a new parameter to the function so it won't we printed if is_lams=1
-    			print_footer($course,null, false,$cm->is_lams);
+                print_footer($course,null, false,$cm->is_lams);
                 exit;
               }
             }
@@ -177,8 +175,7 @@
                   }
                   notice_yesno(get_string("strippagecheck", "wiki")."<br />".join(", ", $pagestostrip),
                       $link.$confirm, $link);
-                  //we pass a new parameter to the function so it won't we printed if is_lams=1
-    			  print_footer($course,null, false,$cm->is_lams);
+                  print_footer($course,null, false,$cm->is_lams);
                   exit;
                 }
               }
@@ -190,8 +187,7 @@
                 $confirm="&amp;confirm=".$form->pagetocheck;
                 notice_yesno(get_string("checklinkscheck", "wiki").$form->pagetocheck,
                     $link.$confirm, $link);
-                 //we pass a new parameter to the function so it won't we printed if is_lams=1
-    			 print_footer($course,null, false,$cm->is_lams);
+                print_footer($course,null, false,$cm->is_lams);
                 exit;
               }
             }
@@ -211,8 +207,7 @@
                   if($revertedpages) {
                     notice_yesno(get_string("revertpagescheck", "wiki")."<br />".$revertedpages,
                       $link.$confirm, $link);
-                     //we pass a new parameter to the function so it won't we printed if is_lams=1
-    			     print_footer($course,null, false,$cm->is_lams);
+                    print_footer($course,null, false,$cm->is_lams);
                     exit;
                   } else {
                     $err->remark=get_string("nochangestorevert","wiki");
@@ -347,8 +342,7 @@
     print_simple_box_end();
 
 /// Finish the page
-     //we pass a new parameter to the function so it won't we printed if is_lams=1
-     print_footer($course,null, false,$cm->is_lams);
+    print_footer($course,null, false,$cm->is_lams);
     exit;
 
 ?>
Index: temp_moodle_dev/moodle/mod/wiki/db/install.xml
===================================================================
diff -u -r48c8459354bd2683e19a1c08e4f8428da642bf99 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/wiki/db/install.xml	(.../install.xml)	(revision 48c8459354bd2683e19a1c08e4f8428da642bf99)
+++ temp_moodle_dev/moodle/mod/wiki/db/install.xml	(.../install.xml)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -22,7 +22,7 @@
         <FIELD NAME="revertchanges" TYPE="int" LENGTH="4" NOTNULL="true" UNSIGNED="true" DEFAULT="1" SEQUENCE="false" ENUM="false" PREVIOUS="removepages" NEXT="initialcontent"/>
         <FIELD NAME="initialcontent" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="revertchanges" NEXT="timemodified"/>
         <FIELD NAME="timemodified" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="initialcontent" NEXT="is_lams"/>
-		<FIELD NAME="is_lams" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="timemodified" />
+	<FIELD NAME="is_lams" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="timemodified" />
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" />
Index: temp_moodle_dev/moodle/mod/wiki/ewiki/ewiki.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/wiki/ewiki/ewiki.php	(.../ewiki.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/wiki/ewiki/ewiki.php	(.../ewiki.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -1066,20 +1066,20 @@
 
 
 function ewiki_page_newest($id=0, $data=0) {
-   return( ewiki_page_ordered_list("created", 1, "LASTCHANGED", ewiki_t("NEWESTPAGES")) );
+   return( ewiki_page_ordered_list("created", 1, "LASTCHANGED", ewiki_t(EWIKI_PAGE_NEWEST)) );
 }
 
 function ewiki_page_updates($id=0, $data=0) {
-   return( ewiki_page_ordered_list("lastmodified", -1, "LASTCHANGED", EWIKI_PAGE_UPDATES) );
+   return( ewiki_page_ordered_list("lastmodified", -1, "LASTCHANGED", ewiki_t(EWIKI_PAGE_UPDATES)) );
 }
 
 function ewiki_page_hits($id=0, $data=0) {
    ##### BEGIN MOODLE ADDITION #####
-   return( ewiki_page_ordered_list("hits", 1, "hits", EWIKI_PAGE_HITS) );
+   return( ewiki_page_ordered_list("hits", 1, "hits", ewiki_t(EWIKI_PAGE_HITS)) );
 }
 
 function ewiki_page_versions($id=0, $data=0) {
-   return( ewiki_page_ordered_list("version", -1, "changes", EWIKI_PAGE_VERSIONS) );
+   return( ewiki_page_ordered_list("version", -1, "changes", ewiki_t(EWIKI_PAGE_VERSIONS)) );
    ##### END MOODLE ADDITION #####
 }
 
@@ -1640,7 +1640,7 @@
    $preview_text=$GLOBALS["ewiki_plugins"]["render"][0]($_REQUEST["content"], 1, EWIKI_ALLOW_HTML || (@$data["flags"]&EWIKI_DB_F_HTML));
    return( '<div class="preview">'
            . "<hr noshade>"
-           . "<div align=\"right\">" . ewiki_t("PREVIEW") . "</div><hr noshade><br />\n"
+           . "<div class='mdl-right'>" . ewiki_t("PREVIEW") . "</div><hr noshade><br />\n"
            . format_text($preview_text, $moodle_format)
            . "<br /><br /><hr noshade><br />"
            . "</div>"
@@ -1660,7 +1660,7 @@
    }
 
    $o = "\n"
-      . '<div align="right" class="action-links control-links">'
+      . '<div class="mdl-right action-links control-links">'
       . "\n<br />\n"
       . "<hr noshade>" . "\n";
 
@@ -3588,4 +3588,4 @@
    return($r);
 }
 
-?>
\ No newline at end of file
+?>
Index: temp_moodle_dev/moodle/mod/wiki/ewiki/plugins/moodle/downloads.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/wiki/ewiki/plugins/moodle/downloads.php	(.../downloads.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/wiki/ewiki/plugins/moodle/downloads.php	(.../downloads.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -216,7 +216,7 @@
                "orderby"=>$orderby, "section" => $sec)) .
                '">' . $title . "</a>";
          }
-         $o .= '<div align="center" class="darker">'.implode(" &middot; ", $oa).'</div><br />';
+         $o .= '<div class="mdl-align darker">'.implode(" &middot; ", $oa).'</div><br />';
       }
    }
 
Index: temp_moodle_dev/moodle/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php	(.../moodle_wikidump.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php	(.../moodle_wikidump.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -63,7 +63,7 @@
   }
     
   $url = ewiki_script("", "WikiExport");
-  $ret  = ewiki_make_title($id, $id, 2);
+  $ret  = ewiki_make_title($id, ewiki_t($id), 2);
   $ret .= ($cont&&$cont!==true)?$cont."<br /><br />\n":"";
   $ret .= get_string("wikiexportcomment","wiki");
   // removing name="form" from the following form as it does not validate
Index: temp_moodle_dev/moodle/mod/wiki/ewiki/plugins/moodle/sitemap.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/wiki/ewiki/plugins/moodle/sitemap.php	(.../sitemap.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/wiki/ewiki/plugins/moodle/sitemap.php	(.../sitemap.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -8,7 +8,7 @@
 define("EWIKI_PAGE_SITEMAP", "SiteMap");
 define("EWIKI_SITEMAP_DEPTH", 10);
 $ewiki_t["en"]["INVALIDROOT"] = "You are not authorized to access the current root page so no sitemap can be created.";
-$ewiki_t["en"]["SITEMAPFOR"] = "Site map for ";
+$ewiki_t["en"]["SMFOR"] = "Site map for ";
 $ewiki_t["en"]["VIEWSMFOR"] = "View site map for ";
 $ewiki_plugins["page"][EWIKI_PAGE_SITEMAP]="ewiki_page_sitemap";
 $ewiki_plugins["action"]['sitemap']="ewiki_page_sitemap";
@@ -36,7 +36,7 @@
 
   //creates the title bar on top of page 
   if($id == EWIKI_PAGE_SITEMAP){
-    $o = ewiki_make_title($id, $id, 2);  
+    $o = ewiki_make_title($id, ewiki_t($id), 2);  
 
     foreach($ewiki_config["SiteMap"]["RootList"] as $root){
       if(isset($a_validpages[$root])){
@@ -47,7 +47,7 @@
     }
     
   }else{
-    $o = ewiki_make_title($id, ewiki_t("SITEMAPFOR")." ".$id, 2);    
+    $o = ewiki_make_title($id, ewiki_t("SMFOR")." ".$id, 2);    
     if(isset($a_validpages[$id])){
       $valid_root=TRUE;
       $str_rootid=$id;
Index: temp_moodle_dev/moodle/mod/wiki/ewiki/plugins/page/orphanedpages.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/wiki/ewiki/plugins/page/orphanedpages.php	(.../orphanedpages.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/wiki/ewiki/plugins/page/orphanedpages.php	(.../orphanedpages.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -12,7 +12,7 @@
 
    global $ewiki_links;
 
-   $o = ewiki_make_title($id, $id, 2);
+   $o = ewiki_make_title($id, ewiki_t($id), 2);
 
    $pages = array();
    $refs = array();
@@ -59,4 +59,4 @@
 }
 
 
-?>
\ No newline at end of file
+?>
Index: temp_moodle_dev/moodle/mod/wiki/ewiki/plugins/page/pageindex.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/wiki/ewiki/plugins/page/pageindex.php	(.../pageindex.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/wiki/ewiki/plugins/page/pageindex.php	(.../pageindex.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -12,7 +12,7 @@
 
    global $ewiki_plugins;
 
-   $o = ewiki_make_title($id, $id, 2);
+   $o = ewiki_make_title($id, ewiki_t($id), 2);
 
    $sorted = array();
    $sorted = array_merge($sorted, array_keys($ewiki_plugins["page"]));
@@ -41,4 +41,4 @@
 }
 
 
-?>
\ No newline at end of file
+?>
Index: temp_moodle_dev/moodle/mod/wiki/index.php
===================================================================
diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/wiki/index.php	(.../index.php)	(revision 5251d2a62e0e78377219456d6bba613eb2d1fd26)
+++ temp_moodle_dev/moodle/mod/wiki/index.php	(.../index.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -68,7 +68,7 @@
         }
 
         $timmod = '<span class="smallinfo">'.userdate($wiki->timemodified).'</span>';
-        $summary = '<span class="smallinfo">'.format_text($wiki->summary).'</span>';
+        $summary = '<div class="smallinfo">'.format_text($wiki->summary).'</div>';
 
         $site = get_site();
         switch ($wiki->wtype) {
Index: temp_moodle_dev/moodle/mod/wiki/lib.php
===================================================================
diff -u -rc94a8ba4f2d568a43c46ed1e1f573b9226beb18b -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/wiki/lib.php	(.../lib.php)	(revision c94a8ba4f2d568a43c46ed1e1f573b9226beb18b)
+++ temp_moodle_dev/moodle/mod/wiki/lib.php	(.../lib.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -237,13 +237,6 @@
     return $result;
 }
 
-function wiki_grades($wikiid) {
-/// Must return an array of grades for a given instance of this module,
-/// indexed by user.  It also returns a maximum allowed grade.
-
-    return NULL;
-}
-
 function wiki_get_participants($wikiid) {
 //Returns the users with data in one wiki
 //(users with records in wiki_pages and wiki_entries)
@@ -1981,4 +1974,5 @@
 
 }
 
+
 ?>
Index: temp_moodle_dev/moodle/mod/wiki/view.php
===================================================================
diff -u -rbe51eef22e18d37a27e1e54a048bd6851d098455 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/mod/wiki/view.php	(.../view.php)	(revision be51eef22e18d37a27e1e54a048bd6851d098455)
+++ temp_moodle_dev/moodle/mod/wiki/view.php	(.../view.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -20,7 +20,7 @@
     $canceledit   = optional_param('canceledit','', PARAM_ALPHA);        // Editing has been cancelled
     $cacheme      = optional_param('allowcache', 1, PARAM_INT);          // Set this to 0 to try and disable page caching.
     $editing  = optional_param('editing', 0, PARAM_INT); // 1 if editing in Lams
-    
+
     // Only want to add edit log entries if we have made some changes ie submitted a form
     $editsave = optional_param('thankyou', '');
     
@@ -61,7 +61,7 @@
             error("Course Module ID was incorrect");
         }
     }
-	
+
     require_course_login($course, true, $cm);
     
     /// Add the course module info to the wiki object, for easy access.
@@ -284,13 +284,9 @@
     }
 
     $navigation = build_navigation($navlinks, $cm);
-    
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
     print_header_simple($ewiki_title?$ewiki_title:format_string($wiki->name), "", $navigation,
                 "", "", $cacheme, update_module_button($cm->id, $course->id, $strwiki),
                 navmenu($course, $cm),false,'',false,$cm->is_lams);
-                 
-        
 
 
     /// Print Page
@@ -497,16 +493,12 @@
     ';
 //if is lams display navigation buttons so you can finish uploading or go to next activity
 	if($cm->is_lams==1){
-    		if($editing==1){
-				include('showlamsfinish.php');
-			}else{
-		     	//$isteacher = has_capability('mod/wiki:preview', get_context_instance(CONTEXT_MODULE, $cm->id)); // indicates if is a teacher, useful in lams
-				//if($isteacher){
-				       include('showlamsnext.php');
-				//}
-			}
+		if($editing==1){
+			include('showlamsfinish.php');
+		}else{
+			include('showlamsnext.php');
+		}
 	}
 
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
     print_footer($course,null, false,$cm->is_lams);
 ?>
Index: temp_moodle_dev/moodle/question/edit.php
===================================================================
diff -u -r66381db242d9f0c00668f125bcbc2bb181240331 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/question/edit.php	(.../edit.php)	(revision 66381db242d9f0c00668f125bcbc2bb181240331)
+++ temp_moodle_dev/moodle/question/edit.php	(.../edit.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -29,8 +29,8 @@
         $navlinks[] = array('name' => format_string($module->name), 'link' => "$CFG->wwwroot/mod/{$cm->modname}/view.php?id={$cm->id}", 'type' => 'title');
         $navlinks[] = array('name' => $streditingquestions, 'link' => '', 'type' => 'title');
         $navigation = build_navigation($navlinks);
-        //we pass a new parameter to the function so it won't we printed if is_lams=1
-        print_header_simple($streditingquestions, '', $navigation, "", "", true, $strupdatemodule,'',false,'',false,$cm->is_lams);
+        print_header_simple($streditingquestions, '', $navigation, "", "", true, $strupdatemodule);
+
         $currenttab = 'edit';
         $mode = 'questions';
         ${$cm->modname} = $module;
@@ -40,9 +40,9 @@
         $navlinks = array();
         $navlinks[] = array('name' => $streditingquestions, 'link' => '', 'type' => 'title');
         $navigation = build_navigation($navlinks);
-        //we pass a new parameter to the function so it won't we printed if is_lams=1
-        print_header_simple($streditingquestions, '', $navigation, "", "", true, '','',false,'',false,$cm->is_lams);
-        
+
+        print_header_simple($streditingquestions, '', $navigation);
+
         // print tabs
         $currenttab = 'questions';
         include('tabs.php');
@@ -57,6 +57,6 @@
 
     echo '</td></tr>';
     echo '</table>';
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
-    print_footer($COURSE,null, false,$cm->is_lams);
+
+    print_footer($COURSE);
 ?>
Index: temp_moodle_dev/moodle/question/export.php
===================================================================
diff -u -r66381db242d9f0c00668f125bcbc2bb181240331 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/question/export.php	(.../export.php)	(revision 66381db242d9f0c00668f125bcbc2bb181240331)
+++ temp_moodle_dev/moodle/question/export.php	(.../export.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -41,8 +41,8 @@
         $navlinks[] = array('name' => format_string($module->name), 'link' => "$CFG->wwwroot/mod/{$cm->modname}/view.php?id={$cm->id}", 'type' => 'title');
         $navlinks[] = array('name' => $strexportquestions, 'link' => '', 'type' => 'title');
         $navigation = build_navigation($navlinks);
-        //we pass a new parameter to the function so it won't we printed if is_lams=1
-        print_header_simple($strexportquestions, '', $navigation, "", "", true, $strupdatemodule,'',false,'',false,$cm->is_lams);	
+        print_header_simple($strexportquestions, '', $navigation, "", "", true, $strupdatemodule);
+
         $currenttab = 'edit';
         $mode = 'export';
         ${$cm->modname} = $module;
@@ -52,8 +52,8 @@
         $navlinks = array();
         $navlinks[] = array('name' => $strexportquestions, 'link' => '', 'type' => 'title');
         $navigation = build_navigation($navlinks);
-        //we pass a new parameter to the function so it won't we printed if is_lams=1
-        print_header_simple($strexportquestions, '', $navigation, "", "", true, '','',false,'',false,$cm->is_lams);
+
+        print_header_simple($strexportquestions, '', $navigation);
         // print tabs
         $currenttab = 'export';
         include('tabs.php');
@@ -132,8 +132,7 @@
         }
 
         print_continue('edit.php?' . $thispageurl->get_query_string());
-        //we pass a new parameter to the function so it won't we printed if is_lams=1
-		print_footer($COURSE,null, false,$cm->is_lams);
+        print_footer($COURSE);
         exit;
     }
 
@@ -142,6 +141,5 @@
 
     $export_form->display();
 
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
-    print_footer($COURSE,null, false,$cm->is_lams);
+    print_footer($COURSE);
 ?>
Index: temp_moodle_dev/moodle/question/import.php
===================================================================
diff -u -r66381db242d9f0c00668f125bcbc2bb181240331 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/question/import.php	(.../import.php)	(revision 66381db242d9f0c00668f125bcbc2bb181240331)
+++ temp_moodle_dev/moodle/question/import.php	(.../import.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -62,8 +62,8 @@
         $navlinks[] = array('name' => format_string($module->name), 'link' => "$CFG->wwwroot/mod/{$cm->modname}/view.php?id={$cm->id}", 'type' => 'title');
         $navlinks[] = array('name' => $txt->importquestions, 'link' => '', 'type' => 'title');
         $navigation = build_navigation($navlinks);
-        //we pass a new parameter to the function so it won't we printed if is_lams=1
-        print_header_simple($txt->importquestions, '', $navigation, "", "", true, $strupdatemodule,'',false,'',false,$cm->is_lams);
+        print_header_simple($txt->importquestions, '', $navigation, "", "", true, $strupdatemodule);
+
         $currenttab = 'edit';
         $mode = 'import';
         ${$cm->modname} = $module;
@@ -73,8 +73,8 @@
         $navlinks = array();
         $navlinks[] = array('name' => $txt->importquestions, 'link' => '', 'type' => 'title');
         $navigation = build_navigation($navlinks);
-        //we pass a new parameter to the function so it won't we printed if is_lams=1
-		print_header_simple($txt->importquestions, '', $navigation, "", "", true, $strupdatemodule,'',false,'',false,$cm->is_lams);
+
+        print_header_simple($txt->importquestions, '', $navigation);
         // print tabs
         $currenttab = 'import';
         include('tabs.php');
@@ -148,8 +148,7 @@
 
             echo "<hr />";
             print_continue("edit.php?".($thispageurl->get_query_string(array('category'=>"{$qformat->category->id},{$qformat->category->contextid}"))));
-            //we pass a new parameter to the function so it won't we printed if is_lams=1
-			print_footer($COURSE,null, false,$cm->is_lams);
+            print_footer($COURSE);
             exit;
         }
     }
@@ -158,7 +157,6 @@
 
     /// Print upload form
     $import_form->display();
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
-    print_footer($COURSE,null, false,$cm->is_lams);
+    print_footer($COURSE);
 
 ?>
Index: temp_moodle_dev/moodle/question/question.php
===================================================================
diff -u -r66381db242d9f0c00668f125bcbc2bb181240331 -raca9f00eec05f594be36b6397b9c363742db6022
--- temp_moodle_dev/moodle/question/question.php	(.../question.php)	(revision 66381db242d9f0c00668f125bcbc2bb181240331)
+++ temp_moodle_dev/moodle/question/question.php	(.../question.php)	(revision aca9f00eec05f594be36b6397b9c363742db6022)
@@ -17,14 +17,12 @@
 $id = optional_param('id', 0, PARAM_INT); // question id
 $qtype = optional_param('qtype', '', PARAM_FILE);
 $categoryid = optional_param('category', 0, PARAM_INT);
-
 $cmid = optional_param('cmid', 0, PARAM_INT);
 $courseid = optional_param('courseid', 0, PARAM_INT);
-$wizardnow =  optional_param('wizardnow', '', PARAM_ALPHA);
-$movecontext =  optional_param('movecontext', 0, PARAM_BOOL);//switch to make question
-                    //uneditable - form is displayed to edit category only
+$wizardnow = optional_param('wizardnow', '', PARAM_ALPHA);
+$movecontext = optional_param('movecontext', 0, PARAM_BOOL); // Switch to make
+        // question uneditable - form is displayed to edit category only
 $returnurl = optional_param('returnurl', 0, PARAM_LOCALURL);
-
 $inpopup = optional_param('inpopup', 0, PARAM_BOOL);
 
 if ($movecontext && !$id){
@@ -45,13 +43,10 @@
 }
 $contexts = new question_edit_contexts($thiscontext);
 
-
 if (!$returnurl) {
     $returnurl = "{$CFG->wwwroot}/question/edit.php?courseid={$COURSE->id}";
 }
 
-
-
 if ($id) {
     if (!$question = get_record('question', 'id', $id)) {
         print_error('questiondoesnotexist', 'question', $returnurl);
@@ -113,7 +108,6 @@
 }
 $CFG->pagepath = 'question/type/' . $question->qtype;
 
-
 // Create the question editing form.
 if ($wizardnow!=='' && !$movecontext){
     if (!method_exists($QTYPES[$question->qtype], 'next_wizard_form')){
@@ -149,20 +143,39 @@
     } else {
         redirect($returnurl);
     }
-} elseif ($fromform = $mform->get_data()){
-    $returnurl = new moodle_url($returnurl);
-    //select category that question has been saved in / moved to when we return to question bank
-    if (!empty($fromform->categorymoveto)){
-        $returnurl->param('category', $fromform->categorymoveto);
-    } else if (!empty($fromform->category)){
-        $returnurl->param('category', $fromform->category);
-    }
-    $returnurl = $returnurl->out();
+} elseif ($fromform = $mform->get_data()) {
+    /// If we are saving as a copy, break the connection to the old question.
     if (!empty($fromform->makecopy)) {
-        $question->id = 0;  // causes a new question to be created.
+        $question->id = 0;
         $question->hidden = 0; // Copies should not be hidden
     }
-    if ($movecontext){
+
+    /// Process the combination of usecurrentcat, categorymoveto and category form
+    /// fields, so the save_question method only has to consider $fromform->category
+    if (!empty($fromform->usecurrentcat)) {
+        // $fromform->category is the right category to save in.
+    } else {
+        if (!empty($fromform->categorymoveto)) {
+            $fromform->category = $fromform->categorymoveto;
+        } else {
+            // $fromform->category is the right category to save in.
+        }
+    }
+
+    /// If we are moving a question, check we have permission to move it from
+    /// whence it came. (Where we are moving to is validated by the form.)
+    list($newcatid) = explode(',', $fromform->category);
+    if (!empty($question->id) && $newcatid != $question->category) {
+        question_require_capability_on($question, 'move');
+    }
+
+    /// Ensure we redirect back to the category the question is being saved into.
+    $returnurl = new moodle_url($returnurl);
+    $returnurl->param('category', $fromform->category);
+    $returnurl = $returnurl->out();
+
+    /// Call the appropriate method.
+    if ($movecontext) {
         list($tocatid, $tocontextid) = explode(',', $fromform->categorymoveto);
         $tocontext = get_context_instance_by_id($tocontextid);
         require_capability('moodle/question:add', $tocontext);
@@ -206,6 +219,7 @@
 } else {
 
     list($streditingquestion,) = $QTYPES[$question->qtype]->get_heading();
+    $headtags = get_editing_head_contributions($question);
     if ($cm !== null) {
         $strmodule = get_string('modulename', $cm->modname);
         $strupdatemodule = has_capability('moodle/course:manageactivities', get_context_instance(CONTEXT_COURSE, $COURSE->id))
@@ -223,26 +237,22 @@
         }
         $navlinks[] = array('name' => $streditingquestion, 'link' => '', 'type' => 'title');
         $navigation = build_navigation($navlinks);
-        //m
-        print_header_simple($streditingquestion, '', $navigation, "", "", true, $strupdatemodule,'',false,'',false,$cm->is_lams);
-        
+        print_header_simple($streditingquestion, '', $navigation, '', $headtags, true, $strupdatemodule);
+
     } else {
         $navlinks = array();
         $navlinks[] = array('name' => get_string('editquestions', "quiz"), 'link' => $returnurl, 'type' => 'title');
         $navlinks[] = array('name' => $streditingquestion, 'link' => '', 'type' => 'title');
         $strediting = '<a href="edit.php?courseid='.$COURSE->id.'">'.
                 get_string("editquestions", "quiz").'</a> -> '.$streditingquestion;
         $navigation = build_navigation($navlinks);
-        //we pass a new parameter to the function so it won't we printed if is_lams=1
-        print_header_simple($streditingquestion, '', $navigation, "", "", true, $strupdatemodule,'',false,'',false,$cm->is_lams);
-
+        print_header_simple($streditingquestion, '', $navigation, '', $headtags);
     }
 
 
     // Display a heading, question editing form and possibly some extra content needed for
     // for this question type.
     $QTYPES[$question->qtype]->display_question_editing_page($mform, $question, $wizardnow);
-    //we pass a new parameter to the function so it won't we printed if is_lams=1
-    print_footer($COURSE,null, false,$cm->is_lams);
+    print_footer($COURSE);
 }
 ?>