Bumped to 1.8.8 release

Updated the 18 build version to 20090128
MDL-17365 forum rate - fix error message.
2009-01-28 07:56:53 +00:00 · 2009-01-27 23:55:37 +00:00 · 2009-01-27 18:06:25 +00:00 · 2009-01-27 17:55:35 +00:00 · 2009-01-27 08:29:55 +00:00 · 2009-01-26 23:56:11 +00:00
1081 changed files with 66184 additions and 40397 deletions
@@ -140,9 +140,15 @@ $registrationauths = array();
 $registrationauths[''] = $txt->disable;
 foreach ($authsenabled as $auth) {
    $authplugin = get_auth_plugin($auth);
-    $displayauths[$auth] = get_string("auth_{$auth}title", 'auth');
+/// Get the auth title (from core or own auth lang files)
+    $authtitle = get_string("auth_{$auth}title", "auth");
+    if ($authtitle == "[[auth_{$auth}title]]") {
+        $authtitle = get_string("auth_{$auth}title", "auth_{$auth}");
+    }
+/// Apply titles
+    $displayauths[$auth] = $authtitle;
    if ($authplugin->can_signup()) {
-        $registrationauths[$auth] = get_string("auth_{$auth}title", 'auth');
+        $registrationauths[$auth] = $authtitle;
    }
 }

@@ -151,9 +157,15 @@ foreach ($authsavailable as $auth) {
        continue; //already in the list
    }
    $authplugin = get_auth_plugin($auth);
-    $displayauths[$auth] = get_string("auth_{$auth}title", 'auth');
+/// Get the auth title (from core or own auth lang files)
+    $authtitle = get_string("auth_{$auth}title", "auth");
+    if ($authtitle == "[[auth_{$auth}title]]") {
+        $authtitle = get_string("auth_{$auth}title", "auth_{$auth}");
+    }
+/// Apply titles
+    $displayauths[$auth] = $authtitle;
    if ($authplugin->can_signup()) {
-        $registrationauths[$auth] = get_string("auth_{$auth}title", 'auth');
+        $registrationauths[$auth] = $authtitle;
    }
 }

@@ -9,6 +9,7 @@ require_once $CFG->libdir.'/adminlib.php';
 $adminroot = admin_get_root();
 admin_externalpage_setup('userauthentication', $adminroot);
 $auth = required_param('auth', PARAM_SAFEDIR);
+$CFG->pagepath = 'auth/' . $auth;
 $authplugin = get_auth_plugin($auth);
 $err = array();

@@ -50,13 +51,18 @@ if ($frm = data_submitted()) {
    $frm = get_config("auth/$auth");
 }

-$user_fields = array("firstname", "lastname", "email", "phone1", "phone2", "department", "address", "city", "country", "description", "idnumber", "lang");
+$user_fields = array("firstname", "lastname", "email", "phone1", "phone2", "institution", "department", "address", "city", "country", "description", "idnumber", "lang");

-$modules = get_list_of_plugins('auth');
-foreach ($modules as $module) {
-    $options[$module] = get_string("auth_{$module}title", 'auth');
-}
-asort($options);
+/// Get the auth title (from core or own auth lang files)
+    $authtitle = get_string("auth_{$auth}title", "auth");
+    if ($authtitle == "[[auth_{$auth}title]]") {
+        $authtitle = get_string("auth_{$auth}title", "auth_{$auth}");
+    }
+/// Get the auth descriptions (from core or own auth lang files)
+    $authdescription = get_string("auth_{$auth}description", "auth");
+    if ($authdescription == "[[auth_{$auth}description]]") {
+        $authdescription = get_string("auth_{$auth}description", "auth_{$auth}");
+    }

 // output configuration form
 admin_externalpage_print_header($adminroot);
@@ -69,9 +75,9 @@ echo "<input type=\"hidden\" name=\"auth\" value=\"".$auth."\" />\n";

 // auth plugin description
 print_simple_box_start('center', '80%');
-print_heading($options[$auth]);
-print_simple_box_start('center', '60%', '', 5, 'informationbox');
-print_string("auth_{$auth}description", 'auth');
+print_heading($authtitle);
+print_simple_box_start('center', '80%', '', 5, 'informationbox');
+echo $authdescription;
 print_simple_box_end();
 echo "<hr />\n";
 $authplugin->config_form($frm, $err, $user_fields);
@@ -54,7 +54,7 @@
        if (!$block = blocks_get_record($multiple)) {
            error("Block doesn't exist!");
        }
-        $block->multiple = !$block->multiple;
+        $block->multiple = intval(!$block->multiple);
        update_record('block', $block);
    }

@@ -179,8 +179,13 @@
        if($blockobject->has_config()) {
            $settings = '<a href="block.php?block='.$blockid.'">'.$strsettings.'</a>';
        }
-
-        $count = count_records('block_instance', 'blockid', $blockid);
+       
+        // MDL-11167, blocks can be placed on mymoodle, or the blogs page
+        // and it should not show up on course search page
+        $count = count_records_sql('SELECT COUNT(*) 
+                                        FROM '.$CFG->prefix.'block_instance 
+                                        WHERE blockid = '.$blockid.' AND
+                                        pagetype = \'course-view\'');
        if ($count>0) {
            $blocklist = "<a href=\"{$CFG->wwwroot}/course/search.php?blocklist=$blockid&amp;sesskey={$USER->sesskey}\" ";
            $blocklist .= "title=\"$strshowblockcourse\" >$count</a>";
@@ -98,11 +98,21 @@
                $cron_function = $mod->name."_cron";
                if (function_exists($cron_function)) {
                    mtrace("Processing module function $cron_function ...", '');
+                    if (!empty($PERF->dbqueries)) {
+                        $pre_dbqueries = $PERF->dbqueries;
+                        $pre_time      = microtime(1);
+                    }
                    if ($cron_function()) {
                        if (! set_field("modules", "lastcron", $timenow, "id", $mod->id)) {
                            mtrace("Error: could not update timestamp for $mod->fullname");
                        }
                    }
+                    if (isset($pre_dbqueries)) {
+                        mtrace("... used " . ($PERF->dbqueries - $pre_dbqueries) . " dbqueries");
+                        mtrace("... used " . (microtime(1) - $pre_time) . " seconds");
+                    }
+                /// Reset possible changes by modules to time_limit. MDL-11597
+                    @set_time_limit(0);
                    mtrace("done.");
                }
            }
@@ -127,6 +137,8 @@
                            mtrace('Error: could not update timestamp for '.$block->name);
                        }
                    }
+                /// Reset possible changes by blocks to time_limit. MDL-11597
+                    @set_time_limit(0);
                    mtrace('done.');
                }
            }
@@ -142,13 +154,26 @@

    mtrace('Removing expired enrolments ...', '');     // See MDL-8785
    $timenow = time();
-    if ($oldenrolments = get_records_select('role_assignments', "timeend > 0 AND timeend < '$timenow'")) {
-        mtrace(count($oldenrolments).' to delete');
-        foreach ($oldenrolments as $oldenrolment) {
-            if (role_unassign($oldenrolment->roleid, $oldenrolment->userid, 0, $oldenrolment->contextid)) {
-                mtrace("Deleted expired role assignment $oldenrolment->roleid for user $oldenrolment->userid from context $oldenrolment->contextid");
-            }
-        }
+    $somefound = false;
+    // The preferred way saves memory, dmllib.php
+    // find courses where limited enrolment is enabled
+    global $CFG;
+    $rs_enrol = get_recordset_sql("SELECT ra.roleid, ra.userid, ra.contextid
+        FROM {$CFG->prefix}course c
+        INNER JOIN {$CFG->prefix}context cx ON cx.instanceid = c.id
+        INNER JOIN {$CFG->prefix}role_assignments ra ON ra.contextid = cx.id
+        WHERE cx.contextlevel = '".CONTEXT_COURSE."'
+        AND ra.timeend > 0
+        AND ra.timeend < '$timenow'
+        AND c.enrolperiod > 0
+        ");
+    mtrace($rs_enrol->RecordCount().' to delete');
+    while ($oldenrolment = rs_fetch_next_record($rs_enrol)) {
+        role_unassign($oldenrolment->roleid, $oldenrolment->userid, 0, $oldenrolment->contextid);
+        $somefound = true;
+    }
+    rs_close($rs_enrol);
+    if($somefound) {
        mtrace('Done');
    } else {
        mtrace('none found');
@@ -173,7 +198,7 @@
                foreach ($assigns as $assign) {
                    if ($context = get_context_instance(CONTEXT_COURSE, $assign->courseid)) {
                        if (role_unassign(0, $assign->id, 0, $context->id)) {
-                            mtrace("Deleted assignment for user $assign->id from course $assign->courseid");
+                            mtrace("removing user $assign->id from course $assign->courseid as they have not accessed the course for over $CFG->longtimenosee days");
                        }
                    }
                }
@@ -199,8 +224,8 @@

        /// Delete users who haven't completed profile within required period

-        if (!empty($CFG->deleteunconfirmed)) {
-            $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
+        if (!empty($CFG->deleteincompleteusers)) {
+            $cuttime = $timenow - ($CFG->deleteincompleteusers * 3600);
            if ($users = get_users_not_fully_set_up($oneweek)) {
                foreach ($users as $user) {
                    if (delete_records('user', 'id', $user->id)) {
@@ -339,7 +364,7 @@
    if (!empty($CFG->enablestats) and empty($CFG->disablestatsprocessing)) {

        // check we're not before our runtime
-        $timetocheck = strtotime("$CFG->statsruntimestarthour:$CFG->statsruntimestartminute today");
+        $timetocheck = strtotime("today $CFG->statsruntimestarthour:$CFG->statsruntimestartminute");

        if (time() > $timetocheck) {
            $time = 60*60*20; // set it to 20 here for first run... (overridden by $CFG)
@@ -54,7 +54,7 @@ function delete_subdirectories($rootdir) {

    $dir = opendir($rootdir);

-    while ($file = readdir($dir)) {
+    while (false !== ($file = readdir($dir))) {
        if ($file != '.' and $file != '..') {
            $fullfile = $rootdir .'/'. $file;
            if (filetype($fullfile) == 'dir') {
@@ -117,6 +117,166 @@
          <ON_CHECK message="tokenizerrecommended" />
        </FEEDBACK>
      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlrpc" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="xmlrpcrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="ctyperecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
    </PHP_EXTENSIONS>
  </MOODLE>
+  <MOODLE version="1.9">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mysql" version="4.1.16">
+        <FEEDBACK>
+          <ON_ERROR message="mysql416required" />
+        </FEEDBACK>
+        <BYPASS function="bypass_mysql416_reqs" message="mysql416bypassed" />
+      </VENDOR>
+      <VENDOR name="postgres" version="8.0" />
+      <VENDOR name="mssql" version="9.0" />
+      <VENDOR name="odbc_mssql" version="9.0" />
+      <VENDOR name="mssql_n" version="9.0" />
+      <VENDOR name="oracle" version="9.0" />
+    </DATABASE>
+    <PHP version="4.3.0" level="required">
+      <RESTRICT function="restrict_php50_version" message="php50restricted" />
+    </PHP>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="iconvrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="mbstringrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="curlrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opensslrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlrpc" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="xmlrpcrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="ctyperecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+    </PHP_EXTENSIONS>
+    <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="question/upgrade.php" function="question_check_no_rqp_questions" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="qtyperqpwillberemovedanyway" />
+          <ON_OK message="qtyperqpwillberemoved" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="question/upgrade.php" function="question_random_check" level="optional">
+        <FEEDBACK>
+          <ON_OK message="questioncwqpfsok" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/customcheckslib.php" function="php_check_register_globals" level="required">
+        <FEEDBACK>
+          <ON_CHECK message="globalswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+    </CUSTOM_CHECKS>
+  </MOODLE>
+  <MOODLE version="2.0" requires="1.9">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mysql" version="4.1.16">
+        <FEEDBACK>
+          <ON_ERROR message="mysql416required" />
+        </FEEDBACK>
+        <BYPASS function="bypass_mysql416_reqs" message="mysql416bypassed" />
+      </VENDOR>
+      <VENDOR name="postgres" version="8.0" />
+      <VENDOR name="mssql" version="9.0" />
+      <VENDOR name="odbc_mssql" version="9.0" />
+      <VENDOR name="mssql_n" version="9.0" />
+      <VENDOR name="oracle" version="9.0" />
+      <VENDOR name="sqlite" version="2.0" />
+    </DATABASE>
+    <PHP version="5.2.4" level="required">
+    </PHP>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="iconvrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="mbstringrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="required">
+        <FEEDBACK>
+          <ON_CHECK message="curlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opensslrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlrpc" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="xmlrpcrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zip" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ziprequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+    </PHP_EXTENSIONS>
+    <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="lib/customcheckslib.php" function="php_check_register_globals" level="required">
+        <FEEDBACK>
+          <ON_CHECK message="globalswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+    </CUSTOM_CHECKS>
+  </MOODLE>
 </COMPATIBILITY_MATRIX>
@@ -525,11 +525,203 @@ class problem_000011 extends problem_base {
            }
            return 'Error counter was cleared.';
        } else {
-            return '<p>Session errors can be caused by:<ul><li>unresolved problem in server software (aka random switching of users),</li><li>blocked or modified cookies,</li><li>deleting of active session files.</li></ul></p><p><a href="'.me().'&resetsesserrorcounter=1">Reset counter.</a></p>';
+            return '<p>Session errors can be caused by:</p><ul>' .
+            '<li>unresolved problem in server software (aka random switching of users),</li>' .
+            '<li>blocked or modified cookies,</li>' .
+            '<li>deleting of active session files.</li>' .
+            '</ul><p><a href="'.me().'&amp;resetsesserrorcounter=1">Reset counter</a></p>';
        }
    }
 }

+class problem_000012 extends problem_base {
+    function title() {
+        return 'Random questions data consistency';
+    }
+    function exists() {
+        return record_exists_select('question', "qtype = 'random' AND parent <> id");
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        return '<p>For random questions, question.parent should equal question.id. ' .
+        'There are some questions in your database for which this is not true. ' .
+        'One way that this could have happened is for random questions restored from backup before ' .
+        '<a href="http://tracker.moodle.org/browse/MDL-5482">MDL-5482</a> was fixed.</p>';
+    }
+    function solution() {
+        global $CFG;
+        return '<p>Upgrade to Moodle 1.9.1 or later, or manually execute the SQL</p>' .
+        '<pre>UPDATE ' . $CFG->prefix . 'question SET parent = id WHERE qtype = \'random\' and parent &lt;> id;</pre>';
+    }
+}
+
+class problem_000013 extends problem_base {
+    function title() {
+        return 'Multi-answer questions data consistency';
+    }
+    function exists() {
+        global $CFG;
+        $positionexpr = sql_position(sql_concat("','", "q.id", "','"), 
+                sql_concat("','", "qma.sequence", "','"));
+        return record_exists_sql("
+                SELECT * FROM {$CFG->prefix}question q
+                    JOIN {$CFG->prefix}question_multianswer qma ON $positionexpr > 0
+                WHERE qma.question <> q.parent") ||
+            record_exists_sql("
+                SELECT * FROM {$CFG->prefix}question q
+                    JOIN {$CFG->prefix}question parent_q ON parent_q.id = q.parent
+                WHERE q.category <> parent_q.category");
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        return '<p>For each sub-question whose id is listed in ' .
+        'question_multianswer.sequence, its question.parent field should equal ' .
+        'question_multianswer.question; and each sub-question should be in the same ' .
+        'category as its parent. There are questions in your database for ' .
+        'which this is not the case. One way that this could have happened is ' .
+        'for multi-answer questions restored from backup before ' .
+        '<a href="http://tracker.moodle.org/browse/MDL-14750">MDL-14750</a> was fixed.</p>';
+    }
+    function solution() {
+        return '<p>Upgrade to Moodle 1.9.1 or later, or manually execute the ' .
+        'code in question_multianswer_fix_subquestion_parents_and_categories in ' .
+        '<a href="http://cvs.moodle.org/moodle/question/type/multianswer/db/upgrade.php?revision=1.1.10.2&amp;view=markup">/question/type/multianswer/db/upgrade.php' .
+        'from the 1.9 stable branch</a>.</p>';
+    }
+}
+
+class problem_000014 extends problem_base {
+    function title() {
+        return 'Only multianswer and random questions should be the parent of another question';
+    }
+    function exists() {
+        global $CFG;
+        return record_exists_sql("
+                SELECT * FROM {$CFG->prefix}question q
+                    JOIN {$CFG->prefix}question parent_q ON parent_q.id = q.parent
+                WHERE parent_q.qtype NOT IN ('random', 'multianswer')");
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        return '<p>You have questions that violate this in your databse. ' .
+        'You will need to investigate to determine how this happened.</p>';
+    }
+    function solution() {
+        return '<p>It is impossible to give a solution without knowing more about ' .
+        ' how the problem was caused. You may be able to get help from the ' .
+        '<a href="http://moodle.org/mod/forum/view.php?f=121">Quiz forum</a>.</p>';
+    }
+}
+
+class problem_000017 extends problem_base {
+    function title() {
+        return 'Question categories tree structure';
+    }
+    function find_problems() {
+        static $answer = null;
+
+        if (is_null($answer)) {
+            $categories = get_records('question_categories', '', '', 'id');
+
+            // Look for missing parents.
+            $missingparent = array();
+            foreach ($categories as $category) {
+                if ($category->parent != 0 && !array_key_exists($category->parent, $categories)) {
+                    $missingparent[$category->id] = $category;
+                }
+            }
+
+            // Look for loops.
+            $loops = array();
+            while (!empty($categories)) {
+                $current = array_pop($categories);
+                $thisloop = array($current->id => $current);
+                while (true) {
+                    if (isset($thisloop[$current->parent])) {
+                        // Loop detected
+                        $loops[$current->id] = $thisloop;
+                        break;
+                    } else if (!isset($categories[$current->parent])) {
+                        // Got to the top level, or a category we already know is OK.
+                        break;
+                    } else {
+                        // Continue following the path.
+                        $current = $categories[$current->parent];
+                        $thisloop[$current->id] = $current;
+                        unset($categories[$current->id]);
+                    }
+                }
+            }
+
+            $answer = array($missingparent, $loops);
+        }
+
+        return $answer;
+    }
+    function exists() {
+        list($missingparent, $loops) = $this->find_problems();
+        return !empty($missingparent) || !empty($loops);
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        list($missingparent, $loops) = $this->find_problems();
+
+        $description = '<p>The question categories should be arranged into tree ' .
+                ' structures by the question_categories.parent field. Sometimes ' .
+                ' this tree structure gets messed up.</p>';
+
+        if (!empty($missingparent)) {
+            $description .= '<p>The following categories are missing their parents:</p><ul>';
+            foreach ($missingparent as $cat) {
+                $description .= "<li>Category $cat->id: " . s($cat->name) . "</li>\n";
+            }
+            $description .= "</ul>\n";
+        }
+
+        if (!empty($loops)) {
+            $description .= '<p>The following categories form a loop of parents:</p><ul>';
+            foreach ($loops as $loop) {
+                $description .= "<li><ul>\n";
+                foreach ($loop as $cat) {
+                    $description .= "<li>Category $cat->id: " . s($cat->name) . " has parent $cat->parent</li>\n";
+                }
+                $description .= "</ul></li>\n";
+            }
+            $description .= "</ul>\n";
+        }
+
+        return $description;
+    }
+    function solution() {
+        global $CFG;
+        list($missingparent, $loops) = $this->find_problems();
+
+        $solution = '<p>Consider executing the following SQL queries. These fix ' .
+                'the problem by moving some categories to the top level.</p>';
+
+        if (!empty($missingparent)) {
+            $solution .= "<pre>UPDATE " . $CFG->prefix . "question_categories\n" .
+                    "        SET parent = 0\n" .
+                    "        WHERE id IN (" . implode(',', array_keys($missingparent)) . ");</pre>\n";
+        }
+
+        if (!empty($loops)) {
+            $solution .= "<pre>UPDATE " . $CFG->prefix . "question_categories\n" .
+                    "        SET parent = 0\n" .
+                    "        WHERE id IN (" . implode(',', array_keys($loops)) . ");</pre>\n";
+        }
+
+        return $solution;
+    }
+}

 class problem_00000x extends problem_base {
    function title() {
@@ -190,8 +190,9 @@
        $db->debug = false;
        if ($status) {
            //ugly hack - install new groups: MDL-9217
-            require_once("$CFG->dirroot/group/db/upgrade.php");
-            install_group_db();
+            require("$CFG->dirroot/group/version.php");
+            set_config('group_version', $group_version);
+            //install_group_db();

            // Install the roles system.
            moodle_install_roles();
@@ -281,11 +282,16 @@
                require_once($CFG->libdir.'/environmentlib.php');
                print_heading(get_string('environment', 'admin'));
                if (!check_moodle_environment($release, $environment_results, true)) {
+                    print_box_start('generalbox', 'notice'); // MDL-8330
+                    print_string('langpackwillbeupdated', 'admin');
+                    print_box_end();
                    notice_yesno(get_string('environmenterrorupgrade', 'admin'), 
                                 'index.php?confirmupgrade=1&confirmrelease=1', 'index.php');
                } else {
                    notify(get_string('environmentok', 'admin'), 'notifysuccess');
-
+                    print_box_start('generalbox', 'notice'); // MDL-8330
+                    print_string('langpackwillbeupdated', 'admin');
+                    print_box_end();  
                    echo '<form action="index.php"><div>';
                    echo '<input type="hidden" name="confirmupgrade" value="1" />';
                    echo '<input type="hidden" name="confirmrelease" value="1" />';
@@ -325,9 +331,10 @@
            /// If successful, continue upgrading roles and setting everything properly
                if ($status) {
                    if (empty($CFG->rolesactive)) {
-                        //ugly hack - upgrade to new groups (from 1.6) : MDL-9217
-                        require_once("$CFG->dirroot/group/db/upgrade.php");
-                        install_group_db();
+                        // ugly hack - upgrade to new groups (from 1.6) : MDL-9217
+                        // require_once("$CFG->dirroot/group/db/upgrade.php");
+                        // MDL-11062, proper group upgrade code is done in lib/db/upgrade.php
+                        // install_group_db();
                        // Upgrade to the roles system.
                        moodle_install_roles();
                        set_config('rolesactive', 1);
@@ -407,6 +414,9 @@
 /// first old *.php update and then the new upgrade.php script
    upgrade_plugins('enrol', 'enrol', "$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards

+/// Check all auth plugins and upgrade if necessary
+    upgrade_plugins('auth','auth',"$CFG->wwwroot/$CFG->admin/index.php");
+
 /// Check all course formats and upgrade if necessary
    upgrade_plugins('format','course/format',"$CFG->wwwroot/$CFG->admin/index.php");

@@ -416,7 +426,7 @@
    upgrade_local_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards

 /// Check for changes to RPC functions
-    require_once($CFG->dirroot.'/admin/mnet/adminlib.php');
+    require_once("$CFG->dirroot/$CFG->admin/mnet/adminlib.php");
    upgrade_RPC_functions("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards


@@ -488,19 +498,7 @@

 /// Check if the guest user exists.  If not, create one.
    if (! record_exists("user", "username", "guest")) {
-        $guest->auth        = "manual";
-        $guest->username    = "guest";
-        $guest->password    = md5("guest");
-        $guest->firstname   = addslashes(get_string("guestuser"));
-        $guest->lastname    = " ";
-        $guest->email       = "root@localhost";
-        $guest->description = addslashes(get_string("guestuserinfo"));
-        $guest->mnethostid  = $CFG->mnet_localhost_id;
-        $guest->confirmed   = 1;
-        $guest->lang        = $CFG->lang;
-        $guest->timemodified= time();
-
-        if (! $guest->id = insert_record("user", $guest)) {
+        if (! $guest = create_guest_record()) {
            notify("Could not create guest user record !!!");
        }
    }
@@ -549,15 +547,26 @@
        print_box(get_string("upgrade$CFG->upgrade", "admin", "$CFG->wwwroot/$CFG->admin/upgrade$CFG->upgrade.php"));
    }

-    if (ini_get_bool('register_globals') && !ini_get_bool('magic_quotes_gpc')) {
-        print_box(get_string('globalsquoteswarning', 'admin'), 'generalbox adminwarning');
+    if (ini_get_bool('register_globals')) {
+        print_box(get_string('globalswarning', 'admin'), 'generalbox adminwarning');
    }

    if (is_dataroot_insecure()) {
        print_box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot), 'generalbox adminwarning');
    }

-/// If no recently cron run
+    if (defined('WARN_DISPLAY_ERRORS_ENABLED')) {
+        print_box(get_string('displayerrorswarning', 'admin'), 'generalbox adminwarning');
+    }
+
+    if (substr($CFG->wwwroot, -1) == '/') {
+        print_box(get_string('cfgwwwrootslashwarning', 'admin'), 'generalbox adminwarning');
+    }
+    if (strpos($ME, $CFG->httpswwwroot.'/') === false) {
+        print_box(get_string('cfgwwwrootwarning', 'admin'), 'generalbox adminwarning');
+    }
+
+    /// If no recently cron run
    $lastcron = get_field_sql('SELECT max(lastcron) FROM ' . $CFG->prefix . 'modules');
    if (time() - $lastcron > 3600 * 24) {
        $strinstallation = get_string('installation', 'install');
@@ -592,7 +601,7 @@
    //////////////////////////////////////////////////////////////////////////////////////////////////
    ////  IT IS ILLEGAL AND A VIOLATION OF THE GPL TO HIDE, REMOVE OR MODIFY THIS COPYRIGHT NOTICE ///
    $copyrighttext = '<a href="http://moodle.org/">Moodle</a> '.
-                     '<a href="http://docs.moodle.org/en/Release">'.$CFG->release.'</a> ('.$CFG->version.')<br />'.
+                     '<a href="http://docs.moodle.org/en/Release" title="'.$CFG->version.'">'.$CFG->release.'</a><br />'.
                     'Copyright &copy; 1999 onwards, Martin Dougiamas<br />'.
                     'and <a href="http://docs.moodle.org/en/Credits">many other contributors</a>.<br />'.
                     '<a href="http://docs.moodle.org/en/License">GNU Public License</a>';
@@ -583,6 +583,9 @@ function lang_fix_value_before_save($value='') {
    if ($CFG->lang != "zh_hk" and $CFG->lang != "zh_tw") {  // Some MB languages include backslash bytes
        $value = str_replace("\\","",$value);           // Delete all slashes
    }
+    if (ini_get_bool('magic_quotes_sybase')) {          // Unescape escaped sybase quotes
+        $value = str_replace("''", "'", $value);
+    }
    $value = str_replace("'", "\\'", $value);           // Add slashes for '
    $value = str_replace('"', "\\\"", $value);          // Add slashes for "
    $value = str_replace("%","%%",$value);              // Escape % characters
@@ -308,7 +308,7 @@
            }
            if ($remote) {
                echo '</select>';
-                echo '<br /><input type="submit" value="&larr; '.get_string('install','admin').'" />';
+                echo '<br /><input type="submit" value="'.$THEME->larrow.' '.get_string('install','admin').'" />';
            }
            echo '</fieldset>';
            echo '</form>';
@@ -47,7 +47,7 @@ if (!empty($action) and confirm_sesskey()) {
    // fetch the record in question
    $id = required_param('id', PARAM_INT);
    if (!$idrec = get_record('mnet_sso_access_control', 'id', $id)) {
-        error(get_string('recordnoexists','mnet'), '/admin/mnet/access_control.php');
+        error(get_string('recordnoexists','mnet'), "/$CFG->admin/mnet/access_control.php");
    }

    switch ($action) {
@@ -62,7 +62,7 @@ if (!empty($action) and confirm_sesskey()) {
            // require the access parameter, and it must be 'allow' or 'deny'
            $accessctrl = trim(strtolower(required_param('accessctrl', PARAM_ALPHA)));
            if ($accessctrl != 'allow' and $accessctrl != 'deny') {
-                error(get_string('invalidaccessparam', 'mnet') , '/admin/mnet/access_control.php');
+                error(get_string('invalidaccessparam', 'mnet') , "/$CFG->admin/mnet/access_control.php");
            }

            if (mnet_update_sso_access_control($idrec->username, $idrec->mnet_host_id, $accessctrl)) {
@@ -75,7 +75,7 @@ if (!empty($action) and confirm_sesskey()) {
            break;

        default:
-            print_error('invalidactionparam', 'mnet', '/admin/mnet/access_control.php');
+            print_error('invalidactionparam', 'mnet', "/$CFG->admin/mnet/access_control.php");
    }
 }

@@ -86,7 +86,7 @@ if ($form = data_submitted() and confirm_sesskey()) {

    // check permissions and verify form input
    if (!has_capability('moodle/user:delete', $sitecontext)) {
-        error(get_string('nomodifyacl','mnet'), '/admin/mnet/access_control.php');
+        error(get_string('nomodifyacl','mnet'), "/$CFG->admin/mnet/access_control.php");
    }
    if (empty($form->username)) {
        $formerror['username'] = get_string('enterausername','mnet');
@@ -29,7 +29,7 @@ function mnet_get_functions($type, $parentname) {
        $docname = 'rpclib.php';
        $relname  = '/mod/'.$parentname.'/'.$docname;
        $filename = $CFG->dirroot.$relname;
-        if (file_exists($filename)) include $filename;
+        if (file_exists($filename)) include_once $filename;
        $mnet_publishes = $parentname.'_mnet_publishes';
        if (function_exists($mnet_publishes)) {
            (array)$publishes = $mnet_publishes();
@@ -38,7 +38,7 @@ function mnet_get_functions($type, $parentname) {
        // auth or enrol
        $relname  = '/'.$type.'/'.$parentname.'/'.$docname;
        $filename = $CFG->dirroot.$relname;
-        if (file_exists($filename)) include $filename;
+        if (file_exists($filename)) include_once $filename;
        $class = $type.($type=='enrol'? 'ment':'').'_plugin_'.$parentname;
        if (class_exists($class)) {
            $object = new $class();
@@ -72,7 +72,7 @@ function mnet_get_functions($type, $parentname) {
    if (!file_exists($filename)) return false;

    if (extension_loaded('tokenizer')) {
-        include_once $CFG->dirroot.'/admin/mnet/MethodTable.php';
+        include_once "$CFG->dirroot/$CFG->admin/mnet/MethodTable.php";
        $functions = (array)MethodTable::create($filename,false);
    }

@@ -1,7 +1,7 @@
 <?php
 print_header("$site->shortname: $strmnetsettings", "$site->fullname",
-             '<a href="'.$CFG->wwwroot.'/admin/index.php">'.$stradministration.'</a> -> '.
-             '<a href="'.$CFG->wwwroot.'/admin/mnet/index.php">'.get_string('mnetsettings', 'mnet').'</a> -> Delete host');
+             '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/index.php">'.$stradministration.'</a> -> '.
+             '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/mnet/index.php">'.get_string('mnetsettings', 'mnet').'</a> -> Delete host');

 print_heading(get_string('mnetsettings', 'mnet'));
 ?>
@@ -46,7 +46,7 @@ print_heading(get_string('mnetsettings', 'mnet'));
            </td>
        </tr>
    </table>
-</center>
+</div>
 <?php
 print_footer();
 ?>
@@ -38,7 +38,7 @@
    " class=\"icon\" alt=\"".get_string("course")."\" />";

    foreach ($courses as $course) {
-        $link = $CFG->wwwroot . '/admin/mnet/enr_course_enrol.php?'
+        $link = "$CFG->wwwroot/$CFG->admin/mnet/enr_course_enrol.php?"
            . "host={$mnethost}&amp;courseid={$course->id}&amp;sesskey={$USER->sesskey}";
        echo '<tr>'
               . "<td>$icon</td>"
@@ -38,7 +38,7 @@
           . '</tr>';
    $hosts = $enrolment->list_remote_servers();
    foreach ($hosts as $host) {
-        $coursesurl = "{$CFG->wwwroot}/admin/mnet/enr_courses.php?host={$host->id}&amp;sesskey={$USER->sesskey}";
+        $coursesurl = "{$CFG->wwwroot}/$CFG->admin/mnet/enr_courses.php?host={$host->id}&amp;sesskey={$USER->sesskey}";
        $coursecount = get_field_sql("SELECT count(id) FROM {$CFG->prefix}mnet_enrol_course WHERE hostid={$host->id}");
        if (empty($coursecount)) {
            $coursecount = '?';
@@ -40,7 +40,7 @@
 /// If data submitted, process and store
    if (($form = data_submitted()) && confirm_sesskey()) {
        if (!empty($form->submit) && $form->submit == get_string('savechanges')) {
-            if (in_array($form->mode, array("off", "strict", "promiscuous"))) {
+            if (in_array($form->mode, array("off", "strict", "dangerous"))) {
                if (set_config('mnet_dispatcher_mode', $form->mode)) {
                    redirect('index.php', get_string('changessaved'));
                } else {
@@ -48,7 +48,14 @@
            $publish        = (isset($_POST['publish'][$key]) && $_POST['publish'][$key] == 'on')? 1 : 0;
            $subscribe      = (isset($_POST['subscribe'][$key]) && $_POST['subscribe'][$key] == 'on')? 1 : 0;

-            if (false == $host2service && ($publish == 1 || $subscribe == 1)) {
+            if ($publish != 1 && $subscribe != 1) {
+                if (false == $host2service) {
+                    // We don't have or need a record - do nothing!
+                } else {
+                    // We don't need the record - delete it
+                    delete_records('mnet_host2service', 'hostid', $_POST['hostid'], 'serviceid', $key);
+                }
+            } elseif (false == $host2service && ($publish == 1 || $subscribe == 1)) {
                $host2service = new stdClass();
                $host2service->hostid = $_POST['hostid'];
                $host2service->serviceid = $key;
@@ -76,7 +76,7 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict'
                </th>
            </tr>
            <tr>
-                <td class="cell c0"></td>
+                <td class="cell c0">wwwroot:</td>
                <td class="cell c1"><input type="text" name="wwwroot" value="" /></td>
                <td class="cell c2"></td>
                <td class="cell c3"></td>
@@ -50,6 +50,11 @@ if (($form = data_submitted()) && confirm_sesskey()) {
    if (!empty($form->wwwroot)) {
        // ensure we remove trailing slashes
        $form->wwwroot = preg_replace(':/$:', '', $form->wwwroot);
+        
+        // ensure the wwwroot starts with a http or https prefix
+        if (strtolower(substr($form->wwwroot, 0, 4)) != 'http') {
+            $form->wwwroot = 'http://'.$form->wwwroot;
+        }
    }

    if(!function_exists('xmlrpc_encode_request')) {
@@ -91,6 +96,7 @@ if (($form = data_submitted()) && confirm_sesskey()) {
    
        if (isset($form->deleted) && ($form->deleted == '0' || $form->deleted == '1')) {
            $mnet_peer->deleted = $form->deleted;
+            $mnet_peer->updateparams->deleted = $form->deleted;
        }
    
        if (isset($form->public_key)) {
@@ -101,9 +107,10 @@ if (($form = data_submitted()) && confirm_sesskey()) {
            } else {
                $oldkey = $mnet_peer->public_key;
                $mnet_peer->public_key = $form->public_key;
-                $mnet_peer->public_key_expires   = $mnet_peer->check_common_name($form->public_key);
+                $mnet_peer->updateparams->public_key = $form->public_key;
+                $mnet_peer->public_key_expires = $mnet_peer->check_common_name($form->public_key);
+                $mnet_peer->updateparams->public_key_expires = $mnet_peer->check_common_name($form->public_key);
                if ($mnet_peer->public_key_expires == false) {
-                    $mnet_peer->public_key == $oldkey;
                    $errmsg = '<br />';
                    foreach ($mnet_peer->error as $err) {
                        $errmsg .= $err['code'] . ': ' . $err['text'].'<br />';
@@ -16,7 +16,7 @@
        }

        if ($module != '') {
-            require_once("$CFG->dirroot/mod/$module/lib.php");
+            include_once("$CFG->dirroot/mod/$module/lib.php");
            // if the config.html contains a hidden form field giving
            // the module name then the form does not have to prefix all
            // its variable names, we will do it here.
@@ -43,7 +43,7 @@

 /// Otherwise print the form.
    $module = required_param('module', PARAM_SAFEDIR);
-    require_once("$CFG->dirroot/mod/$module/lib.php");
+    include_once("$CFG->dirroot/mod/$module/lib.php");

    $strmodulename = get_string("modulename", $module);

@@ -34,29 +34,45 @@

    print_heading($stractivities);

-    $coursesaffected = false;
-
-
 /// If data submitted, then process and store.

    if (!empty($hide) and confirm_sesskey()) {
        if (!$module = get_record("modules", "name", $hide)) {
            error("Module doesn't exist!");
        }
-        set_field("modules", "visible", "0", "id", $module->id);                               // Hide main module
-        set_field('course_modules', 'visibleold', '1', 'visible' ,'1', 'module', $module->id); // Remember the previous visible state so we can toggle this back if the module is unhidden.
-        set_field('course_modules', 'visibleold', '0', 'visible' ,'0', 'module', $module->id);
-        set_field("course_modules", "visible", "0", "module", $module->id);                    // Hide all related activity modules
-        $coursesaffected = true;
+        set_field("modules", "visible", "0", "id", $module->id); // Hide main module
+        // Remember the visibility status in visibleold
+        // and hide...
+        $sql = "UPDATE {$CFG->prefix}course_modules
+                SET visibleold=visible,
+                    visible=0
+                WHERE  module={$module->id}";
+        execute_sql($sql, false);
+        // clear the course modinfo cache for courses
+        // where we just deleted something
+        $sql = "UPDATE {$CFG->prefix}course
+                SET modinfo=''
+                WHERE id IN (SELECT DISTINCT course 
+                             FROM {$CFG->prefix}course_modules 
+                             WHERE visibleold=1 AND module={$module->id})";
+        execute_sql($sql, false);
    }

    if (!empty($show) and confirm_sesskey()) {
        if (!$module = get_record("modules", "name", $show)) {
            error("Module doesn't exist!");
        }
-        set_field("modules", "visible", "1", "id", $module->id);                               // Show main module
-        set_field('course_modules', 'visible', '1', 'visibleold', '1', 'module', $module->id); // Get the previous saved visible state for the course module.
-        $coursesaffected = true;
+        set_field("modules", "visible", "1", "id", $module->id); // Show main module
+        set_field('course_modules', 'visible', '1', 'visibleold', 
+                  '1', 'module', $module->id); // Get the previous saved visible state for the course module.
+        // clear the course modinfo cache for courses
+        // where we just made something visible
+        $sql = "UPDATE {$CFG->prefix}course
+                SET modinfo=''
+                WHERE id IN (SELECT DISTINCT course 
+                             FROM {$CFG->prefix}course_modules 
+                             WHERE visible=1 AND module={$module->id})";
+        execute_sql($sql, false);
    }

    if (!empty($delete) and confirm_sesskey()) {
@@ -89,6 +105,15 @@
                }
            }

+            // clear course.modinfo for courses
+            // that used this module...
+            $sql = "UPDATE {$CFG->prefix}course
+                    SET modinfo=''
+                    WHERE id IN (SELECT DISTINCT course 
+                                 FROM {$CFG->prefix}course_modules 
+                                 WHERE module={$module->id})";
+            execute_sql($sql, false);
+
            // Now delete all the course module records
            if (!delete_records("course_modules", "module", $module->id)) {
                notify("Error occurred while deleting all $strmodulename records in course_modules table");
@@ -124,20 +149,12 @@
            // Delete the capabilities that were defined by this module
            capabilities_cleanup('mod/'.$module->name);

-            // rebuild_course_cache();  // Because things have changed
-            $coursesaffected = true;
-
            $a->module = $strmodulename;
            $a->directory = "$CFG->dirroot/mod/$delete";
            notice(get_string("moduledeletefiles", "", $a), "modules.php");
        }
    }

-    if ($coursesaffected) {
-        rebuild_course_cache();  // Because things have changed
-    }
-
-
 /// Get and sort the existing modules

    if (!$modules = get_records("modules")) {
@@ -42,7 +42,7 @@ while(@ob_end_flush());

 echo '<strong>Progress:</strong>';
 $i = 0;
-$skiptables = array($CFG->prefix.'config');//, $CFG->prefix.'sessions2');
+$skiptables = array($CFG->prefix.'config', $CFG->prefix.'user_students', $CFG->prefix.'user_teachers');//, $CFG->prefix.'sessions2');

 foreach ($tables as $table) {
    if (($CFG->prefix && strpos($table, $CFG->prefix) !== 0)
@@ -63,12 +63,8 @@ foreach ($tables as $table) {
                if ($rs and $rs->RecordCount() > 0) {
                    while (!$rs->EOF) {
                        $text = $rs->fields[$column];
-                        $search = '/(<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)(\s*<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)+/is';
-                        $newtext = preg_replace_callback($search, 'multilangupgrade_impl', $text);
-                        if ($newtext != $text) {
-                            $newtext = addslashes($newtext);
-                            execute_sql("UPDATE $table SET $column='$newtext' WHERE id=".$rs->fields['id'], false);
-                        }
+                        $id   = $rs->fields['id'];
+
                        if ($i % 600 == 0) {
                            echo '<br />';
                        }
@@ -77,6 +73,22 @@ foreach ($tables as $table) {
                        }
                        $i++;
                        $rs->MoveNext();
+
+                        if (empty($text) or is_numeric($text)) {
+                            continue; // nothing to do
+                        }
+
+                        $search = '/(<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)(\s*<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)+/is';
+                        $newtext = preg_replace_callback($search, 'multilangupgrade_impl', $text);
+
+                        if (is_null($newtext)) {
+                            continue; // regex error
+                        }
+
+                        if ($newtext != $text) {
+                            $newtext = addslashes($newtext);
+                            execute_sql("UPDATE $table SET $column='$newtext' WHERE id=$id", false);
+                        }
                    }
                }
            }
@@ -54,7 +54,7 @@ if ($modid == '0') { // special
 }
 else {
    $modname = get_field("modules","name","id",$modid);
-    require_once('mod/'.$modname.'/lib.php');
+    include_once('mod/'.$modname.'/lib.php');
 }
 $function = $modname.'_process_email';

@@ -0,0 +1,140 @@
+<?php // $Id$
+      // index.php - scheduled backup logs
+
+    require_once('../../../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    require_once($CFG->dirroot.'/backup/lib.php');
+
+    $adminroot = admin_get_root();
+
+    admin_externalpage_setup('reportbackups', $adminroot);
+
+    admin_externalpage_print_header($adminroot);
+
+    $courseid = optional_param('courseid', 0, PARAM_INT);
+
+    require_capability('moodle/site:backup', get_context_instance(CONTEXT_SYSTEM, SITEID));
+
+/// Scheduled backups are disabled by the server admin
+    if (!empty($CFG->disablescheduledbackups)) {
+        print_error('scheduledbackupsdisabled', '', '', NULL, true);
+    }
+
+/// Scheduled backups aren't active by the site admin
+    $backup_config = backup_get_config();
+    if (empty($backup_config->backup_sche_active)) {
+        notify(get_string('scheduledbackupsinactive'));
+    }
+
+/// Get needed strings
+    $backuploglaststatus = get_string("backuploglaststatus");
+    $backuplogdetailed = get_string("backuplogdetailed");
+    $stradmin = get_string("administration");
+    $strconfiguration = get_string("configuration");
+    $strbackup = get_string("backup");
+    $strbackupdetails = get_string("backupdetails");
+    $strlogs = get_string("logs");
+    $strftimedatetime = get_string("strftimerecent");
+    $strftimetime = get_string("strftimetime").":%S";
+    $strerror = get_string("error");
+    $strok = get_string("ok");
+    $strunfinished = get_string("unfinished");
+    $strskipped = get_string("skipped");
+    $strcourse = get_string("course");
+    $strtimetaken = get_string("timetaken","quiz");
+    $strstatus = get_string("status");
+    $strnext = get_string("next");
+
+/// Decide when to show last execution logs or detailed logs
+/// Lastlog view
+    if (!$courseid) {
+        print_heading($backuploglaststatus);
+        print_simple_box_start('center');
+    /// Now, get every record from backup_courses
+        $courses = get_records("backup_courses");
+
+        if (!$courses) {
+            notify(get_string('nologsfound'));
+        } else {
+            echo "<table border=\"0\" align=\"center\" cellpadding=\"3\" cellspacing=\"3\">";
+            //Print table header
+            echo "<tr>";
+            echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"3\">$strcourse</font></td>";
+            echo "<td nowrap=\"nowrap\" align=\"center\" colspan=\"3\"><font size=\"3\">$strtimetaken</font></td>";
+            echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"3\">$strstatus</font></td>";
+            echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"3\">$strnext</font></td></tr>";
+            foreach ($courses as $course) {
+            /// Get the course shortname
+                $coursename = get_field ("course","fullname","id",$course->courseid);
+                if ($coursename) {
+                    echo "<tr>";
+                    echo "<td nowrap=\"nowrap\"><font size=\"2\"><a href=\"index.php?courseid=$course->courseid\">".$coursename."</a></font></td>";
+                    echo "<td nowrap=\"nowrap\"><font size=\"2\">".userdate($course->laststarttime,$strftimedatetime)."</font></td>";
+                    echo "<td nowrap=\"nowrap\"><font size=\"2\"> - </font></td>";
+                    echo "<td nowrap=\"nowrap\"><font size=\"2\">".userdate($course->lastendtime,$strftimedatetime)."</font></td>";
+                    if ($course->laststatus == 1) {
+                        echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"2\" color=\"green\">".$strok."</font></td>";
+                    } else if ($course->laststatus == 2) {
+                        echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"2\" color=\"red\">".$strunfinished."</font></td>";
+                    } else if ($course->laststatus == 3) {
+                        echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"2\" color=\"green\">".$strskipped."</font></td>";
+                    } else {
+                        echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"2\" color=\"red\">".$strerror."</font></td>";
+                    }
+                    echo "<td nowrap=\"nowrap\"><font size=\"2\">".userdate($course->nextstarttime,$strftimedatetime)."</font></td>";
+                    echo "</tr>";
+                }
+            }
+            echo "</table>";
+        }
+        print_simple_box_end();
+/// Detailed View !!
+    } else {
+        print_heading($backuplogdetailed);
+
+        $coursename = get_field("course","fullname","id","$courseid");
+        print_heading("$strcourse: $coursename");
+
+        print_simple_box_start('center');
+
+    /// First, me get all the distinct backups for that course in backup_log
+        $executions = get_records_sql("SELECT DISTINCT laststarttime,laststarttime
+                                       FROM {$CFG->prefix}backup_log
+                                       WHERE courseid = '$courseid'
+                                       ORDER BY laststarttime DESC");
+
+    /// Iterate over backup executions
+        if (!$executions) {
+            notify(get_string('nologsfound'));
+        } else {
+            echo "<table border=\"0\" align=\"center\" cellpadding=\"3\" cellspacing=\"3\">";
+            foreach($executions as $execution) {
+                echo "<tr>";
+                echo "<td nowrap=\"nowrap\" align=\"center\" colspan=\"3\">";
+                print_simple_box("<center>".userdate($execution->laststarttime)."</center>", "center");
+                echo "</td>";
+                echo "</tr>";
+                $logs = get_records_sql("SELECT *
+                                         FROM {$CFG->prefix}backup_log
+                                         WHERE courseid = '$courseid'  AND
+                                               laststarttime = '$execution->laststarttime'
+                                         ORDER BY id");
+                if ($logs) {
+                    foreach ($logs as $log) {
+                        echo "<tr>";
+                        echo "<td nowrap=\"nowrap\"><font size=\"2\">".userdate($log->time,$strftimetime)."</font></td>";
+                        $log->info = str_replace("- ERROR!!","- <font color=\"red\">ERROR!!</font>",$log->info);
+                        $log->info = str_replace("- OK","- <font color=\"green\">OK</font>",$log->info);
+                        echo "<td nowrap=\"nowrap\"><font size=\"2\">".str_replace("  ","&nbsp;&nbsp;&nbsp;&nbsp;",$log->info)."</font></td>";
+                        echo "</tr>";
+                    }
+                }
+            }
+            echo "</table>";
+        }
+        print_simple_box_end();
+    }
+
+    admin_externalpage_print_footer($adminroot);
+
+?>
@@ -10,9 +10,9 @@

    require_login();

-    require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM));

-    stats_check_uptodate($course->id);
+    stats_check_uptodate();

    $param = stats_get_parameters($time,$report,SITEID,STATS_MODE_RANKED);

@@ -0,0 +1,74 @@
+<?php // $Id$
+
+    require_once('../../../config.php');
+    require_once($CFG->dirroot.'/question/upgrade.php');
+    require_once($CFG->libdir.'/adminlib.php');
+
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('reportquestion', $adminroot);
+
+    admin_externalpage_print_header($adminroot);
+    print_heading(page_doc_link(get_string('adminreport', 'question')));
+
+    $probstr = '';
+    $contextupgradeversion = 2007081000;
+    if ($CFG->version < $contextupgradeversion){
+        ///cwrqpfs issue
+        $probstr = print_heading(get_string('cwrqpfs', 'question'), '', 3, 'main', true);
+
+        if ($updates = question_cwqpfs_to_update()){
+
+            $probstr .=get_string('cwrqpfsinfo', 'question');
+            $probstr .= '<ul>';
+            $catlist = join(array_keys($updates), ',');
+            //get info about cateogries and no of questions used outside category's course
+            $categories = get_records_sql('SELECT qc.*, c.fullname as coursename FROM '.$CFG->prefix.'question_categories as qc, '
+                        .$CFG->prefix.'course as c WHERE qc.course = c.id AND qc.id IN ('.$catlist.')');
+            foreach ($updates as $id => $publish){
+                $categories[$id]->caturl = "$CFG->wwwroot/question/category.php?sesskey=".sesskey().
+                            "&amp;edit=$id&amp;id=".$categories[$id]->course;
+                if ($categories[$id]->publish){
+                    $categories[$id]->changefrom = get_string('published', 'question');
+                    $categories[$id]->changeto = get_string('unpublished', 'question');
+                } else {
+                    $categories[$id]->changefrom = get_string('unpublished', 'question');
+                    $categories[$id]->changeto = get_string('published', 'question');
+                }
+                $probstr .= '<li>'.get_string('changepublishstatuscat', 'question', $categories[$id]);
+                if ($questions = get_records_sql('SELECT q.*, qui.id as quizid, qui.name as quizname, cm.id as cmid, '
+                               .'qui.course, c.fullname as coursename FROM '.$CFG->prefix.'question q, '
+                               .$CFG->prefix.'quiz_question_instances qqi, '
+                               .$CFG->prefix.'quiz qui, '
+                               .$CFG->prefix.'course_modules cm, '
+                               .$CFG->prefix.'modules m, '
+                               .$CFG->prefix.'course c '
+                            .'WHERE (q.category = '.$id.' AND qqi.question = q.id '
+                            .'AND qqi.quiz = qui.id '
+                            .'AND qui.course = c.id '
+                            .'AND cm.instance = qui.id '
+                            .'AND cm.module = m.id '
+                            .'AND m.name = \'quiz\''
+                            .'AND ('.$categories[$id]->course.' <> qui.course)) ORDER BY qui.id ASC')){
+
+                    $probstr .= '<ul>';
+                    foreach ($questions as $question){
+                        $question->quizurl = "$CFG->wwwroot/mod/quiz/edit.php?cmid=".$question->cmid;
+                        $question->qurl = "$CFG->wwwroot/question/question.php?cmid={$question->cmid}&amp;id={$question->id}&amp;returnurl=".urlencode($FULLME);
+                        $probstr .= '<li>'.get_string('questionaffected', 'question', $question).'</li>';
+                    }
+                    $probstr .= '</ul>';
+                }
+                $probstr .= '</li>';
+            }
+            $probstr .= '</ul>';
+        } else {
+            $probstr .=('<p>'.get_string('cwrqpfsnoprob', 'question').'</p>');
+        }
+    }
+    if ($probstr) {
+        print_box($probstr);
+    } else {
+        print_box(get_string('noprobs', 'question'), 'boxwidthnarrow boxaligncenter generalbox');
+    }
+    admin_externalpage_print_footer($adminroot);
+?>
@@ -43,9 +43,8 @@
        </label>
        <?php check_theme_arrows(); ?>
        <p class="arrow_button">
-            <input name="add" id="add" type="submit" value="<?php echo '&nbsp;'.$THEME->larrow.' &nbsp; &nbsp; '.get_string('add'); ?>" title="<?php print_string('add'); ?>" />
-            <br />
-            <input name="remove" id="remove" type="submit" value="<?php echo '&nbsp; '.$THEME->rarrow.' &nbsp; &nbsp; '.get_string('remove'); ?>" title="<?php print_string('remove'); ?>" />
+            <input name="add" id="add" type="submit" value="<?php echo $THEME->larrow.'&nbsp;'.get_string('add'); ?>" title="<?php print_string('add'); ?>" /><br />
+            <input name="remove" id="remove" type="submit" value="<?php echo get_string('remove').'&nbsp;'.$THEME->rarrow; ?>" title="<?php print_string('remove'); ?>" />
        </p>
      </td>
      <td valign="top">
@@ -58,13 +57,11 @@
          <?php
            $i=0;
            if (!empty($searchtext)) {
-                echo "<optgroup label=\"$strsearchresults (" . $availableusers->_numOfRows . ")\">\n";
+                echo "<optgroup label=\"$strsearchresults (" . $usercount . ")\">\n";
                while ($user = rs_fetch_next_record($availableusers)) {
-                    if (!isset($contextusers[$user->id])) {
-                        $fullname = fullname($user, true);
-                        echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
-                        $i++;
-                    }
+                    $fullname = fullname($user, true);
+                    echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
+                    $i++;
                }
                echo "</optgroup>\n";

@@ -74,11 +71,9 @@
                          .'<optgroup label="'.get_string('trysearching').'"><option></option></optgroup>'."\n";
                } else {
                    while ($user = rs_fetch_next_record($availableusers)) {
-                        if (!isset($contextusers[$user->id])) {
-                            $fullname = fullname($user, true);
-                            echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
-                            $i++;
-                        }
+                        $fullname = fullname($user, true);
+                        echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
+                        $i++;
                    }
                }
            }
@@ -163,7 +163,9 @@
                    }
                }
            }
-
+            
+            $rolename = get_field('role', 'name', 'id', $roleid);
+            add_to_log($course->id, 'role', 'assign', 'admin/roles/assign.php?contextid='.$context->id.'&roleid='.$roleid, $rolename, '', $USER->id);
        } else if ($remove and !empty($frm->removeselect) and confirm_sesskey()) {

            $sitecontext = get_context_instance(CONTEXT_SYSTEM);
@@ -197,11 +199,16 @@
                    }
                }
            }
-
+            
+            $rolename = get_field('role', 'name', 'id', $roleid);
+            add_to_log($course->id, 'role', 'unassign', 'admin/roles/assign.php?contextid='.$context->id.'&roleid='.$roleid, $rolename, '', $USER->id);
        } else if ($showall) {
            $searchtext = '';
            $previoussearch = 0;
        }
+        
+        
+    
    }

    if ($context->contextlevel==CONTEXT_COURSE and $context->instanceid == SITEID) {
@@ -233,16 +240,99 @@
            $LIKE      = sql_ilike();
            $FULLNAME  = sql_fullname();

-            $select  .= " AND ($FULLNAME $LIKE '%$searchtext%' OR email $LIKE '%$searchtext%') ";
+            $selectsql = " AND ($FULLNAME $LIKE '%$searchtext%' OR email $LIKE '%$searchtext%') ";
+            $select  .= $selectsql;
+        } else { 
+            $selectsql = ""; 
        }

-        $availableusers = get_recordset_sql('SELECT id, firstname, lastname, email
-                                               FROM '.$CFG->prefix.'user
-                                              WHERE '.$select.'
-                                            ORDER BY lastname ASC, firstname ASC');
+        if ($context->contextlevel > CONTEXT_COURSE) { // mod or block (or group?)

-        /// In the .html file below we loop through these results and exclude any in $contextusers
+            /************************************************************************
+             *                                                                      *
+             * context level is above or equal course context level                 *
+             * in this case we pull out all users matching search criteria (if any) *
+             *                                                                      *
+             * MDL-11324                                                            *
+             * a mini get_users_by_capability() call here, this is done instead of  *
+             * get_users_by_capability() because                                    *
+             * 1) get_users_by_capability() does not deal with searching by name    *
+             * 2) exceptions array can be potentially large for large courses       *
+             * 3) get_recordset_sql() is more efficient                             *
+             *                                                                      *
+             ************************************************************************/
+        
+            if ($possibleroles = get_roles_with_capability('moodle/course:view', CAP_ALLOW, $context)) {
+  
+                $doanythingroles = get_roles_with_capability('moodle/site:doanything', CAP_ALLOW, get_context_instance(CONTEXT_SYSTEM));

+                $validroleids = array();
+                foreach ($possibleroles as $possiblerole) {
+                    if (isset($doanythingroles[$possiblerole->id])) {  // We don't want these included
+                            continue;
+                    }
+                    if ($caps = role_context_capabilities($possiblerole->id, $context, 'moodle/course:view')) { // resolved list
+                        if (isset($caps['moodle/course:view']) && $caps['moodle/course:view'] > 0) { // resolved capability > 0
+                            $validroleids[] = $possiblerole->id;
+                        }
+                    }
+                }
+
+                if ($validroleids) {
+                    $roleids =  '('.implode(',', $validroleids).')';
+            
+                    $select = " SELECT u.id, u.firstname, u.lastname, u.email";
+                    $countselect = "SELECT COUNT(u.id)";
+                    $from   = " FROM {$CFG->prefix}user u
+                                INNER JOIN {$CFG->prefix}role_assignments ra ON ra.userid = u.id
+                                INNER JOIN {$CFG->prefix}role r ON r.id = ra.roleid";
+                    $where  = " WHERE ra.contextid ".get_related_contexts_string($context)."
+                                AND u.deleted = 0
+                                AND ra.roleid in $roleids";
+                    $excsql = " AND u.id NOT IN (
+                                    SELECT u.id
+                                    FROM {$CFG->prefix}role_assignments r,
+                                    {$CFG->prefix}user u
+                                    WHERE r.contextid = $contextid
+                                    AND u.id = r.userid 
+                                    AND r.roleid = $roleid
+                                    $selectsql)";
+            
+                    $availableusers = get_recordset_sql($select . $from . $where . $selectsql . $excsql);         
+                }
+
+                $usercount =  $availableusers->_numOfRows;
+
+            }
+
+        } else { 
+         
+            /************************************************************************
+             *                                                                      *
+             * context level is above or equal course context level                 *
+             * in this case we pull out all users matching search criteria (if any) *
+             *                                                                      *
+             ************************************************************************/
+            
+            /// MDL-11111 do not include user already assigned this role in this context as available users
+            /// so that the number of available users is right and we save time looping later
+            $availableusers = get_recordset_sql('SELECT id, firstname, lastname, email
+                                                FROM '.$CFG->prefix.'user
+                                                WHERE '.$select.'
+                                                AND id NOT IN (
+                                                    SELECT u.id
+                                                    FROM '.$CFG->prefix.'role_assignments r,
+                                                    '.$CFG->prefix.'user u
+                                                    WHERE r.contextid = '.$contextid.'
+                                                    AND u.id = r.userid 
+                                                    AND r.roleid = '.$roleid.'
+                                                    '.$selectsql.')
+                                                ORDER BY lastname ASC, firstname ASC');
+
+            $usercount = $availableusers->_numOfRows;         
+
+        }
+    
        echo '<div style="text-align:center">'.$strcurrentcontext.': '.print_context_name($context).'<br/>';
        $assignableroles = array('0'=>get_string('listallroles', 'role').'...') + $assignableroles;
        popup_form("$CFG->wwwroot/$CFG->admin/roles/assign.php?userid=$userid&amp;courseid=$courseid&amp;contextid=$contextid&amp;roleid=",
@@ -113,7 +113,8 @@ $contextlevel = 0;
 $component = '';

 $strrisks = s(get_string('risks', 'role'));
-$strcapabilities = s(get_string('capabilities', 'role'));
+// MDL-11687
+$strcapabilities = 'Capabilities';//s(get_string('capabilities', 'role'));

 // prepare legacy defaults
 if (!empty($role->legacytype)) {
@@ -119,9 +119,12 @@
                }

                if (empty($errors)) {
+                    $rolename = get_field('role', 'name', 'id', $newroleid);
+                    add_to_log(SITEID, 'role', 'add', 'admin/roles/manage.php?action=add', $rolename, '', $USER->id);
                    redirect('manage.php');
                }
            }
+            
            break;

        case 'edit':
@@ -228,10 +231,11 @@
                            unassign_capability($lcap, $roleid);
                        } 
                    }                    
-
+                    add_to_log(SITEID, 'role', 'edit', 'admin/roles/manage.php?action=edit&roleid='.$role->id, $role->name, '', $USER->id);
                    redirect('manage.php');
                }
            }
+
            break;

        case 'delete':
@@ -342,6 +346,8 @@
                // dupilcate all the capabilities
                role_cap_duplicate($sourcerole, $newrole);
            }
+            $rolename = get_field('role', 'name', 'id', $newrole);
+            add_to_log(SITEID, 'role', 'duplicate', 'admin/roles/manage.php?roleid='.$newrole.'&action=duplicate', $rolename, '', $USER->id);
            redirect('manage.php');
            break;

@@ -352,6 +358,8 @@

            if ($confirm and data_submitted() and confirm_sesskey()) {
                reset_role_capabilities($roleid);
+                $rolename = get_field('role', 'name', 'id', $roleid);
+                add_to_log(SITEID, 'role', 'reset', 'admin/roles/manage.php?roleid='.$roleid.'&action=reset', $rolename, '', $USER->id);
                redirect('manage.php?action=view&amp;roleid='.$roleid);

            } else {
@@ -30,7 +30,8 @@
        $component = '';

        $strrisks = s(get_string('risks', 'role'));
-        $strcapabilities = s(get_string('capabilities', 'role'));
+        // MDL-11687
+        $strcapabilities = 'Capabilities';//s(get_string('capabilities', 'role'));

        foreach ($capabilities as $capability) {

@@ -130,6 +130,8 @@
                }
            }
        }
+        $rolename = get_field('role', 'name', 'id', $roleid);
+        add_to_log($course->id, 'role', 'override', 'admin/roles/override.php?contextid='.$context->id.'&roleid='.$roleid, $rolename, '', $USER->id);
        redirect($baseurl);
    }

@@ -3,7 +3,7 @@
 // This file defines settingpages and externalpages under the "courses" category


-$ADMIN->add('courses', new admin_externalpage('coursemgmt', get_string('coursemgmt', 'admin'), $CFG->wwwroot . '/course/index.php?categoryedit=on'));
+$ADMIN->add('courses', new admin_externalpage('coursemgmt', get_string('coursemgmt', 'admin'), $CFG->wwwroot . '/course/index.php?categoryedit=on','moodle/category:update'));

 $ADMIN->add('courses', new admin_externalpage('enrolment', get_string('enrolments'), $CFG->wwwroot . '/'.$CFG->admin.'/enrol.php'));

@@ -17,7 +17,7 @@ $ADMIN->add('courses', $temp);


 // "backups" settingpage
-$temp = new admin_settingpage('backups', get_string('backups','admin'));
+$temp = new admin_settingpage('backups', get_string('backups','admin'),'moodle/site:backup');
 $temp->add(new admin_setting_backupcheckbox('backup_sche_modules', get_string('includemodules'), get_string('backupincludemoduleshelp'), 0));
 $temp->add(new admin_setting_backupcheckbox('backup_sche_withuserdata', get_string('includemoduleuserdata'), get_string('backupincludemoduleuserdatahelp'), 0));
 $temp->add(new admin_setting_backupcheckbox('backup_sche_metacourse', get_string('metacourse'), get_string('backupmetacoursehelp'), 0));
@@ -5,7 +5,6 @@ $temp = new admin_settingpage('locationsettings', get_string('locationsettings',
 $options = get_list_of_timezones();
 $options[99] = get_string('serverlocaltime');
 $temp->add(new admin_setting_configselect('timezone', get_string('timezone','admin'), get_string('configtimezone', 'admin'), 99, $options));
-$options = get_list_of_timezones();
 $options[99] = get_string('timezonenotforced', 'admin');
 $temp->add(new admin_setting_configselect('forcetimezone', get_string('forcetimezone', 'admin'), get_string('helpforcetimezone', 'admin'), 99, $options));
 $options = get_list_of_countries();
@@ -3,19 +3,19 @@
 // This file defines settingpages and externalpages under the "mnet" category

 $ADMIN->add('mnet', new admin_externalpage('net', get_string('settings', 'mnet'), 
-                                           $CFG->wwwroot . '/admin/mnet/index.php', 
+                                           "$CFG->wwwroot/$CFG->admin/mnet/index.php",
                                           'moodle/site:config'));

 $ADMIN->add('mnet', new admin_externalpage('mnetpeers', get_string('mnetpeers', 'mnet'), 
-                                           $CFG->wwwroot . '/admin/mnet/peers.php', 
+                                           "$CFG->wwwroot/$CFG->admin/mnet/peers.php",
                                           'moodle/site:config'));
 $ADMIN->add('mnet', new admin_externalpage('ssoaccesscontrol', get_string('ssoaccesscontrol', 'mnet'),
-                                           $CFG->wwwroot . '/admin/mnet/access_control.php', 
+                                           "$CFG->wwwroot/$CFG->admin/mnet/access_control.php",
                                           'moodle/site:config'));
 $ADMIN->add('mnet', new admin_externalpage('mnetenrol', get_string('mnetenrol', 'mnet'), 
-                                           $CFG->wwwroot . '/admin/mnet/enr_hosts.php', 
+                                           "$CFG->wwwroot/$CFG->admin/mnet/enr_hosts.php",
                                           'moodle/site:config'));
 $ADMIN->add('mnet', new admin_externalpage('trustedhosts', get_string('trustedhosts', 'mnet'), 
-                                           $CFG->wwwroot . '/admin/mnet/trustedhosts.php', 
+                                           "$CFG->wwwroot/$CFG->admin/mnet/trustedhosts.php",
                                           'moodle/site:config'));
 ?>
@@ -33,8 +33,11 @@ $temp->add(new admin_setting_configselect('bloglevel', get_string('bloglevel', '
                                                                                                                                          1 => get_string('personalblogs','blog'),
                                                                                                                                          0 => get_string('disableblogs','blog'))));

+$temp->add(new admin_setting_configcheckbox('profilesforenrolledusersonly', get_string('profilesforenrolledusersonly','admin'),get_string('configprofilesforenrolledusersonly', 'admin'),'1'));
+
 $temp->add(new admin_setting_configcheckbox('cronclionly', get_string('cronclionly', 'admin'), get_string('configcronclionly', 'admin'), 0));
 $temp->add(new admin_setting_configtext('cronremotepassword', get_string('cronremotepassword', 'admin'), get_string('configcronremotepassword', 'admin'), '', PARAM_RAW));
+$temp->add(new admin_setting_configcheckbox('emailchangeconfirmation', get_string('emailchangeconfirmation', 'admin'), get_string('configemailchangeconfirmation', 'admin'), 1));

 $ADMIN->add('security', $temp);

@@ -17,7 +17,7 @@ $ADMIN->add('server', $temp, 0);

 // "email" settingpage
 $temp = new admin_settingpage('mail', get_string('mail','admin'));
-$temp->add(new admin_setting_configtext('smtphosts', get_string('smtphosts', 'admin'), get_string('configsmtphosts', 'admin'), '', PARAM_HOST));
+$temp->add(new admin_setting_configtext('smtphosts', get_string('smtphosts', 'admin'), get_string('configsmtphosts', 'admin'), '', PARAM_RAW));
 $temp->add(new admin_setting_configtext('smtpuser', get_string('smtpuser', 'admin'), get_string('configsmtpuser', 'admin'), '', PARAM_NOTAGS));
 $temp->add(new admin_setting_configtext('smtppass', get_string('smtppass', 'admin'), get_string('configsmtpuser', 'admin'), '', PARAM_RAW));
 $temp->add(new admin_setting_configtext('noreplyaddress', get_string('noreplyaddress', 'admin'), get_string('confignoreplyaddress', 'admin'), 'noreply@' . $_SERVER['HTTP_HOST'], PARAM_NOTAGS));
@@ -155,6 +155,15 @@ $temp->add(new admin_setting_configselect('deleteunconfirmed', get_string('delet
                                                                                                                                                                    6 => get_string('numhours', '', 6),
                                                                                                                                                                    1 => get_string('numhours', '', 1))));

+$temp->add(new admin_setting_configselect('deleteincompleteusers', get_string('deleteincompleteusers', 'admin'), get_string('configdeleteincompleteusers', 'admin'), 0, array(0 => get_string('never'),
+                                                                                                                                                                    168 => get_string('numdays', '', 7),
+                                                                                                                                                                    144 => get_string('numdays', '', 6),
+                                                                                                                                                                    120 => get_string('numdays', '', 5),
+                                                                                                                                                                    96 => get_string('numdays', '', 4),
+                                                                                                                                                                    72 => get_string('numdays', '', 3),
+                                                                                                                                                                    48 => get_string('numdays', '', 2),
+                                                                                                                                                                    24 => get_string('numdays', '', 1))));
+
 $temp->add(new admin_setting_configselect('loglifetime', get_string('loglifetime', 'admin'), get_string('configloglifetime', 'admin'), 0, array(0 => get_string('neverdeletelogs'),
                                                                                                                                                1000 => get_string('numdays', '', 1000),
                                                                                                                                                365 => get_string('numdays', '', 365),
@@ -72,7 +72,7 @@

    if (!empty($pt)) {
        echo '</td>';
-        echo '<td valign="top" style="width: '.$blocks_preferred_width.'px;" id="left-column">';
+        echo '<td valign="top" style="width: '.$blocks_preferred_width.'px;" id="right-column">';
        blocks_print_group($PAGE, $blocks, BLOCK_POS_RIGHT);
        echo '</td>';
        echo '</tr></table>';
@@ -24,9 +24,9 @@
    if (!$ok or !confirm_sesskey()) {
        $message = '<br /><br />';
        $message .= $CFG->dataroot.'/temp/olson.txt<br />';
-        $message .= $CFG->dataroot.'/temp/timezones.txt<br />';
-        $message .= '<a href="http://download.moodle.org/timezones/">http://download.moodle.org/timezones/</a><br />';
-        $message .= '<a href="'.$CFG->wwwroot.'/lib/timezones.txt">'.$CFG->dirroot.'/lib/timezones.txt</a><br />';
+        $message .= $CFG->dataroot.'/temp/timezone.txt<br />';
+        $message .= '<a href="http://download.moodle.org/timezone/">http://download.moodle.org/timezone/</a><br />';
+        $message .= '<a href="'.$CFG->wwwroot.'/lib/timezone.txt">'.$CFG->dirroot.'/lib/timezone.txt</a><br />';
        $message .= '<br />';

        $message = get_string("configintrotimezones", 'admin', $message);
@@ -54,7 +54,7 @@

 /// Next, look for a CSV file locally

-    $source = $CFG->dataroot.'/temp/timezones.txt';
+    $source = $CFG->dataroot.'/temp/timezone.txt';
    if (!$importdone and is_readable($source)) {
        if ($timezones = get_records_csv($source, 'timezone')) {
            update_timezone_records($timezones);
@@ -64,17 +64,17 @@

 /// Otherwise, let's try moodle.org's copy

-    $source = 'http://download.moodle.org/timezones/';
+    $source = 'http://download.moodle.org/timezone/';
    if (!$importdone and ini_get('allow_url_fopen')) {
        if (is_readable($source) && $contents = file_get_contents($source)) {  // Grab whole page
-            if ($file = fopen($CFG->dataroot.'/temp/timezones.txt', 'w')) {            // Make local copy
+            if ($file = fopen($CFG->dataroot.'/temp/timezone.txt', 'w')) {            // Make local copy
                fwrite($file, $contents);
                fclose($file);
-                if ($timezones = get_records_csv($CFG->dataroot.'/temp/timezones.txt', 'timezone')) {  // Parse it
+                if ($timezones = get_records_csv($CFG->dataroot.'/temp/timezone.txt', 'timezone')) {  // Parse it
                    update_timezone_records($timezones);
                    $importdone = $source;
                }
-                unlink($CFG->dataroot.'/temp/timezones.txt');
+                unlink($CFG->dataroot.'/temp/timezone.txt');
            }
        }
    }
@@ -82,7 +82,7 @@

 /// Final resort, use the copy included in Moodle

-    $source = $CFG->dirroot.'/lib/timezones.txt';
+    $source = $CFG->dirroot.'/lib/timezone.txt';
    if (!$importdone and is_readable($source)) {  // Distribution file
        if ($timezones = get_records_csv($source, 'timezone')) {
            update_timezone_records($timezones);
@@ -6,6 +6,9 @@
 require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');

+/// no guest autologin
+require_login(0, false);
+
 $adminroot = admin_get_root();
 admin_externalpage_setup('upgradesettings', $adminroot); // now hidden page

@@ -104,8 +104,6 @@ if ($um->preprocess_files() && confirm_sesskey()) {
            "maildisplay" => 1,
            "htmleditor" => 1,
            "autosubscribe" => 1,
-            "idnumber" => 1,
-            "icq" => 1,
            "course1" => 1,
            "course2" => 1,
            "course3" => 1,
@@ -421,4 +419,3 @@ function my_file_get_contents($filename, $use_include_path = 0) {
 }

 ?>
-
@@ -118,8 +118,9 @@
            $updateuser->idnumber     = '';               // Clear this field to free it up
            $updateuser->timemodified = time();
            if (update_record('user', $updateuser)) {
-                // not sure if this is needed. unenrol_student($user->id);  // From all courses
-                delete_records('role_assignments', 'userid', $user->id); // unassign all roles
+                // Removing a user may have more requirements than just removing their role assignments.
+                // Use 'role_unassign' to make sure that all necessary actions occur.
+                role_unassign(0, $user->id);
                // remove all context assigned on this user?
                notify(get_string('deletedactivity', '', fullname($user, true)) );
            } else {
@@ -202,7 +203,7 @@
        }
    }
    
-    $users = get_users_listing($sort, $dir, $page*$perpage, $perpage, $search, $firstinitial, $lastinitial, $remotewhere);
+    $users = get_users_listing($sort, $dir, $page*$perpage, $perpage, $search, $firstinitial, $lastinitial, $remotewhere, false);
    $usercount = get_users(false);
    $usersearchcount = get_users(false, $search, true, "", "", $firstinitial, $lastinitial);

@@ -303,7 +304,18 @@

        $mainadmin = get_admin();

-        $table->head = array ("$firstname / $lastname", $email, $city, $country, $lastaccess, "", "", "");
+        $override = new object();
+        $override->firstname = 'firstname';
+        $override->lastname = 'lastname';
+        $fullnamelanguage = get_string('fullnamedisplay', '', $override);
+        if (($CFG->fullnamedisplay == 'firstname lastname') or
+            ($CFG->fullnamedisplay == 'firstname') or
+            ($CFG->fullnamedisplay == 'language' and $fullnamelanguage == 'firstname lastname' )) {
+            $fullnamedisplay = "$firstname / $lastname";
+        } else { // ($CFG->fullnamedisplay == 'language' and $fullnamelanguage == 'lastname firstname') 
+            $fullnamedisplay = "$lastname / $firstname";
+        }
+        $table->head = array ($fullnamedisplay, $email, $city, $country, $lastaccess, "", "", "");
        $table->align = array ("left", "left", "left", "left", "left", "center", "center", "center");
        $table->width = "95%";
        foreach ($users as $user) {
@@ -0,0 +1,271 @@
+<?php // $Id$
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.com                                            //
+//                                                                       //
+// Copyright (C) 2001-3001 Martin Dougiamas        http://dougiamas.com  //
+//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
+//                                                                       //
+// This program is free software; you can redistribute it and/or modify  //
+// it under the terms of the GNU General Public License as published by  //
+// the Free Software Foundation; either version 2 of the License, or     //
+// (at your option) any later version.                                   //
+//                                                                       //
+// This program is distributed in the hope that it will be useful,       //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
+// GNU General Public License for more details:                          //
+//                                                                       //
+//          http://www.gnu.org/copyleft/gpl.html                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+/// This class will compare all the indexes found in the XMLDB definitions
+/// with the phisical DB implementation, reporting about all the missing
+/// indexes to be created to be 100% ok.
+
+class check_indexes extends XMLDBAction {
+
+    /**
+     * Init method, every subclass will have its own
+     */
+    function init() {
+        parent::init();
+
+    /// Set own core attributes
+
+    /// Set own custom attributes
+
+    /// Get needed strings
+        $this->loadStrings(array(
+            'confirmcheckindexes' => 'xmldb',
+            'ok' => '',
+            'missing' => 'xmldb',
+            'table' => 'xmldb',
+            'key' => 'xmldb',
+            'index' => 'xmldb',
+            'searchresults' => 'xmldb',
+            'missingindexes' => 'xmldb',
+            'completelogbelow' => 'xmldb',
+            'nomissingindexesfound' => 'xmldb',
+            'yesmissingindexesfound' => 'xmldb',
+            'yes' => '',
+            'no' => '',
+            'back' => 'xmldb'
+
+        ));
+    }
+
+    /**
+     * Invoke method, every class will have its own
+     * returns true/false on completion, setting both
+     * errormsg and output as necessary
+     */
+    function invoke() {
+        parent::invoke();
+
+        $result = true;
+
+    /// Set own core attributes
+        $this->does_generate = ACTION_GENERATE_HTML;
+
+    /// These are always here
+        global $CFG, $XMLDB;
+
+    /// And we nedd some ddl suff
+        require_once ($CFG->libdir . '/ddllib.php');
+
+    /// Here we'll acummulate all the missing indexes found
+        $missing_indexes = array();
+
+    /// Do the job, setting $result as needed
+
+    /// Get the confirmed to decide what to do
+        $confirmed = optional_param('confirmed', false, PARAM_BOOL);
+
+    /// If  not confirmed, show confirmation box
+        if (!$confirmed) {
+            $o = '<table class="generalbox" border="0" cellpadding="5" cellspacing="0" id="notice">';
+            $o.= '  <tr><td class="generalboxcontent">';
+            $o.= '    <p class="centerpara">' . $this->str['confirmcheckindexes'] . '</p>';
+            $o.= '    <table class="boxaligncenter" cellpadding="20"><tr><td>';
+            $o.= '      <div class="singlebutton">';
+            $o.= '        <form action="index.php?action=check_indexes&amp;confirmed=yes" method="post"><fieldset class="invisiblefieldset">';
+            $o.= '          <input type="submit" value="'. $this->str['yes'] .'" /></fieldset></form></div>';
+            $o.= '      </td><td>';
+            $o.= '      <div class="singlebutton">';
+            $o.= '        <form action="index.php?action=main_view" method="post"><fieldset class="invisiblefieldset">';
+            $o.= '          <input type="submit" value="'. $this->str['no'] .'" /></fieldset></form></div>';
+            $o.= '      </td></tr>';
+            $o.= '    </table>';
+            $o.= '  </td></tr>';
+            $o.= '</table>';
+
+            $this->output = $o;
+        } else {
+        /// The back to edit table button
+            $b = ' <p class="centerpara buttons">';
+            $b .= '<a href="index.php">[' . $this->str['back'] . ']</a>';
+            $b .= '</p>';
+
+        /// Iterate over $XMLDB->dbdirs, loading their XML data to memory
+            if ($XMLDB->dbdirs) {
+                $dbdirs =& $XMLDB->dbdirs;
+                $o='<ul>';
+                foreach ($dbdirs as $dbdir) {
+                /// Only if the directory exists
+                    if (!$dbdir->path_exists) {
+                        continue;
+                    }
+                /// Load the XML file
+                    $xmldb_file = new XMLDBFile($dbdir->path . '/install.xml');
+                /// Load the needed XMLDB generator
+                    $classname = 'XMLDB' . $CFG->dbtype;
+                    $generator = new $classname();
+                    $generator->setPrefix($CFG->prefix);
+
+                /// Only if the file exists
+                    if (!$xmldb_file->fileExists()) {
+                        continue;
+                    }
+                /// Load the XML contents to structure
+                    $loaded = $xmldb_file->loadXMLStructure();
+                    if (!$loaded || !$xmldb_file->isLoaded()) {
+                        notify('Errors found in XMLDB file: '. $dbdir->path . '/install.xml');
+                        continue;
+                    }
+                /// Arriving here, everything is ok, get the XMLDB structure
+                    $structure = $xmldb_file->getStructure();
+                    $o.='    <li>' . str_replace($CFG->dirroot . '/', '', $dbdir->path . '/install.xml');
+                /// Getting tables
+                    if ($xmldb_tables = $structure->getTables()) {
+                        $o.='        <ul>';
+                    /// Foreach table, process its indexes and keys
+                        foreach ($xmldb_tables as $xmldb_table) {
+                        /// Skip table if not exists
+                            if (!table_exists($xmldb_table)) {
+                                continue;
+                            }
+                            $o.='            <li>' . $xmldb_table->getName();
+                        /// Keys
+                            if ($xmldb_keys = $xmldb_table->getKeys()) {
+                                $o.='        <ul>';
+                                foreach ($xmldb_keys as $xmldb_key) {
+                                    $o.='            <li>' . $this->str['key'] . ': ' . $xmldb_key->readableInfo() . ' ';
+                                /// Primaries are skipped
+                                    if ($xmldb_key->getType() == XMLDB_KEY_PRIMARY) {
+                                        $o.='<font color="green">' . $this->str['ok'] . '</font></li>';
+                                        continue;
+                                    }
+                                /// If we aren't creating the keys or the key is a XMLDB_KEY_FOREIGN (not underlying index generated
+                                /// automatically by the RDBMS) create the underlying (created by us) index (if doesn't exists)
+                                    if (!$generator->getKeySQL($xmldb_table, $xmldb_key) || $xmldb_key->getType() == XMLDB_KEY_FOREIGN) {
+                                    /// Create the interim index
+                                        $xmldb_index = new XMLDBIndex('anyname');
+                                        $xmldb_index->setFields($xmldb_key->getFields());
+                                        switch ($xmldb_key->getType()) {
+                                            case XMLDB_KEY_UNIQUE:
+                                            case XMLDB_KEY_FOREIGN_UNIQUE:
+                                                $xmldb_index->setUnique(true);
+                                                break;
+                                            case XMLDB_KEY_FOREIGN:
+                                                $xmldb_index->setUnique(false);
+                                                break;
+                                        }
+                                    /// Check if the index exists in DB
+                                        if (index_exists($xmldb_table, $xmldb_index)) {
+                                            $o.='<font color="green">' . $this->str['ok'] . '</font>';
+                                        } else {
+                                            $o.='<font color="red">' . $this->str['missing'] . '</font>';
+                                        /// Add the missing index to the list
+                                            $obj = new object;
+                                            $obj->table = $xmldb_table;
+                                            $obj->index = $xmldb_index;
+                                            $missing_indexes[] = $obj;
+                                        }
+                                    }
+                                    $o.='</li>';
+                                }
+                                $o.='        </ul>';
+                            }
+                        /// Indexes
+                            if ($xmldb_indexes = $xmldb_table->getIndexes()) {
+                                $o.='        <ul>';
+                                foreach ($xmldb_indexes as $xmldb_index) {
+                                    $o.='            <li>' . $this->str['index'] . ': ' . $xmldb_index->readableInfo() . ' ';
+                                /// Check if the index exists in DB
+                                    if (index_exists($xmldb_table, $xmldb_index)) {
+                                        $o.='<font color="green">' . $this->str['ok'] . '</font>';
+                                    } else {
+                                        $o.='<font color="red">' . $this->str['missing'] . '</font>';
+                                    /// Add the missing index to the list
+                                        $obj = new object;
+                                        $obj->table = $xmldb_table;
+                                        $obj->index = $xmldb_index;
+                                        $missing_indexes[] = $obj;
+                                    }
+                                    $o.='</li>';
+                                }
+                                $o.='        </ul>';
+                            }
+                            $o.='    </li>';
+                        }
+                        $o.='        </ul>';
+                    }
+                    $o.='    </li>';
+                }
+                $o.='</ul>';
+            }
+
+        /// We have finished, let's show the results of the search
+            $s = '';
+            $r = '<table class="generalbox boxaligncenter boxwidthwide" border="0" cellpadding="5" cellspacing="0" id="results">';
+            $r.= '  <tr><td class="generalboxcontent">';
+            $r.= '    <h2 class="main">' . $this->str['searchresults'] . '</h2>';
+            $r.= '    <p class="centerpara">' . $this->str['missingindexes'] . ': ' . count($missing_indexes) . '</p>';
+            $r.= '  </td></tr>';
+            $r.= '  <tr><td class="generalboxcontent">';
+
+        /// If we have found missing indexes inform about them
+            if (count($missing_indexes)) {
+                $r.= '    <p class="centerpara">' . $this->str['yesmissingindexesfound'] . '</p>';
+                $r.= '        <ul>';
+                foreach ($missing_indexes as $obj) {
+                    $xmldb_table = $obj->table;
+                    $xmldb_index = $obj->index;
+                    $sqlarr = $xmldb_table->getAddIndexSQL($CFG->dbtype, $CFG->prefix, $xmldb_index, true);
+                    $r.= '            <li>' . $this->str['table'] . ': ' . $xmldb_table->getName() . '. ' .
+                                              $this->str['index'] . ': ' . $xmldb_index->readableInfo() . '</li>';
+                    $s.= '<code>' . str_replace("\n", '<br />', implode('<br />', $sqlarr)) . '</code><br />';
+                    
+                }
+                $r.= '        </ul>';
+            /// Add the SQL statements (all together)
+                $r.= '<hr />' . $s;
+            } else {
+                $r.= '    <p class="centerpara">' . $this->str['nomissingindexesfound'] . '</p>';
+            }
+            $r.= '  </td></tr>';
+            $r.= '  <tr><td class="generalboxcontent">';
+        /// Add the complete log message
+            $r.= '    <p class="centerpara">' . $this->str['completelogbelow'] . '</p>';
+            $r.= '  </td></tr>';
+            $r.= '</table>';
+
+            $this->output = $b . $r . $o;
+        }
+
+    /// Launch postaction if exists (leave this here!)
+        if ($this->getPostAction() && $result) {
+            return $this->launch($this->getPostAction());
+        }
+
+    /// Return ok if arrived here
+        return $result;
+    }
+}
+?>
@@ -84,7 +84,7 @@ class edit_field extends XMLDBAction {
    /// Fetch request data
        $tableparam = required_param('table', PARAM_CLEAN);
        if (!$table =& $structure->getTable($tableparam)) {
-            $this->errormsg = 'Wrong table specified: ' . $tableparm;
+            $this->errormsg = 'Wrong table specified: ' . $tableparam;
            return false;
        }
        $fieldparam = required_param('field', PARAM_CLEAN);
@@ -84,7 +84,7 @@ class edit_index extends XMLDBAction {
    /// Fetch request data
        $tableparam = required_param('table', PARAM_CLEAN);
        if (!$table =& $structure->getTable($tableparam)) {
-            $this->errormsg = 'Wrong table specified: ' . $tableparm;
+            $this->errormsg = 'Wrong table specified: ' . $tableparam;
            return false;
        }
        $indexparam = required_param('index', PARAM_CLEAN);
@@ -84,7 +84,7 @@ class edit_key extends XMLDBAction {
    /// Fetch request data
        $tableparam = required_param('table', PARAM_CLEAN);
        if (!$table =& $structure->getTable($tableparam)) {
-            $this->errormsg = 'Wrong table specified: ' . $tableparm;
+            $this->errormsg = 'Wrong table specified: ' . $tableparam;
            return false;
        }
        $keyparam = required_param('key', PARAM_CLEAN);
@@ -130,6 +130,18 @@ class get_db_directories extends XMLDBAction {
            }
        }

+    /// Now, course formats (course/format/xxx/db)
+        if ($plugins = get_list_of_plugins('course/format', 'db')) {
+            foreach ($plugins as $plugin) {
+                $dbdir = new stdClass;
+                $dbdir->path = $CFG->dirroot . '/course/format/' . $plugin . '/db';
+                if (!isset($XMLDB->dbdirs[$dbdir->path])) {
+                    $XMLDB->dbdirs[$dbdir->path] = $dbdir;
+                }
+                $XMLDB->dbdirs[$dbdir->path]->path_exists = file_exists($dbdir->path);  //Update status
+            }
+        }
+
    /// Now, enrolment plugins (enrol/xxx/db)
        if ($plugins = get_list_of_plugins('enrol', 'db')) {
            foreach ($plugins as $plugin) {
@@ -141,7 +153,7 @@ class get_db_directories extends XMLDBAction {
                $XMLDB->dbdirs[$dbdir->path]->path_exists = file_exists($dbdir->path);  //Update status
            }
        }
-        
+
    /// Now, groups
        $dbdir = new stdClass;
        $dbdir->path = $CFG->dirroot . '/group/db';
@@ -47,7 +47,8 @@ class main_view extends XMLDBAction {
            'delete' => 'xmldb',
            'reservedwords' => 'xmldb',
            'test' => 'xmldb',
-            'gotolastused' => 'xmldb'
+            'gotolastused' => 'xmldb',
+            'checkindexes' => 'xmldb'
        ));
    }

@@ -84,6 +85,8 @@ class main_view extends XMLDBAction {
        $b .= '&nbsp;<a href="index.php?action=view_reserved_words">[' . $this->str['reservedwords'] . ']</a>';
    /// The test button
        $b .= '&nbsp;<a href="index.php?action=test">[' . $this->str['test'] . ']</a>';
+    /// The check indexes button
+        $b .= '&nbsp;<a href="index.php?action=check_indexes">[' . $this->str['checkindexes'] . ']</a>';
        $b .= '</p>';
    /// Send buttons to output
        $o .= $b;
@@ -88,6 +88,7 @@ class new_table extends XMLDBAction {
            $field->setType(XMLDB_TYPE_INTEGER);
            $field->setLength(10);
            $field->setNotNull(true);
+            $field->setUnsigned(true);
            $field->setSequence(true);
            $field->setComment('id of the table, please edit me');
            $field->setLoaded(true);
@@ -88,7 +88,7 @@ class new_table_from_mysql extends XMLDBAction {
            $dbtables = $db->MetaTables('TABLES');
            $selecttables = array();
            foreach ($dbtables as $dbtable) {
-                $dbtable = str_replace($CFG->prefix, '', $dbtable);
+                $dbtable = strtolower(str_replace($CFG->prefix, '', $dbtable));
                $i = $structure->findTableInArray($dbtable);
                if ($i === NULL) {
                    $selecttables[$dbtable] = $dbtable;
@@ -92,7 +92,7 @@ class test extends XMLDBAction {
        $table->addFieldInfo('course', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
        $table->addFieldInfo('type', XMLDB_TYPE_CHAR, '20', null, XMLDB_NOTNULL, null, XMLDB_ENUM, array('single', 'news', 'general', 'social', 'eachuser', 'teacher', 'qanda'), 'general');
        $table->addFieldInfo('name', XMLDB_TYPE_CHAR, '255', null, XMLDB_NOTNULL, null, null, null, '');
-        $table->addFieldInfo('intro', XMLDB_TYPE_TEXT, 'small', null, XMLDB_NOTNULL, null, null, null, '');
+        $table->addFieldInfo('intro', XMLDB_TYPE_TEXT, 'small', null, XMLDB_NOTNULL, null, null, null, null);
        $table->addFieldInfo('logo', XMLDB_TYPE_BINARY, 'big', null, XMLDB_NOTNULL, null, null, null);
        $table->addFieldInfo('assessed', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
        $table->addFieldInfo('assesstimestart', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
@@ -378,7 +378,22 @@ class test extends XMLDBAction {
            $tests['change field precision (number)'] = $test;
        }

-    /// 18th test. Change the sign of one numeric field to unsigned
+    /// 18th test. Change the precision of one integer field to a smaller one
+        if ($test->status) {
+        /// Get SQL code and execute it
+            $test = new stdClass;
+            $field = new XMLDBField('course');
+            $field->setAttributes(XMLDB_TYPE_INTEGER, '5', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
+
+            $test->sql = $table->getAlterFieldSQL($CFG->dbtype, $CFG->prefix, $field, true);
+            $test->status = change_field_precision($table, $field, false, false);
+            if (!$test->status) {
+                $test->error = $db->ErrorMsg();
+            }
+            $tests['change field precision (integer) to smaller one'] = $test;
+        }
+
+    /// 19th test. Change the sign of one numeric field to unsigned
        if ($test->status) {
        /// Get SQL code and execute it
            $test = new stdClass;
@@ -393,7 +408,7 @@ class test extends XMLDBAction {
            $tests['change field sign (unsigned)'] = $test;
        }

-    /// 19th test. Change the sign of one numeric field to signed
+    /// 20th test. Change the sign of one numeric field to signed
        if ($test->status) {
        /// Get SQL code and execute it
            $test = new stdClass;
@@ -408,7 +423,7 @@ class test extends XMLDBAction {
            $tests['change field sign (signed)'] = $test;
        }

-    /// 20th test. Change the nullability of one char field to not null
+    /// 21th test. Change the nullability of one char field to not null
        if ($test->status) {
        /// Get SQL code and execute it
            $test = new stdClass;
@@ -423,7 +438,7 @@ class test extends XMLDBAction {
            $tests['change field nullability (not null)'] = $test;
        }

-    /// 21th test. Change the nullability of one char field to null
+    /// 22th test. Change the nullability of one char field to null
        if ($test->status) {
        /// Get SQL code and execute it
            $test = new stdClass;
@@ -438,7 +453,7 @@ class test extends XMLDBAction {
            $tests['change field nullability (null)'] = $test;
        }

-    /// 22th test. Dropping the default of one field
+    /// 23th test. Dropping the default of one field
        if ($test->status) {
        /// Get SQL code and execute it
            $test = new stdClass;
@@ -453,7 +468,7 @@ class test extends XMLDBAction {
            $tests['drop field default of NULL field'] = $test;
        }

-    /// 23th test. Creating the default for one field
+    /// 24th test. Creating the default for one field
        if ($test->status) {
        /// Get SQL code and execute it
            $test = new stdClass;
@@ -468,7 +483,7 @@ class test extends XMLDBAction {
            $tests['add field default of NULL field'] = $test;
        }

-    /// 24th test. Creating the default for one field
+    /// 25th test. Creating the default for one field
        if ($test->status) {
        /// Get SQL code and execute it
            $test = new stdClass;
@@ -484,7 +499,7 @@ class test extends XMLDBAction {
        }


-    /// 25th test. Dropping the default of one NOT NULL field
+    /// 26th test. Dropping the default of one NOT NULL field
        if ($test->status) {
        /// Get SQL code and execute it
            $test = new stdClass;
@@ -499,7 +514,7 @@ class test extends XMLDBAction {
            $tests['drop field default of NOT NULL field'] = $test;
        }

-    /// 26th test. Adding one unique index to the table
+    /// 27th test. Adding one unique index to the table
        if ($test->status) {
        /// Get SQL code and execute it
            $test = new stdClass;
@@ -514,7 +529,7 @@ class test extends XMLDBAction {
            $tests['add unique index'] = $test;
        }

-    /// 27th test. Adding one not unique index to the table
+    /// 28th test. Adding one not unique index to the table
        if ($test->status) {
        /// Get SQL code and execute it
            $test = new stdClass;
@@ -529,7 +544,7 @@ class test extends XMLDBAction {
            $tests['add not unique index'] = $test;
        }

-    /// 28th test. Re-add the same index than previous test. Check find_index_name() works.
+    /// 29th test. Re-add the same index than previous test. Check find_index_name() works.
        if ($test->status) {
        /// Get SQL code and execute it
            $test = new stdClass;
@@ -548,7 +563,7 @@ class test extends XMLDBAction {
            $tests['check find_index_name()'] = $test;
        }

-    /// 29th test. Dropping one index from the table
+    /// 30th test. Dropping one index from the table
        if ($test->status) {
        /// Get SQL code and execute it
            $test = new stdClass;
@@ -563,7 +578,7 @@ class test extends XMLDBAction {
            $tests['drop index'] = $test;
        }

-    /// 30th test. Adding one unique key to the table
+    /// 31th test. Adding one unique key to the table
        if ($test->status) {
        /// Get SQL code and execute it
            $test = new stdClass;
@@ -578,7 +593,7 @@ class test extends XMLDBAction {
            $tests['add unique key'] = $test;
        }

-    /// 31th test. Adding one foreign+unique key to the table
+    /// 32th test. Adding one foreign+unique key to the table
        if ($test->status) {
        /// Get SQL code and execute it
            $test = new stdClass;
@@ -593,7 +608,7 @@ class test extends XMLDBAction {
            $tests['add foreign+unique key'] = $test;
        }

-    /// 32th test. Drop one key
+    /// 33th test. Drop one key
        if ($test->status) {
        /// Get SQL code and execute it
            $test = new stdClass;
@@ -608,7 +623,7 @@ class test extends XMLDBAction {
            $tests['drop foreign+unique key'] = $test;
        }

-    /// 33th test. Adding one foreign key to the table
+    /// 34th test. Adding one foreign key to the table
        if ($test->status) {
        /// Get SQL code and execute it
            $test = new stdClass;
@@ -623,7 +638,7 @@ class test extends XMLDBAction {
            $tests['add foreign key'] = $test;
        }

-    /// 34th test. Drop one foreign key
+    /// 35th test. Drop one foreign key
        if ($test->status) {
        /// Get SQL code and execute it
            $test = new stdClass;
@@ -638,7 +653,7 @@ class test extends XMLDBAction {
            $tests['drop foreign key'] = $test;
        }

-    /// 35th test. Adding one complex enum field
+    /// 36th test. Adding one complex enum field
        if ($test->status) {
        /// Create a new field with complex specs (enums are good candidates)
            $field = new XMLDBField('type');
@@ -653,7 +668,7 @@ class test extends XMLDBAction {
            $tests['add field with enum'] = $test;
        }

-    /// 36th test. Dropping the enum of one field
+    /// 37th test. Dropping the enum of one field
        if ($test->status) {
        /// Get SQL code and execute it
            $test = new stdClass;
@@ -668,7 +683,7 @@ class test extends XMLDBAction {
            $tests['delete enumlist from one field'] = $test;
        }

-    /// 37th test. Creating the enum for one field
+    /// 38th test. Creating the enum for one field
        if ($test->status) {
        /// Get SQL code and execute it
            $test = new stdClass;
@@ -682,7 +697,7 @@ class test extends XMLDBAction {
            $tests['add enumlist to one field'] = $test;
        }

-    /// 38th test. Renaming one index
+    /// 39th test. Renaming one index
        if ($test->status) {
        /// Get SQL code and execute it
            $test = new stdClass;
@@ -697,7 +712,7 @@ class test extends XMLDBAction {
            $tests['rename index (experimental. DO NOT USE IT)'] = $test;
        }

-    /// 39th test. Renaming one key
+    /// 40th test. Renaming one key
        if ($test->status) {
        /// Get SQL code and execute it
            $test = new stdClass;
@@ -712,13 +727,13 @@ class test extends XMLDBAction {
            $tests['rename key (experimental. DO NOT USE IT)'] = $test;
        }

-    /// 40th test. Renaming one field
+    /// 41th test. Renaming one field
        if ($test->status) {
        /// Get SQL code and execute it
            $test = new stdClass;
            $field = new XMLDBField('type');
            $field->setAttributes(XMLDB_TYPE_CHAR, '20', null, XMLDB_NOTNULL, null, XMLDB_ENUM, array('single', 'news', 'general', 'social', 'eachuser', 'teacher', 'qanda'), 'general', 'course');
-            
+
            $test->sql = $table->getRenameFieldSQL($CFG->dbtype, $CFG->prefix, $field, 'newnameforthefield', true);
            $test->status = rename_field($table, $field, 'newnameforthefield', false, false);
            if (!$test->status) {
@@ -727,11 +742,11 @@ class test extends XMLDBAction {
            $tests['rename field'] = $test;
        }

-    /// 41th test. Renaming one table
+    /// 42th test. Renaming one table
        if ($test->status) {
        /// Get SQL code and execute it
            $test = new stdClass;
-            
+
            $test->sql = $table->getRenameTableSQL($CFG->dbtype, $CFG->prefix, 'newnameforthetable', true);
            $test->status = rename_table($table, 'newnameforthetable', false, false);
            if (!$test->status) {
@@ -740,7 +755,7 @@ class test extends XMLDBAction {
            $tests['rename table'] = $test;
        }

-    /// 42th test. Getting the PK sequence name for one table
+    /// 43th test. Getting the PK sequence name for one table
        if ($test->status) {
            $test = new stdClass;
            $table->setName('newnameforthetable');
@@ -755,13 +770,13 @@ class test extends XMLDBAction {
            $tests['find sequence name'] = $test;
        }

-    /// 43th test. Inserting TEXT contents
+    /// 44th test. Inserting TEXT contents
        $textlib = textlib_get_instance();
        if ($test->status) {
            $test = new stdClass;
            $test->status = false;
            $test->sql = array();
-            $basetext = '日本語 • Русский • Deutsch • English • Español • Français • Italiano • Nederlands • Polski • Português • Svenska • العربية • فارسی 한국어 • עברית • ไทย中文  Ελληνικά • Български • Српски • Українська • Bosanski • Català • Česky • Dansk • Eesti • Simple English • Esperanto • Euskara • Galego • Hrvatski • Ido • Bahasa Indonesia • Íslenska • Lëtzebuergesch • Lietuvių • Magyar • Bahasa Melayu اردو • ئۇيغۇرچه • हिन्दी • नेपाल भाषा मराठी • தமிழ் Հայերեն • Беларуская • Чăваш • Ирон æвзаг • Македонски • Сибирской говор • Afrikaans • Aragonés • Arpitan • Asturianu • Kreyòl Ayisyen • Azərbaycan • Bân-lâm-gú • Basa Banyumasan • Brezhoneg • Corsu • Cymraeg • Deitsch • Føroyskt • Frysk • Furlan • Gaeilge • Gàidhlig • Ilokano • Interlingua • Basa Jawa • Kapampangan • Kernewek • Kurdî  كوردی • Ladino  לאדינו • Latina • Latviešu • Limburgs • Lumbaart • Nedersaksisch • Nouormand • Occitan • O‘zbek • Piemontèis • Plattdüütsch • Ripoarisch • Sámegiella • Scots • Shqip • Sicilianu • Sinugboanon • Srpskohrvatski / Српскохрватски • Basa Sunda • Kiswahili • Tagalog • Tatarça • Walon • Winaray  Авар • Башҡорт • Кыргызча  Монгол • Қазақша • Тоҷикӣ • Удмурт • Armãneashce • Bamanankan • Eald Englisc • Gaelg • Interlingue • Kaszëbsczi • Kongo • Ligure • Lingála • lojban • Malagasy • Malti • Māori • Nāhuatl • Ekakairũ Naoero • Novial • Pangasinán • Tok Pisin • Romani / रोमानी • Rumantsch • Runa Simi • Sardu • Tetun • Türkmen / تركمن / Туркмен • Vèneto • Volapük • Võro • West-Vlaoms • Wollof • Zazaki • Žemaitėška';
+            $basetext = "\\ ''語 • Русский • Deutsch • English • Español • Français • Italiano • Nederlands • Polski • Português • Svenska • العربية • فارسی 한국어 • עברית • ไทย中文  Ελληνικά • Български • Српски • Українська • Bosanski • Català • Česky • Dansk • Eesti • Simple English • Esperanto • Euskara • Galego • Hrvatski • Ido • Bahasa Indonesia • Íslenska • Lëtzebuergesch • Lietuvių • Magyar • Bahasa Melayu اردو • ئۇيغۇرچه • हिन्दी • नेपाल भाषा मराठी • தமிழ் Հայերեն • Беларуская • Чăваш • Ирон æвзаг • Македонски • Сибирской говор • Afrikaans • Aragonés • Arpitan • Asturianu • Kreyòl Ayisyen • Azərbaycan • Bân-lâm-gú • Basa Banyumasan • Brezhoneg • Corsu • Cymraeg • Deitsch • Føroyskt • Frysk • Furlan • Gaeilge • Gàidhlig • Ilokano • Interlingua • Basa Jawa • Kapampangan • Kernewek • Kurdî  كوردی • Ladino  לאדינו • Latina • Latviešu • Limburgs • Lumbaart • Nedersaksisch • Nouormand • Occitan • O‘zbek • Piemontèis • Plattdüütsch • Ripoarisch • Sámegiella • Scots • Shqip • Sicilianu • Sinugboanon • Srpskohrvatski / Српскохрватски • Basa Sunda • Kiswahili • Tagalog • Tatarça • Walon • Winaray  Авар • Башҡорт • Кыргызча  Монгол • Қазақша • Тоҷикӣ • Удмурт • Armãneashce • Bamanankan • Eald Englisc • Gaelg • Interlingue • Kaszëbsczi • Kongo • Ligure • Lingála • lojban • Malagasy • Malti • Māori • Nāhuatl • Ekakairũ Naoero • Novial • Pangasinán • Tok Pisin • Romani / रोमानी • Rumantsch • Runa Simi • Sardu • Tetun • Türkmen / تركمن / Туркмен • Vèneto • Volapük • Võro • West-Vlaoms • Wollof • Zazaki • Žemaitėška";
        /// Create one big text (1.500.000 chars)
            $fulltext = '';
            for ($i=0; $i<1000; $i++) { //1500 * 1000 chars
@@ -794,7 +809,7 @@ class test extends XMLDBAction {
            $tests['insert record '. $textlen . ' cc. (text)'] = $test;
        }

-    /// 44th test. Inserting BINARY contents
+    /// 45th test. Inserting BINARY contents
        if ($test->status) {
            $test = new stdClass;
            $test->status = false;
@@ -823,7 +838,7 @@ class test extends XMLDBAction {
            $tests['insert record '. $textlen . ' bytes (binary)'] = $test;
        }

-    /// 45th test. update_record with TEXT and BINARY contents
+    /// 46th test. update_record with TEXT and BINARY contents
        if ($test->status) {
            $test = new stdClass;
            $test->status = false;
@@ -863,7 +878,7 @@ class test extends XMLDBAction {
            $tests['update record '. $textlen . ' cc. (text) and ' . $imglen . ' bytes (binary)'] = $test;
        }

-    /// 46th test. set_field with TEXT contents
+    /// 47th test. set_field with TEXT contents
        if ($test->status) {
            $test = new stdClass;
            $test->status = false;
@@ -893,7 +908,7 @@ class test extends XMLDBAction {
            $tests['set field '. $textlen . ' cc. (text)'] = $test;
        }

-    /// 47th test. set_field with BINARY contents
+    /// 48th test. set_field with BINARY contents
        if ($test->status) {
            $test = new stdClass;
            $test->status = false;
@@ -80,7 +80,7 @@ class view_table_sql extends XMLDBAction {
    /// Get parameters
        $tableparam = required_param('table', PARAM_PATH);
        if (!$table =& $structure->getTable($tableparam)) {
-            $this->errormsg = 'Wrong table specified: ' . $tableparm;
+            $this->errormsg = 'Wrong table specified: ' . $tableparam;
            return false;
        }
        $generatorparam = optional_param('generator', null, PARAM_ALPHANUM);
@@ -1,190 +1,568 @@
-<?php
-
-/**
- * @file CAS/PGTStorage/pgt-db.php
- * Basic class for PGT database storage
- */
-
-// include phpDB library (the test was introduced in release 0.4.8 for 
-// the integration into Tikiwiki).
-if (!class_exists('DB')) {
-  @include_once('DB.php');
-}
-
-/**
- * @class PGTStorageDB
- * The PGTStorageDB class is a class for PGT database storage. An instance of 
- * this class is returned by CASClient::SetPGTStorageDB().
- *
- * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
- *
- * @ingroup internalPGTStorageDB
- */
-
-class PGTStorageDB extends PGTStorage
-{
-  /** 
-   * @addtogroup internalPGTStorageDB
-   * @{ 
-   */
-
-  /**
-   * a string representing a PEAR DB URL to connect to the database. Written by
-   * PGTStorageDB::PGTStorageDB(), read by getURL().
-   *
-   * @hideinitializer
-   * @private
-   */
-  var $_url='';
-
-  /**
-   * This method returns the PEAR DB URL to use to connect to the database.
-   *
-   * @return a PEAR DB URL
-   *
-   * @private
-   */
-  function getURL()
-    {
-      return $this->_url;
-    }
-
-  /**
-   * The handle of the connection to the database where PGT's are stored. Written by
-   * PGTStorageDB::init(), read by getLink().
-   *
-   * @hideinitializer
-   * @private
-   */
-  var $_link = null;
-
-  /**
-   * This method returns the handle of the connection to the database where PGT's are 
-   * stored.
-   *
-   * @return a handle of connection.
-   *
-   * @private
-   */
-  function getLink()
-    {
-      return $this->_link;
-    }
-
-  /**
-   * The name of the table where PGT's are stored. Written by 
-   * PGTStorageDB::PGTStorageDB(), read by getTable().
-   *
-   * @hideinitializer
-   * @private
-   */
-  var $_table = '';
-
-  /**
-   * This method returns the name of the table where PGT's are stored.
-   *
-   * @return the name of a table.
-   *
-   * @private
-   */
-  function getTable()
-    {
-      return $this->_table;
-    }
-
-  // ########################################################################
-  //  DEBUGGING
-  // ########################################################################
-  
-  /**
-   * This method returns an informational string giving the type of storage
-   * used by the object (used for debugging purposes).
-   *
-   * @return an informational string.
-   * @public
-   */
-  function getStorageType()
-    {
-      return "database";
-    }
-
-  /**
-   * This method returns an informational string giving informations on the
-   * parameters of the storage.(used for debugging purposes).
-   *
-   * @public
-   */
-  function getStorageInfo()
-    {
-      return 'url=`'.$this->getURL().'\', table=`'.$this->getTable().'\'';
-    }
-
-  // ########################################################################
-  //  CONSTRUCTOR
-  // ########################################################################
-  
-  /**
-   * The class constructor, called by CASClient::SetPGTStorageDB().
-   *
-   * @param $cas_parent the CASClient instance that creates the object.
-   * @param $user the user to access the data with
-   * @param $password the user's password
-   * @param $database_type the type of the database hosting the data
-   * @param $hostname the server hosting the database
-   * @param $port the port the server is listening on
-   * @param $database the name of the database
-   * @param $table the name of the table storing the data
-   *
-   * @public
-   */
-  function PGTStorageDB($cas_parent,$user,$password,$database_type,$hostname,$port,$database,$table)
-    {
-      phpCAS::traceBegin();
-
-      // call the ancestor's constructor
-      $this->PGTStorage($cas_parent);
-
-      if ( empty($database_type) ) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE;
-      if ( empty($hostname) ) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME;
-      if ( $port==0 ) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT;
-      if ( empty($database) ) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE;
-      if ( empty($table) ) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE;
-
-      // build and store the PEAR DB URL
-      $this->_url = $database_type.':'.'//'.$user.':'.$password.'@'.$hostname.':'.$port.'/'.$database;
-
-      // XXX should use setURL and setTable
-      phpCAS::traceEnd();
-    }
-  
-  // ########################################################################
-  //  INITIALIZATION
-  // ########################################################################
-  
-  /**
-   * This method is used to initialize the storage. Halts on error.
-   *
-   * @public
-   */
-  function init()
-    {
-      phpCAS::traceBegin();
-      // if the storage has already been initialized, return immediatly
-      if ( $this->isInitialized() )
-	return;
-      // call the ancestor's method (mark as initialized)
-      parent::init();
-      
-      // try to connect to the database
-      $this->_link = DB::connect($this->getURL());
-      if ( DB::isError($this->_link) ) {
-	phpCAS::error('could not connect to database ('.DB::errorMessage($this->_link).')');
-      }
-      var_dump($this->_link);
-      phpCAS::traceBEnd();
-    }
-
-  /** @} */
-}
-
+<?php
+
+
+
+
+
+/**
+
+
+ * @file CAS/PGTStorage/pgt-db.php
+
+
+ * Basic class for PGT database storage
+
+
+ */
+
+
+
+
+
+// include phpDB library (the test was introduced in release 0.4.8 for 
+
+
+// the integration into Tikiwiki).
+
+
+if (!class_exists('DB')) {
+
+
+  @include_once('DB.php');
+
+
+}
+
+
+
+
+
+/**
+
+
+ * @class PGTStorageDB
+
+
+ * The PGTStorageDB class is a class for PGT database storage. An instance of 
+
+
+ * this class is returned by CASClient::SetPGTStorageDB().
+
+
+ *
+
+
+ * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
+
+
+ *
+
+
+ * @ingroup internalPGTStorageDB
+
+
+ */
+
+
+
+
+
+class PGTStorageDB extends PGTStorage
+
+
+{
+
+
+  /** 
+
+
+   * @addtogroup internalPGTStorageDB
+
+
+   * @{ 
+
+
+   */
+
+
+
+
+
+  /**
+
+
+   * a string representing a PEAR DB URL to connect to the database. Written by
+
+
+   * PGTStorageDB::PGTStorageDB(), read by getURL().
+
+
+   *
+
+
+   * @hideinitializer
+
+
+   * @private
+
+
+   */
+
+
+  var $_url='';
+
+
+
+
+
+  /**
+
+
+   * This method returns the PEAR DB URL to use to connect to the database.
+
+
+   *
+
+
+   * @return a PEAR DB URL
+
+
+   *
+
+
+   * @private
+
+
+   */
+
+
+  function getURL()
+
+
+    {
+
+
+      return $this->_url;
+
+
+    }
+
+
+
+
+
+  /**
+
+
+   * The handle of the connection to the database where PGT's are stored. Written by
+
+
+   * PGTStorageDB::init(), read by getLink().
+
+
+   *
+
+
+   * @hideinitializer
+
+
+   * @private
+
+
+   */
+
+
+  var $_link = null;
+
+
+
+
+
+  /**
+
+
+   * This method returns the handle of the connection to the database where PGT's are 
+
+
+   * stored.
+
+
+   *
+
+
+   * @return a handle of connection.
+
+
+   *
+
+
+   * @private
+
+
+   */
+
+
+  function getLink()
+
+
+    {
+
+
+      return $this->_link;
+
+
+    }
+
+
+
+
+
+  /**
+
+
+   * The name of the table where PGT's are stored. Written by 
+
+
+   * PGTStorageDB::PGTStorageDB(), read by getTable().
+
+
+   *
+
+
+   * @hideinitializer
+
+
+   * @private
+
+
+   */
+
+
+  var $_table = '';
+
+
+
+
+
+  /**
+
+
+   * This method returns the name of the table where PGT's are stored.
+
+
+   *
+
+
+   * @return the name of a table.
+
+
+   *
+
+
+   * @private
+
+
+   */
+
+
+  function getTable()
+
+
+    {
+
+
+      return $this->_table;
+
+
+    }
+
+
+
+
+
+  // ########################################################################
+
+
+  //  DEBUGGING
+
+
+  // ########################################################################
+
+
+  
+
+
+  /**
+
+
+   * This method returns an informational string giving the type of storage
+
+
+   * used by the object (used for debugging purposes).
+
+
+   *
+
+
+   * @return an informational string.
+
+
+   * @public
+
+
+   */
+
+
+  function getStorageType()
+
+
+    {
+
+
+      return "database";
+
+
+    }
+
+
+
+
+
+  /**
+
+
+   * This method returns an informational string giving informations on the
+
+
+   * parameters of the storage.(used for debugging purposes).
+
+
+   *
+
+
+   * @public
+
+
+   */
+
+
+  function getStorageInfo()
+
+
+    {
+
+
+      return 'url=`'.$this->getURL().'\', table=`'.$this->getTable().'\'';
+
+
+    }
+
+
+
+
+
+  // ########################################################################
+
+
+  //  CONSTRUCTOR
+
+
+  // ########################################################################
+
+
+  
+
+
+  /**
+
+
+   * The class constructor, called by CASClient::SetPGTStorageDB().
+
+
+   *
+
+
+   * @param $cas_parent the CASClient instance that creates the object.
+
+
+   * @param $user the user to access the data with
+
+
+   * @param $password the user's password
+
+
+   * @param $database_type the type of the database hosting the data
+
+
+   * @param $hostname the server hosting the database
+
+
+   * @param $port the port the server is listening on
+
+
+   * @param $database the name of the database
+
+
+   * @param $table the name of the table storing the data
+
+
+   *
+
+
+   * @public
+
+
+   */
+
+
+  function PGTStorageDB($cas_parent,$user,$password,$database_type,$hostname,$port,$database,$table)
+
+
+    {
+
+
+      phpCAS::traceBegin();
+
+
+
+
+
+      // call the ancestor's constructor
+
+
+      $this->PGTStorage($cas_parent);
+
+
+
+
+
+      if ( empty($database_type) ) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE;
+
+
+      if ( empty($hostname) ) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME;
+
+
+      if ( $port==0 ) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT;
+
+
+      if ( empty($database) ) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE;
+
+
+      if ( empty($table) ) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE;
+
+
+
+
+
+      // build and store the PEAR DB URL
+
+
+      $this->_url = $database_type.':'.'//'.$user.':'.$password.'@'.$hostname.':'.$port.'/'.$database;
+
+
+
+
+
+      // XXX should use setURL and setTable
+
+
+      phpCAS::traceEnd();
+
+
+    }
+
+
+  
+
+
+  // ########################################################################
+
+
+  //  INITIALIZATION
+
+
+  // ########################################################################
+
+
+  
+
+
+  /**
+
+
+   * This method is used to initialize the storage. Halts on error.
+
+
+   *
+
+
+   * @public
+
+
+   */
+
+
+  function init()
+
+
+    {
+
+
+      phpCAS::traceBegin();
+
+
+      // if the storage has already been initialized, return immediatly
+
+
+      if ( $this->isInitialized() )
+
+
+	return;
+
+
+      // call the ancestor's method (mark as initialized)
+
+
+      parent::init();
+
+
+      
+
+
+      // try to connect to the database
+
+
+      $this->_link = DB::connect($this->getURL());
+
+
+      if ( DB::isError($this->_link) ) {
+
+
+	phpCAS::error('could not connect to database ('.DB::errorMessage($this->_link).')');
+
+
+      }
+
+
+      var_dump($this->_link);
+
+
+      phpCAS::traceBEnd();
+
+
+    }
+
+
+
+
+
+  /** @} */
+
+
+}
+
+
+
+
+
 ?>
@@ -1,240 +1,718 @@
-<?php
-
-/**
- * @file CAS/PGTStorage/pgt-file.php
- * Basic class for PGT file storage
- */
-
-/**
- * @class PGTStorageFile
- * The PGTStorageFile class is a class for PGT file storage. An instance of 
- * this class is returned by CASClient::SetPGTStorageFile().
- *
- * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
- *
- * @ingroup internalPGTStorageFile
- */
-
-class PGTStorageFile extends PGTStorage
-{
-  /** 
-   * @addtogroup internalPGTStorageFile 
-   * @{ 
-   */
-
-  /**
-   * a string telling where PGT's should be stored on the filesystem. Written by
-   * PGTStorageFile::PGTStorageFile(), read by getPath().
-   *
-   * @private
-   */
-  var $_path;
-
-  /**
-   * This method returns the name of the directory where PGT's should be stored 
-   * on the filesystem.
-   *
-   * @return the name of a directory (with leading and trailing '/')
-   *
-   * @private
-   */
-  function getPath()
-    {
-      return $this->_path;
-    }
-
-  /**
-   * a string telling the format to use to store PGT's (plain or xml). Written by
-   * PGTStorageFile::PGTStorageFile(), read by getFormat().
-   *
-   * @private
-   */
-  var $_format;
-
-  /**
-   * This method returns the format to use when storing PGT's on the filesystem.
-   *
-   * @return a string corresponding to the format used (plain or xml).
-   *
-   * @private
-   */
-  function getFormat()
-    {
-      return $this->_format;
-    }
-
-  // ########################################################################
-  //  DEBUGGING
-  // ########################################################################
-  
-  /**
-   * This method returns an informational string giving the type of storage
-   * used by the object (used for debugging purposes).
-   *
-   * @return an informational string.
-   * @public
-   */
-  function getStorageType()
-    {
-      return "file";
-    }
-
-  /**
-   * This method returns an informational string giving informations on the
-   * parameters of the storage.(used for debugging purposes).
-   *
-   * @return an informational string.
-   * @public
-   */
-  function getStorageInfo()
-    {
-      return 'path=`'.$this->getPath().'\', format=`'.$this->getFormat().'\'';
-    }
-
-  // ########################################################################
-  //  CONSTRUCTOR
-  // ########################################################################
-  
-  /**
-   * The class constructor, called by CASClient::SetPGTStorageFile().
-   *
-   * @param $cas_parent the CASClient instance that creates the object.
-   * @param $format the format used to store the PGT's (`plain' and `xml' allowed).
-   * @param $path the path where the PGT's should be stored
-   *
-   * @public
-   */
-  function PGTStorageFile($cas_parent,$format,$path)
-    {
-      phpCAS::traceBegin();
-      // call the ancestor's constructor
-      $this->PGTStorage($cas_parent);
-
-      if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;
-      if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;
-
-      // check that the path is an absolute path
-      if ( $path[0] != '/' ) {
-	phpCAS::error('an absolute path is needed for PGT storage to file');
-      }
-
-      // store the path (with a leading and trailing '/')      
-      $path = preg_replace('|[/]*$|','/',$path);
-      $path = preg_replace('|^[/]*|','/',$path);
-      $this->_path = $path;
-
-      // check the format and store it
-      switch ($format) {
-      case CAS_PGT_STORAGE_FILE_FORMAT_PLAIN:
-      case CAS_PGT_STORAGE_FILE_FORMAT_XML:
-	$this->_format = $format;
-	break;
-      default:
-	phpCAS::error('unknown PGT file storage format (`'.CAS_PGT_STORAGE_FILE_FORMAT_PLAIN.'\' and `'.CAS_PGT_STORAGE_FILE_FORMAT_XML.'\' allowed)');
-      }
-      phpCAS::traceEnd();      
-    }
-
-  // ########################################################################
-  //  INITIALIZATION
-  // ########################################################################
-  
-  /**
-   * This method is used to initialize the storage. Halts on error.
-   *
-   * @public
-   */
-  function init()
-    {
-      phpCAS::traceBegin();
-      // if the storage has already been initialized, return immediatly
-      if ( $this->isInitialized() )
-	return;
-      // call the ancestor's method (mark as initialized)
-      parent::init();
-      phpCAS::traceEnd();      
-    }
-
-  // ########################################################################
-  //  PGT I/O
-  // ########################################################################
-
-  /**
-   * This method returns the filename corresponding to a PGT Iou.
-   *
-   * @param $pgt_iou the PGT iou.
-   *
-   * @return a filename
-   * @private
-   */
-  function getPGTIouFilename($pgt_iou)
-    {
-      phpCAS::traceBegin();
-      $filename = $this->getPath().$pgt_iou.'.'.$this->getFormat();
-
-      phpCAS::traceEnd($filename);
-      return $filename;
-    }
-  
-  /**
-   * This method stores a PGT and its corresponding PGT Iou into a file. Echoes a
-   * warning on error.
-   *
-   * @param $pgt the PGT
-   * @param $pgt_iou the PGT iou
-   *
-   * @public
-   */
-  function write($pgt,$pgt_iou)
-    {
-      phpCAS::traceBegin();
-      $fname = $this->getPGTIouFilename($pgt_iou);
-      if ( $f=fopen($fname,"w") ) {
-	if ( fputs($f,$pgt) === FALSE ) {
-	  phpCAS::error('could not write PGT to `'.$fname.'\'');
-	}
-	fclose($f);
-      } else {
-	phpCAS::error('could not open `'.$fname.'\'');
-      }
-      phpCAS::traceEnd();      
-    }
-
-  /**
-   * This method reads a PGT corresponding to a PGT Iou and deletes the 
-   * corresponding file.
-   *
-   * @param $pgt_iou the PGT iou
-   *
-   * @return the corresponding PGT, or FALSE on error
-   *
-   * @public
-   */
-  function read($pgt_iou)
-    {
-      phpCAS::traceBegin();
-      $pgt = FALSE;
-      $fname = $this->getPGTIouFilename($pgt_iou);
-
-      if ( !($f=fopen($fname,"r")) ) {
-	phpCAS::trace('could not open `'.$fname.'\'');
-      } else {
-	if ( ($pgt=fgets($f)) === FALSE ) {
-	  phpCAS::trace('could not read PGT from `'.$fname.'\'');
-	} 
-	fclose($f);
-      }
-
-      // delete the PGT file
-      @unlink($fname);
-
-      phpCAS::traceEnd($pgt);
-      return $pgt;
-    }
-  
-  /** @} */
-  
-}
-
-  
-?>
+<?php
+
+
+
+
+
+/**
+
+
+ * @file CAS/PGTStorage/pgt-file.php
+
+
+ * Basic class for PGT file storage
+
+
+ */
+
+
+
+
+
+/**
+
+
+ * @class PGTStorageFile
+
+
+ * The PGTStorageFile class is a class for PGT file storage. An instance of 
+
+
+ * this class is returned by CASClient::SetPGTStorageFile().
+
+
+ *
+
+
+ * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
+
+
+ *
+
+
+ * @ingroup internalPGTStorageFile
+
+
+ */
+
+
+
+
+
+class PGTStorageFile extends PGTStorage
+
+
+{
+
+
+  /** 
+
+
+   * @addtogroup internalPGTStorageFile 
+
+
+   * @{ 
+
+
+   */
+
+
+
+
+
+  /**
+
+
+   * a string telling where PGT's should be stored on the filesystem. Written by
+
+
+   * PGTStorageFile::PGTStorageFile(), read by getPath().
+
+
+   *
+
+
+   * @private
+
+
+   */
+
+
+  var $_path;
+
+
+
+
+
+  /**
+
+
+   * This method returns the name of the directory where PGT's should be stored 
+
+
+   * on the filesystem.
+
+
+   *
+
+
+   * @return the name of a directory (with leading and trailing '/')
+
+
+   *
+
+
+   * @private
+
+
+   */
+
+
+  function getPath()
+
+
+    {
+
+
+      return $this->_path;
+
+
+    }
+
+
+
+
+
+  /**
+
+
+   * a string telling the format to use to store PGT's (plain or xml). Written by
+
+
+   * PGTStorageFile::PGTStorageFile(), read by getFormat().
+
+
+   *
+
+
+   * @private
+
+
+   */
+
+
+  var $_format;
+
+
+
+
+
+  /**
+
+
+   * This method returns the format to use when storing PGT's on the filesystem.
+
+
+   *
+
+
+   * @return a string corresponding to the format used (plain or xml).
+
+
+   *
+
+
+   * @private
+
+
+   */
+
+
+  function getFormat()
+
+
+    {
+
+
+      return $this->_format;
+
+
+    }
+
+
+
+
+
+  // ########################################################################
+
+
+  //  DEBUGGING
+
+
+  // ########################################################################
+
+
+  
+
+
+  /**
+
+
+   * This method returns an informational string giving the type of storage
+
+
+   * used by the object (used for debugging purposes).
+
+
+   *
+
+
+   * @return an informational string.
+
+
+   * @public
+
+
+   */
+
+
+  function getStorageType()
+
+
+    {
+
+
+      return "file";
+
+
+    }
+
+
+
+
+
+  /**
+
+
+   * This method returns an informational string giving informations on the
+
+
+   * parameters of the storage.(used for debugging purposes).
+
+
+   *
+
+
+   * @return an informational string.
+
+
+   * @public
+
+
+   */
+
+
+  function getStorageInfo()
+
+
+    {
+
+
+      return 'path=`'.$this->getPath().'\', format=`'.$this->getFormat().'\'';
+
+
+    }
+
+
+
+
+
+  // ########################################################################
+
+
+  //  CONSTRUCTOR
+
+
+  // ########################################################################
+
+
+  
+
+
+  /**
+
+
+   * The class constructor, called by CASClient::SetPGTStorageFile().
+
+
+   *
+
+
+   * @param $cas_parent the CASClient instance that creates the object.
+
+
+   * @param $format the format used to store the PGT's (`plain' and `xml' allowed).
+
+
+   * @param $path the path where the PGT's should be stored
+
+
+   *
+
+
+   * @public
+
+
+   */
+
+
+  function PGTStorageFile($cas_parent,$format,$path)
+
+
+    {
+
+
+      phpCAS::traceBegin();
+
+
+      // call the ancestor's constructor
+
+
+      $this->PGTStorage($cas_parent);
+
+
+
+
+
+      if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;
+
+
+      if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;
+
+
+
+
+
+      // check that the path is an absolute path
+
+
+      if ( $path[0] != '/' ) {
+
+
+	phpCAS::error('an absolute path is needed for PGT storage to file');
+
+
+      }
+
+
+
+
+
+      // store the path (with a leading and trailing '/')      
+
+
+      $path = preg_replace('|[/]*$|','/',$path);
+
+
+      $path = preg_replace('|^[/]*|','/',$path);
+
+
+      $this->_path = $path;
+
+
+
+
+
+      // check the format and store it
+
+
+      switch ($format) {
+
+
+      case CAS_PGT_STORAGE_FILE_FORMAT_PLAIN:
+
+
+      case CAS_PGT_STORAGE_FILE_FORMAT_XML:
+
+
+	$this->_format = $format;
+
+
+	break;
+
+
+      default:
+
+
+	phpCAS::error('unknown PGT file storage format (`'.CAS_PGT_STORAGE_FILE_FORMAT_PLAIN.'\' and `'.CAS_PGT_STORAGE_FILE_FORMAT_XML.'\' allowed)');
+
+
+      }
+
+
+      phpCAS::traceEnd();      
+
+
+    }
+
+
+
+
+
+  // ########################################################################
+
+
+  //  INITIALIZATION
+
+
+  // ########################################################################
+
+
+  
+
+
+  /**
+
+
+   * This method is used to initialize the storage. Halts on error.
+
+
+   *
+
+
+   * @public
+
+
+   */
+
+
+  function init()
+
+
+    {
+
+
+      phpCAS::traceBegin();
+
+
+      // if the storage has already been initialized, return immediatly
+
+
+      if ( $this->isInitialized() )
+
+
+	return;
+
+
+      // call the ancestor's method (mark as initialized)
+
+
+      parent::init();
+
+
+      phpCAS::traceEnd();      
+
+
+    }
+
+
+
+
+
+  // ########################################################################
+
+
+  //  PGT I/O
+
+
+  // ########################################################################
+
+
+
+
+
+  /**
+
+
+   * This method returns the filename corresponding to a PGT Iou.
+
+
+   *
+
+
+   * @param $pgt_iou the PGT iou.
+
+
+   *
+
+
+   * @return a filename
+
+
+   * @private
+
+
+   */
+
+
+  function getPGTIouFilename($pgt_iou)
+
+
+    {
+
+
+      phpCAS::traceBegin();
+
+
+      $filename = $this->getPath().$pgt_iou.'.'.$this->getFormat();
+
+
+
+
+
+      phpCAS::traceEnd($filename);
+
+
+      return $filename;
+
+
+    }
+
+
+  
+
+
+  /**
+
+
+   * This method stores a PGT and its corresponding PGT Iou into a file. Echoes a
+
+
+   * warning on error.
+
+
+   *
+
+
+   * @param $pgt the PGT
+
+
+   * @param $pgt_iou the PGT iou
+
+
+   *
+
+
+   * @public
+
+
+   */
+
+
+  function write($pgt,$pgt_iou)
+
+
+    {
+
+
+      phpCAS::traceBegin();
+
+
+      $fname = $this->getPGTIouFilename($pgt_iou);
+
+
+      if ( $f=fopen($fname,"w") ) {
+
+
+	if ( fputs($f,$pgt) === FALSE ) {
+
+
+	  phpCAS::error('could not write PGT to `'.$fname.'\'');
+
+
+	}
+
+
+	fclose($f);
+
+
+      } else {
+
+
+	phpCAS::error('could not open `'.$fname.'\'');
+
+
+      }
+
+
+      phpCAS::traceEnd();      
+
+
+    }
+
+
+
+
+
+  /**
+
+
+   * This method reads a PGT corresponding to a PGT Iou and deletes the 
+
+
+   * corresponding file.
+
+
+   *
+
+
+   * @param $pgt_iou the PGT iou
+
+
+   *
+
+
+   * @return the corresponding PGT, or FALSE on error
+
+
+   *
+
+
+   * @public
+
+
+   */
+
+
+  function read($pgt_iou)
+
+
+    {
+
+
+      phpCAS::traceBegin();
+
+
+      $pgt = FALSE;
+
+
+      $fname = $this->getPGTIouFilename($pgt_iou);
+
+
+
+
+
+      if ( !($f=fopen($fname,"r")) ) {
+
+
+	phpCAS::trace('could not open `'.$fname.'\'');
+
+
+      } else {
+
+
+	if ( ($pgt=fgets($f)) === FALSE ) {
+
+
+	  phpCAS::trace('could not read PGT from `'.$fname.'\'');
+
+
+	} 
+
+
+	fclose($f);
+
+
+      }
+
+
+
+
+
+      // delete the PGT file
+
+
+      @unlink($fname);
+
+
+
+
+
+      phpCAS::traceEnd($pgt);
+
+
+      return $pgt;
+
+
+    }
+
+
+  
+
+
+  /** @} */
+
+
+  
+
+
+}
+
+
+
+
+
+  
+
+
+?>
@@ -1,188 +1,188 @@
-<?php
-
-/**
- * @file CAS/PGTStorage/pgt-main.php
- * Basic class for PGT storage
- */
-
-/**
- * @class PGTStorage
- * The PGTStorage class is a generic class for PGT storage. This class should
- * not be instanciated itself but inherited by specific PGT storage classes.
- *
- * @author   Pascal Aubry <pascal.aubry at univ-rennes1.fr>
- *
- * @ingroup internalPGTStorage
- */
-
-class PGTStorage
-{
-  /** 
-   * @addtogroup internalPGTStorage
-   * @{ 
-   */
-
-  // ########################################################################
-  //  CONSTRUCTOR
-  // ########################################################################
-  
-  /**
-   * The constructor of the class, should be called only by inherited classes.
-   *
-   * @param $cas_parent the CASclient instance that creates the current object.
-   *
-   * @protected
-   */
-  function PGTStorage($cas_parent)
-    {
-      phpCAS::traceBegin();
-      if ( !$cas_parent->isProxy() ) {
-	phpCAS::error('defining PGT storage makes no sense when not using a CAS proxy'); 
-      }
-      phpCAS::traceEnd();
-    }
-
-  // ########################################################################
-  //  DEBUGGING
-  // ########################################################################
-  
-  /**
-   * This virtual method returns an informational string giving the type of storage
-   * used by the object (used for debugging purposes).
-   *
-   * @public
-   */
-  function getStorageType()
-    {
-      phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 
-    }
-
-  /**
-   * This virtual method returns an informational string giving informations on the
-   * parameters of the storage.(used for debugging purposes).
-   *
-   * @public
-   */
-  function getStorageInfo()
-    {
-      phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 
-    }
-
-  // ########################################################################
-  //  ERROR HANDLING
-  // ########################################################################
-  
-  /**
-   * string used to store an error message. Written by PGTStorage::setErrorMessage(),
-   * read by PGTStorage::getErrorMessage().
-   *
-   * @hideinitializer
-   * @private
-   * @deprecated not used.
-   */
-  var $_error_message=FALSE;
-
-  /**
-   * This method sets en error message, which can be read later by 
-   * PGTStorage::getErrorMessage().
-   *
-   * @param $error_message an error message
-   *
-   * @protected
-   * @deprecated not used.
-   */
-  function setErrorMessage($error_message)
-    {
-      $this->_error_message = $error_message;
-    }
-
-  /**
-   * This method returns an error message set by PGTStorage::setErrorMessage().
-   *
-   * @return an error message when set by PGTStorage::setErrorMessage(), FALSE
-   * otherwise.
-   *
-   * @public
-   * @deprecated not used.
-   */
-  function getErrorMessage()
-    {
-      return $this->_error_message;
-    }
-
-  // ########################################################################
-  //  INITIALIZATION
-  // ########################################################################
-
-  /**
-   * a boolean telling if the storage has already been initialized. Written by 
-   * PGTStorage::init(), read by PGTStorage::isInitialized().
-   *
-   * @hideinitializer
-   * @private
-   */
-  var $_initialized = FALSE;
-
-  /**
-   * This method tells if the storage has already been intialized.
-   *
-   * @return a boolean
-   *
-   * @protected
-   */
-  function isInitialized()
-    {
-      return $this->_initialized;
-    }
-
-  /**
-   * This virtual method initializes the object.
-   *
-   * @protected
-   */
-  function init()
-    {
-      $this->_initialized = TRUE;
-    }
-
-  // ########################################################################
-  //  PGT I/O
-  // ########################################################################
-
-  /**
-   * This virtual method stores a PGT and its corresponding PGT Iuo.
-   * @note Should never be called.
-   *
-   * @param $pgt the PGT
-   * @param $pgt_iou the PGT iou
-   *
-   * @protected
-   */
-  function write($pgt,$pgt_iou)
-    {
-      phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 
-    }
-
-  /**
-   * This virtual method reads a PGT corresponding to a PGT Iou and deletes
-   * the corresponding storage entry.
-   * @note Should never be called.
-   *
-   * @param $pgt_iou the PGT iou
-   *
-   * @protected
-   */
-  function read($pgt_iou)
-    {
-      phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 
-    }
-
-  /** @} */
-  
-} 
-
-// include specific PGT storage classes
-include_once(dirname(__FILE__).'/pgt-file.php'); 
-include_once(dirname(__FILE__).'/pgt-db.php');
-  
-?>
+<?php
+
+
+
+/**
+
+ * @file CAS/PGTStorage/pgt-main.php
+
+ * Basic class for PGT storage
+
+ */
+
+
+
+/**
+
+ * @class PGTStorage
+
+ * The PGTStorage class is a generic class for PGT storage. This class should
+
+ * not be instanciated itself but inherited by specific PGT storage classes.
+
+ *
+
+ * @author   Pascal Aubry <pascal.aubry at univ-rennes1.fr>
+
+ *
+
+ * @ingroup internalPGTStorage
+
+ */
+
+
+
+class PGTStorage
+
+{
+
+  /** 
+
+   * @addtogroup internalPGTStorage
+
+   * @{ 
+
+   */
+
+
+
+  // ########################################################################
+
+  //  CONSTRUCTOR
+
+  // ########################################################################
+
+  
+
+  /**
+
+   * The constructor of the class, should be called only by inherited classes.
+
+   *
+
+   * @param $cas_parent the CASclient instance that creates the current object.
+
+   *
+
+   * @protected
+
+   */
+
+  function PGTStorage($cas_parent)
+
+    {
+
+      phpCAS::traceBegin();
+
+      if ( !$cas_parent->isProxy() ) {
+
+	phpCAS::error('defining PGT storage makes no sense when not using a CAS proxy'); 
+
+      }
+
+      phpCAS::traceEnd();
+
+    }
+
+
+
+  // ########################################################################
+
+  //  DEBUGGING
+
+  // ########################################################################
+
+  
+
+  /**
+
+   * This virtual method returns an informational string giving the type of storage
+
+   * used by the object (used for debugging purposes).
+
+   *
+
+   * @public
+
+   */
+
+  function getStorageType()
+
+    {
+
+      phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 
+
+    }
+
+
+
+  /**
+
+   * This virtual method returns an informational string giving informations on the
+
+   * parameters of the storage.(used for debugging purposes).
+
+   *
+
+   * @public
+
+   */
+
+  function getStorageInfo()
+
+    {
+
+      phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 
+
+    }
+
+
+
+  // ########################################################################
+
+  //  ERROR HANDLING
+
+  // ########################################################################
+
+  
+
+  /**
+
+   * string used to store an error message. Written by PGTStorage::setErrorMessage(),
+
+   * read by PGTStorage::getErrorMessage().
+
+   *
+
+   * @hideinitializer
+
+   * @private
+
+   * @deprecated not used.
+
+   */
+
+  var $_error_message=FALSE;
+
+
+
+  /**
+
+   * This method sets en error message, which can be read later by 
+
+   * PGTStorage::getErrorMessage().
+
+   *
+
+   * @param $error_message an error message
+
+   *
+
+   * @protected
+
+   * @deprecated not used.
+
+   */
+
+  function setErrorMessage($error_message)
+
@@ -1,277 +1,498 @@
-<?php
-/**
- * @file domxml-php4-php5.php
- * Require PHP5, uses built-in DOM extension.
- * To be used in PHP4 scripts using DOMXML extension.
- * Allows PHP4/DOMXML scripts to run on PHP5/DOM.
- * (Requires PHP5/XSL extension for domxml_xslt functions)
- *
- * Typical use:
- * <pre>
- * {
- *  if (version_compare(PHP_VERSION,'5','>='))
- *   require_once('domxml-php4-to-php5.php');
- * }
- * </pre>
- *
- * Version 1.5.5, 2005-01-18, http://alexandre.alapetite.net/doc-alex/domxml-php4-php5/
- *
- * ------------------------------------------------------------------<br>
- * Written by Alexandre Alapetite, http://alexandre.alapetite.net/cv/
- *
- * Copyright 2004, Licence: Creative Commons "Attribution-ShareAlike 2.0 France" BY-SA (FR),
- * http://creativecommons.org/licenses/by-sa/2.0/fr/
- * http://alexandre.alapetite.net/divers/apropos/#by-sa
- * - Attribution. You must give the original author credit
- * - Share Alike. If you alter, transform, or build upon this work,
- *   you may distribute the resulting work only under a license identical to this one
- * - The French law is authoritative
- * - Any of these conditions can be waived if you get permission from Alexandre Alapetite
- * - Please send to Alexandre Alapetite the modifications you make,
- *   in order to improve this file for the benefit of everybody
- *
- * If you want to distribute this code, please do it as a link to:
- * http://alexandre.alapetite.net/doc-alex/domxml-php4-php5/
- */
-
-function domxml_new_doc($version) {return new php4DOMDocument('');}
-function domxml_open_file($filename) {return new php4DOMDocument($filename);}
-function domxml_open_mem($str)
-{
- $dom=new php4DOMDocument('');
- $dom->myDOMNode->loadXML($str);
- return $dom;
-}
-function xpath_eval($xpath_context,$eval_str,$contextnode=null) {return $xpath_context->query($eval_str,$contextnode);}
-function xpath_new_context($dom_document) {return new php4DOMXPath($dom_document);}
-
-class php4DOMAttr extends php4DOMNode
-{
- function php4DOMAttr($aDOMAttr) {$this->myDOMNode=$aDOMAttr;}
- function Name() {return $this->myDOMNode->name;}
- function Specified() {return $this->myDOMNode->specified;}
- function Value() {return $this->myDOMNode->value;}
-}
-
-class php4DOMDocument extends php4DOMNode
-{
- function php4DOMDocument($filename='')
- {
-  $this->myDOMNode=new DOMDocument();
-  if ($filename!='') $this->myDOMNode->load($filename);
- }
- function create_attribute($name,$value)
- {
-  $myAttr=$this->myDOMNode->createAttribute($name);
-  $myAttr->value=$value;
-  return new php4DOMAttr($myAttr,$this);
- }
- function create_cdata_section($content) {return new php4DOMNode($this->myDOMNode->createCDATASection($content),$this);}
- function create_comment($data) {return new php4DOMNode($this->myDOMNode->createComment($data),$this);}
- function create_element($name) {return new php4DOMElement($this->myDOMNode->createElement($name),$this);}
- function create_text_node($content) {return new php4DOMNode($this->myDOMNode->createTextNode($content),$this);}
- function document_element() {return new php4DOMElement($this->myDOMNode->documentElement,$this);}
- function dump_file($filename,$compressionmode=false,$format=false) {return $this->myDOMNode->save($filename);}
- function dump_mem($format=false,$encoding=false) {return $this->myDOMNode->saveXML();}
- function get_element_by_id($id) {return new php4DOMElement($this->myDOMNode->getElementById($id),$this);}
- function get_elements_by_tagname($name)
- {
-  $myDOMNodeList=$this->myDOMNode->getElementsByTagName($name);
-  $nodeSet=array();
-  $i=0;
-  if (isset($myDOMNodeList))
-   while ($node=$myDOMNodeList->item($i))
-   {
-    $nodeSet[]=new php4DOMElement($node,$this);
-    $i++;
-   }
-  return $nodeSet;
- }
- function html_dump_mem() {return $this->myDOMNode->saveHTML();}
- function root() {return new php4DOMElement($this->myDOMNode->documentElement,$this);}
-}
-
-class php4DOMElement extends php4DOMNode
-{
- function get_attribute($name) {return $this->myDOMNode->getAttribute($name);}
- function get_elements_by_tagname($name)
- {
-  $myDOMNodeList=$this->myDOMNode->getElementsByTagName($name);
-  $nodeSet=array();
-  $i=0;
-  if (isset($myDOMNodeList))
-   while ($node=$myDOMNodeList->item($i))
-   {
-    $nodeSet[]=new php4DOMElement($node,$this->myOwnerDocument);
-    $i++;
-   }
-  return $nodeSet;
- }
- function has_attribute($name) {return $this->myDOMNode->hasAttribute($name);}
- function remove_attribute($name) {return $this->myDOMNode->removeAttribute($name);}
- function set_attribute($name,$value) {return $this->myDOMNode->setAttribute($name,$value);}
- function tagname() {return $this->myDOMNode->tagName;}
-}
-
-class php4DOMNode
-{
- var $myDOMNode;
- var $myOwnerDocument;
- function php4DOMNode($aDomNode,$aOwnerDocument)
- {
-  $this->myDOMNode=$aDomNode;
-  $this->myOwnerDocument=$aOwnerDocument;
- }
- function __get($name)
- {
-  if ($name=='type') return $this->myDOMNode->nodeType;
-  elseif ($name=='tagname') return $this->myDOMNode->tagName;
-  elseif ($name=='content') return $this->myDOMNode->textContent;
-  else
-  {
-   $myErrors=debug_backtrace();
-   trigger_error('Undefined property: '.get_class($this).'::$'.$name.' ['.$myErrors[0]['file'].':'.$myErrors[0]['line'].']',E_USER_NOTICE);
-   return false;
-  }
- }
- function append_child($newnode) {return new php4DOMElement($this->myDOMNode->appendChild($newnode->myDOMNode),$this->myOwnerDocument);}
- function append_sibling($newnode) {return new php4DOMElement($this->myDOMNode->parentNode->appendChild($newnode->myDOMNode),$this->myOwnerDocument);}
- function attributes()
- {
-  $myDOMNodeList=$this->myDOMNode->attributes;
-  $nodeSet=array();
-  $i=0;
-  if (isset($myDOMNodeList))
-   while ($node=$myDOMNodeList->item($i))
-   {
-    $nodeSet[]=new php4DOMAttr($node,$this->myOwnerDocument);
-    $i++;
-   }
-  return $nodeSet;
- }
- function child_nodes()
- {
-  $myDOMNodeList=$this->myDOMNode->childNodes;
-  $nodeSet=array();
-  $i=0;
-  if (isset($myDOMNodeList))
-   while ($node=$myDOMNodeList->item($i))
-   {
-    $nodeSet[]=new php4DOMElement($node,$this->myOwnerDocument);
-    $i++;
-   }
-  return $nodeSet;
- }
- function children() {return $this->child_nodes();}
- function clone_node($deep=false) {return new php4DOMElement($this->myDOMNode->cloneNode($deep),$this->myOwnerDocument);}
- function first_child() {return new php4DOMElement($this->myDOMNode->firstChild,$this->myOwnerDocument);}
- function get_content() {return $this->myDOMNode->textContent;}
- function has_attributes() {return $this->myDOMNode->hasAttributes();}
- function has_child_nodes() {return $this->myDOMNode->hasChildNodes();}
- function insert_before($newnode,$refnode) {return new php4DOMElement($this->myDOMNode->insertBefore($newnode->myDOMNode,$refnode->myDOMNode),$this->myOwnerDocument);}
- function is_blank_node()
- {
-  $myDOMNodeList=$this->myDOMNode->childNodes;
-  $i=0;
-  if (isset($myDOMNodeList))
-   while ($node=$myDOMNodeList->item($i))
-   {
-    if (($node->nodeType==XML_ELEMENT_NODE)||
-        (($node->nodeType==XML_TEXT_NODE)&&!ereg('^([[:cntrl:]]|[[:space:]])*$',$node->nodeValue)))
-     return false;
-    $i++;
-   }
-  return true;
- }
- function last_child() {return new php4DOMElement($this->myDOMNode->lastChild,$this->myOwnerDocument);}
- function new_child($name,$content)
- {
-  $mySubNode=$this->myDOMNode->ownerDocument->createElement($name);
-  $mySubNode->appendChild($this->myDOMNode->ownerDocument->createTextNode($content));
-  $this->myDOMNode->appendChild($mySubNode);
-  return new php4DOMElement($mySubNode,$this->myOwnerDocument);
- }
- function next_sibling() {return new php4DOMElement($this->myDOMNode->nextSibling,$this->myOwnerDocument);}
- function node_name() {return $this->myDOMNode->localName;}
- function node_type() {return $this->myDOMNode->nodeType;}
- function node_value() {return $this->myDOMNode->nodeValue;}
- function owner_document() {return $this->myOwnerDocument;}
- function parent_node() {return new php4DOMElement($this->myDOMNode->parentNode,$this->myOwnerDocument);}
- function prefix() {return $this->myDOMNode->prefix;}
- function previous_sibling() {return new php4DOMElement($this->myDOMNode->previousSibling,$this->myOwnerDocument);}
- function remove_child($oldchild) {return new php4DOMElement($this->myDOMNode->removeChild($oldchild->myDOMNode),$this->myOwnerDocument);}
- function replace_child($oldnode,$newnode) {return new php4DOMElement($this->myDOMNode->replaceChild($oldnode->myDOMNode,$newnode->myDOMNode),$this->myOwnerDocument);}
- function set_content($text)
- {
-  if (($this->myDOMNode->hasChildNodes())&&($this->myDOMNode->firstChild->nodeType==XML_TEXT_NODE))
-   $this->myDOMNode->removeChild($this->myDOMNode->firstChild);
-  return $this->myDOMNode->appendChild($this->myDOMNode->ownerDocument->createTextNode($text));
- }
-}
-
-class php4DOMNodelist
-{
- var $myDOMNodelist;
- var $nodeset;
- function php4DOMNodelist($aDOMNodelist,$aOwnerDocument)
- {
-  $this->myDOMNodelist=$aDOMNodelist;
-  $this->nodeset=array();
-  $i=0;
-  if (isset($this->myDOMNodelist))
-   while ($node=$this->myDOMNodelist->item($i))
-   {
-    $this->nodeset[]=new php4DOMElement($node,$aOwnerDocument);
-    $i++;
-   }
- }
-}
-
-class php4DOMXPath
-{
- var $myDOMXPath;
- var $myOwnerDocument;
- function php4DOMXPath($dom_document)
- {
-  $this->myOwnerDocument=$dom_document;
-  $this->myDOMXPath=new DOMXPath($dom_document->myDOMNode);
- }
- function query($eval_str,$contextnode)
- {
-  if (isset($contextnode)) return new php4DOMNodelist($this->myDOMXPath->query($eval_str,$contextnode->myDOMNode),$this->myOwnerDocument);
-  else return new php4DOMNodelist($this->myDOMXPath->query($eval_str),$this->myOwnerDocument);
- }
- function xpath_register_ns($prefix,$namespaceURI) {return $this->myDOMXPath->registerNamespace($prefix,$namespaceURI);}
-}
-
-if (extension_loaded('xsl'))
-{//See also: http://alexandre.alapetite.net/doc-alex/xslt-php4-php5/
- function domxml_xslt_stylesheet($xslstring) {return new php4DomXsltStylesheet(DOMDocument::loadXML($xslstring));}
- function domxml_xslt_stylesheet_doc($dom_document) {return new php4DomXsltStylesheet($dom_document);}
- function domxml_xslt_stylesheet_file($xslfile) {return new php4DomXsltStylesheet(DOMDocument::load($xslfile));}
- class php4DomXsltStylesheet
- {
-  var $myxsltProcessor;
-  function php4DomXsltStylesheet($dom_document)
-  {
-   $this->myxsltProcessor=new xsltProcessor();
-   $this->myxsltProcessor->importStyleSheet($dom_document);
-  }
-  function process($dom_document,$xslt_parameters=array(),$param_is_xpath=false)
-  {
-   foreach ($xslt_parameters as $param=>$value)
-    $this->myxsltProcessor->setParameter('',$param,$value);
-   $myphp4DOMDocument=new php4DOMDocument();
-   $myphp4DOMDocument->myDOMNode=$this->myxsltProcessor->transformToDoc($dom_document->myDOMNode);
-   return $myphp4DOMDocument;
-  }
-  function result_dump_file($dom_document,$filename)
-  {
-   $html=$dom_document->myDOMNode->saveHTML();
-   file_put_contents($filename,$html);
-   return $html;
-  }
-  function result_dump_mem($dom_document) {return $dom_document->myDOMNode->saveHTML();}
- }
-}
-?>
+<?php
+/*
+	Requires PHP5, uses built-in DOM extension.
+	To be used in PHP4 scripts using DOMXML extension: allows PHP4/DOMXML scripts to run on PHP5/DOM.
+	(Optional: requires PHP5/XSL extension for domxml_xslt functions, PHP>=5.1 for XPath evaluation functions, and PHP>=5.1/libxml for DOMXML error reports)
+
+	Typical use:
+	{
+		if (PHP_VERSION>='5')
+			require_once('domxml-php4-to-php5.php');
+	}
+
+	Version 1.20a, 2008-11-06, http://alexandre.alapetite.net/doc-alex/domxml-php4-php5/
+
+	------------------------------------------------------------------
+	Written by Alexandre Alapetite, http://alexandre.alapetite.net/cv/
+
+	Copyright 2004-2008, GNU Lesser General Public License,
+	http://www.gnu.org/licenses/lgpl.html
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU Lesser General Public License for more details.
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/lgpl.html>
+
+	== Rights and obligations ==
+	- Attribution: You must give the original author credit.
+	- Share Alike: If you alter or transform this library,
+	   you may distribute the resulting library only under the same license GNU/LGPL.
+	- In case of jurisdiction dispute, the French law is authoritative.
+	- Any of these conditions can be waived if you get permission from Alexandre Alapetite.
+	- Not required, but please send to Alexandre Alapetite the modifications you make,
+	   in order to improve this file for the benefit of everybody.
+
+	If you want to distribute this code, please do it as a link to:
+	http://alexandre.alapetite.net/doc-alex/domxml-php4-php5/
+*/
+
+define('DOMXML_LOAD_PARSING',0);
+define('DOMXML_LOAD_VALIDATING',1);
+define('DOMXML_LOAD_RECOVERING',2);
+define('DOMXML_LOAD_SUBSTITUTE_ENTITIES',4);
+//define('DOMXML_LOAD_COMPLETE_ATTRS',8);
+define('DOMXML_LOAD_DONT_KEEP_BLANKS',16);
+
+function domxml_new_doc($version) {return new php4DOMDocument();}
+function domxml_new_xmldoc($version) {return new php4DOMDocument();}
+function domxml_open_file($filename,$mode=DOMXML_LOAD_PARSING,&$error=null)
+{
+	$dom=new php4DOMDocument($mode);
+	$errorMode=(func_num_args()>2)&&defined('LIBXML_VERSION');
+	if ($errorMode) libxml_use_internal_errors(true);
+	if (!$dom->myDOMNode->load($filename)) $dom=null;
+	if ($errorMode)
+	{
+		$error=array_map('_error_report',libxml_get_errors());
+		libxml_clear_errors();
+	}
+	return $dom;
+}
+function domxml_open_mem($str,$mode=DOMXML_LOAD_PARSING,&$error=null)
+{
+	$dom=new php4DOMDocument($mode);
+	$errorMode=(func_num_args()>2)&&defined('LIBXML_VERSION');
+	if ($errorMode) libxml_use_internal_errors(true);
+	if (!$dom->myDOMNode->loadXML($str)) $dom=null;
+	if ($errorMode)
+	{
+		$error=array_map('_error_report',libxml_get_errors());
+		libxml_clear_errors();
+	}
+	return $dom;
+}
+function html_doc($html_doc,$from_file=false)
+{
+	$dom=new php4DOMDocument();
+	if ($from_file) $result=$dom->myDOMNode->loadHTMLFile($html_doc);
+	else $result=$dom->myDOMNode->loadHTML($html_doc);
+	return $result ? $dom : null;
+}
+function html_doc_file($filename) {return html_doc($filename,true);}
+function xmldoc($str) {return domxml_open_mem($str);}
+function xmldocfile($filename) {return domxml_open_file($filename);}
+function xpath_eval($xpath_context,$eval_str,$contextnode=null) {return $xpath_context->xpath_eval($eval_str,$contextnode);}
+function xpath_new_context($dom_document) {return new php4DOMXPath($dom_document);}
+function xpath_register_ns($xpath_context,$prefix,$namespaceURI) {return $xpath_context->myDOMXPath->registerNamespace($prefix,$namespaceURI);}
+function _entityDecode($text) {return html_entity_decode(strtr($text,array('&apos;'=>'\'')),ENT_QUOTES,'UTF-8');}
+function _error_report($error) {return array('errormessage'=>$error->message,'nodename'=>'','line'=>$error->line,'col'=>$error->column)+($error->file==''?array():array('directory'=>dirname($error->file),'file'=>basename($error->file)));}
+
+class php4DOMAttr extends php4DOMNode
+{
+	function __get($name)
+	{
+		if ($name==='name') return $this->myDOMNode->name;
+		else return parent::__get($name);
+	}
+	function name() {return $this->myDOMNode->name;}
+	function set_content($text) {}
+	//function set_value($content) {return $this->myDOMNode->value=htmlspecialchars($content,ENT_QUOTES);}
+	function specified() {return $this->myDOMNode->specified;}
+	function value() {return $this->myDOMNode->value;}
+}
+
+class php4DOMDocument extends php4DOMNode
+{
+	function php4DOMDocument($mode=DOMXML_LOAD_PARSING)
+	{
+		$this->myDOMNode=new DOMDocument();
+		$this->myOwnerDocument=$this;
+		if ($mode & DOMXML_LOAD_VALIDATING) $this->myDOMNode->validateOnParse=true;
+		if ($mode & DOMXML_LOAD_RECOVERING) $this->myDOMNode->recover=true;
+		if ($mode & DOMXML_LOAD_SUBSTITUTE_ENTITIES) $this->myDOMNode->substituteEntities=true;
+		if ($mode & DOMXML_LOAD_DONT_KEEP_BLANKS) $this->myDOMNode->preserveWhiteSpace=false;
+	}
+	function add_root($name)
+	{
+		if ($this->myDOMNode->hasChildNodes()) $this->myDOMNode->removeChild($this->myDOMNode->firstChild);
+		return new php4DOMElement($this->myDOMNode->appendChild($this->myDOMNode->createElement($name)),$this->myOwnerDocument);
+	}
+	function create_attribute($name,$value)
+	{
+		$myAttr=$this->myDOMNode->createAttribute($name);
+		$myAttr->value=htmlspecialchars($value,ENT_QUOTES);
+		return new php4DOMAttr($myAttr,$this);
+	}
+	function create_cdata_section($content) {return new php4DOMNode($this->myDOMNode->createCDATASection($content),$this);}
+	function create_comment($data) {return new php4DOMNode($this->myDOMNode->createComment($data),$this);}
+	function create_element($name) {return new php4DOMElement($this->myDOMNode->createElement($name),$this);}
+	function create_element_ns($uri,$name,$prefix=null)
+	{
+		if ($prefix==null) $prefix=$this->myDOMNode->lookupPrefix($uri);
+		if (($prefix==null)&&(($this->myDOMNode->documentElement==null)||(!$this->myDOMNode->documentElement->isDefaultNamespace($uri)))) $prefix='a'.sprintf('%u',crc32($uri));
+		return new php4DOMElement($this->myDOMNode->createElementNS($uri,$prefix==null ? $name : $prefix.':'.$name),$this);
+	}
+	function create_entity_reference($content) {return new php4DOMNode($this->myDOMNode->createEntityReference($content),$this);} //By Walter Ebert 2007-01-22
+	function create_processing_instruction($target,$data=''){return new php4DomProcessingInstruction($this->myDOMNode->createProcessingInstruction($target,$data),$this);}
+	function create_text_node($content) {return new php4DOMText($this->myDOMNode->createTextNode($content),$this);}
+	function document_element() {return parent::_newDOMElement($this->myDOMNode->documentElement,$this);}
+	function dump_file($filename,$compressionmode=false,$format=false)
+	{
+		$format0=$this->myDOMNode->formatOutput;
+		$this->myDOMNode->formatOutput=$format;
+		$res=$this->myDOMNode->save($filename);
+		$this->myDOMNode->formatOutput=$format0;
+		return $res;
+	}
+	function dump_mem($format=false,$encoding=false)
+	{
+		$format0=$this->myDOMNode->formatOutput;
+		$this->myDOMNode->formatOutput=$format;
+		$encoding0=$this->myDOMNode->encoding;
+		if ($encoding) $this->myDOMNode->encoding=$encoding;
+		$dump=$this->myDOMNode->saveXML();
+		$this->myDOMNode->formatOutput=$format0;
+		if ($encoding) $this->myDOMNode->encoding= $encoding0=='' ? 'UTF-8' : $encoding0; //UTF-8 is XML default encoding
+		return $dump;
+	}
+	function free()
+	{
+		if ($this->myDOMNode->hasChildNodes()) $this->myDOMNode->removeChild($this->myDOMNode->firstChild);
+		$this->myDOMNode=null;
+		$this->myOwnerDocument=null;
+	}
+	function get_element_by_id($id) {return parent::_newDOMElement($this->myDOMNode->getElementById($id),$this);}
+	function get_elements_by_tagname($name)
+	{
+		$myDOMNodeList=$this->myDOMNode->getElementsByTagName($name);
+		$nodeSet=array();
+		$i=0;
+		if (isset($myDOMNodeList))
+			while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=new php4DOMElement($node,$this);
+		return $nodeSet;
+	}
+	function html_dump_mem() {return $this->myDOMNode->saveHTML();}
+	function root() {return parent::_newDOMElement($this->myDOMNode->documentElement,$this);}
+	function xpath_new_context() {return new php4DOMXPath($this);}
+}
+
+class php4DOMElement extends php4DOMNode
+{
+	function add_namespace($uri,$prefix)
+	{
+		if ($this->myDOMNode->hasAttributeNS('http://www.w3.org/2000/xmlns/',$prefix)) return false;
+		else
+		{
+			$this->myDOMNode->setAttributeNS('http://www.w3.org/2000/xmlns/','xmlns:'.$prefix,$uri); //By Daniel Walker 2006-09-08
+			return true;
+		}
+	}
+	function get_attribute($name) {return $this->myDOMNode->getAttribute($name);}
+	function get_attribute_node($name) {return parent::_newDOMElement($this->myDOMNode->getAttributeNode($name),$this->myOwnerDocument);}
+	function get_elements_by_tagname($name)
+	{
+		$myDOMNodeList=$this->myDOMNode->getElementsByTagName($name);
+		$nodeSet=array();
+		$i=0;
+		if (isset($myDOMNodeList))
+			while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=new php4DOMElement($node,$this->myOwnerDocument);
+		return $nodeSet;
+	}
+	function has_attribute($name) {return $this->myDOMNode->hasAttribute($name);}
+	function remove_attribute($name) {return $this->myDOMNode->removeAttribute($name);}
+	function set_attribute($name,$value)
+	{
+		//return $this->myDOMNode->setAttribute($name,$value); //Does not return a DomAttr
+		$myAttr=$this->myDOMNode->ownerDocument->createAttribute($name);
+		$myAttr->value=htmlspecialchars($value,ENT_QUOTES); //Entity problem reported by AL-DesignWorks 2007-09-07
+		$this->myDOMNode->setAttributeNode($myAttr);
+		return new php4DOMAttr($myAttr,$this->myOwnerDocument);
+	}
+	/*function set_attribute_node($attr)
+	{
+		$this->myDOMNode->setAttributeNode($this->_importNode($attr));
+		return $attr;
+	}*/
+	function set_name($name)
+	{
+		if ($this->myDOMNode->prefix=='') $newNode=$this->myDOMNode->ownerDocument->createElement($name);
+		else $newNode=$this->myDOMNode->ownerDocument->createElementNS($this->myDOMNode->namespaceURI,$this->myDOMNode->prefix.':'.$name);
+		$myDOMNodeList=$this->myDOMNode->attributes;
+		$i=0;
+		if (isset($myDOMNodeList))
+			while ($node=$myDOMNodeList->item($i++))
+				if ($node->namespaceURI=='') $newNode->setAttribute($node->name,$node->value);
+				else $newNode->setAttributeNS($node->namespaceURI,$node->nodeName,$node->value);
+		$myDOMNodeList=$this->myDOMNode->childNodes;
+		if (isset($myDOMNodeList))
+			while ($node=$myDOMNodeList->item(0)) $newNode->appendChild($node);
+		$this->myDOMNode->parentNode->replaceChild($newNode,$this->myDOMNode);
+		$this->myDOMNode=$newNode;
+		return true;
+	}
+	function tagname() {return $this->tagname;}
+}
+
+class php4DOMNode
+{
+	public $myDOMNode;
+	public $myOwnerDocument;
+	function php4DOMNode($aDomNode,$aOwnerDocument)
+	{
+		$this->myDOMNode=$aDomNode;
+		$this->myOwnerDocument=$aOwnerDocument;
+	}
+	function __get($name)
+	{
+		switch ($name)
+		{
+			case 'type': return $this->myDOMNode->nodeType;
+			case 'tagname': return ($this->myDOMNode->nodeType===XML_ELEMENT_NODE) ? $this->myDOMNode->localName : $this->myDOMNode->tagName; //Avoid namespace prefix for DOMElement
+			case 'content': return $this->myDOMNode->textContent;
+			case 'value': return $this->myDOMNode->value;
+			default:
+				$myErrors=debug_backtrace();
+				trigger_error('Undefined property: '.get_class($this).'::$'.$name.' ['.$myErrors[0]['file'].':'.$myErrors[0]['line'].']',E_USER_NOTICE);
+				return false;
+		}
+	}
+	function add_child($newnode) {return append_child($newnode);}
+	function add_namespace($uri,$prefix) {return false;}
+	function append_child($newnode) {return self::_newDOMElement($this->myDOMNode->appendChild($this->_importNode($newnode)),$this->myOwnerDocument);}
+	function append_sibling($newnode) {return self::_newDOMElement($this->myDOMNode->parentNode->appendChild($this->_importNode($newnode)),$this->myOwnerDocument);}
+	function attributes()
+	{
+		$myDOMNodeList=$this->myDOMNode->attributes;
+		if (!(isset($myDOMNodeList)&&$this->myDOMNode->hasAttributes())) return null;
+		$nodeSet=array();
+		$i=0;
+		while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=new php4DOMAttr($node,$this->myOwnerDocument);
+		return $nodeSet;
+	}
+	function child_nodes()
+	{
+		$myDOMNodeList=$this->myDOMNode->childNodes;
+		$nodeSet=array();
+		$i=0;
+		if (isset($myDOMNodeList))
+			while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=self::_newDOMElement($node,$this->myOwnerDocument);
+		return $nodeSet;
+	}
+	function children() {return $this->child_nodes();}
+	function clone_node($deep=false) {return self::_newDOMElement($this->myDOMNode->cloneNode($deep),$this->myOwnerDocument);}
+	//dump_node($node) should only be called on php4DOMDocument
+	function dump_node($node=null) {return $node==null ? $this->myOwnerDocument->myDOMNode->saveXML($this->myDOMNode) : $this->myOwnerDocument->myDOMNode->saveXML($node->myDOMNode);}
+	function first_child() {return self::_newDOMElement($this->myDOMNode->firstChild,$this->myOwnerDocument);}
+	function get_content() {return $this->myDOMNode->textContent;}
+	function has_attributes() {return $this->myDOMNode->hasAttributes();}
+	function has_child_nodes() {return $this->myDOMNode->hasChildNodes();}
+	function insert_before($newnode,$refnode) {return self::_newDOMElement($this->myDOMNode->insertBefore($this->_importNode($newnode),$refnode==null?null:$refnode->myDOMNode),$this->myOwnerDocument);}
+	function is_blank_node() {return ($this->myDOMNode->nodeType===XML_TEXT_NODE)&&preg_match('%^\s*$%',$this->myDOMNode->nodeValue);}
+	function last_child() {return self::_newDOMElement($this->myDOMNode->lastChild,$this->myOwnerDocument);}
+	function new_child($name,$content)
+	{
+		$mySubNode=$this->myDOMNode->ownerDocument->createElement($name);
+		$mySubNode->appendChild($this->myDOMNode->ownerDocument->createTextNode(_entityDecode($content)));
+		$this->myDOMNode->appendChild($mySubNode);
+		return new php4DOMElement($mySubNode,$this->myOwnerDocument);
+	}
+	function next_sibling() {return self::_newDOMElement($this->myDOMNode->nextSibling,$this->myOwnerDocument);}
+	function node_name() {return ($this->myDOMNode->nodeType===XML_ELEMENT_NODE) ? $this->myDOMNode->localName : $this->myDOMNode->nodeName;} //Avoid namespace prefix for DOMElement
+	function node_type() {return $this->myDOMNode->nodeType;}
+	function node_value() {return $this->myDOMNode->nodeValue;}
+	function owner_document() {return $this->myOwnerDocument;}
+	function parent_node() {return self::_newDOMElement($this->myDOMNode->parentNode,$this->myOwnerDocument);}
+	function prefix() {return $this->myDOMNode->prefix;}
+	function previous_sibling() {return self::_newDOMElement($this->myDOMNode->previousSibling,$this->myOwnerDocument);}
+	function remove_child($oldchild) {return self::_newDOMElement($this->myDOMNode->removeChild($oldchild->myDOMNode),$this->myOwnerDocument);}
+	function replace_child($newnode,$oldnode) {return self::_newDOMElement($this->myDOMNode->replaceChild($this->_importNode($newnode),$oldnode->myDOMNode),$this->myOwnerDocument);}
+	function replace_node($newnode) {return self::_newDOMElement($this->myDOMNode->parentNode->replaceChild($this->_importNode($newnode),$this->myDOMNode),$this->myOwnerDocument);}
+	function set_content($text) {return $this->myDOMNode->appendChild($this->myDOMNode->ownerDocument->createTextNode(_entityDecode($text)));} //Entity problem reported by AL-DesignWorks 2007-09-07
+	//function set_name($name) {return $this->myOwnerDocument->renameNode($this->myDOMNode,$this->myDOMNode->namespaceURI,$name);}
+	function set_namespace($uri,$prefix=null)
+	{//Contributions by Daniel Walker 2006-09-08
+		$nsprefix=$this->myDOMNode->lookupPrefix($uri);
+		if ($nsprefix==null)
+		{
+			$nsprefix= $prefix==null ? $nsprefix='a'.sprintf('%u',crc32($uri)) : $prefix;
+			if ($this->myDOMNode->nodeType===XML_ATTRIBUTE_NODE)
+			{
+				if (($prefix!=null)&&$this->myDOMNode->ownerElement->hasAttributeNS('http://www.w3.org/2000/xmlns/',$nsprefix)&&
+					($this->myDOMNode->ownerElement->getAttributeNS('http://www.w3.org/2000/xmlns/',$nsprefix)!=$uri))
+				{//Remove namespace
+					$parent=$this->myDOMNode->ownerElement;
+					$parent->removeAttributeNode($this->myDOMNode);
+					$parent->setAttribute($this->myDOMNode->localName,$this->myDOMNode->nodeValue);
+					$this->myDOMNode=$parent->getAttributeNode($this->myDOMNode->localName);
+					return;
+				}
+				$this->myDOMNode->ownerElement->setAttributeNS('http://www.w3.org/2000/xmlns/','xmlns:'.$nsprefix,$uri);
+			}
+		}
+		if ($this->myDOMNode->nodeType===XML_ATTRIBUTE_NODE)
+		{
+			$parent=$this->myDOMNode->ownerElement;
+			$parent->removeAttributeNode($this->myDOMNode);
+			$parent->setAttributeNS($uri,$nsprefix.':'.$this->myDOMNode->localName,$this->myDOMNode->nodeValue);
+			$this->myDOMNode=$parent->getAttributeNodeNS($uri,$this->myDOMNode->localName);
+		}
+		elseif ($this->myDOMNode->nodeType===XML_ELEMENT_NODE)
+		{
+			$NewNode=$this->myDOMNode->ownerDocument->createElementNS($uri,$nsprefix.':'.$this->myDOMNode->localName);
+			foreach ($this->myDOMNode->attributes as $n) $NewNode->appendChild($n->cloneNode(true));
+			foreach ($this->myDOMNode->childNodes as $n) $NewNode->appendChild($n->cloneNode(true));
+			$xpath=new DOMXPath($this->myDOMNode->ownerDocument);
+			$myDOMNodeList=$xpath->query('namespace::*[name()!="xml"]',$this->myDOMNode); //Add old namespaces
+			foreach ($myDOMNodeList as $n) $NewNode->setAttributeNS('http://www.w3.org/2000/xmlns/',$n->nodeName,$n->nodeValue); 
+			$this->myDOMNode->parentNode->replaceChild($NewNode,$this->myDOMNode);
+			$this->myDOMNode=$NewNode;
+		}
+	}
+	function unlink_node()
+	{
+		if ($this->myDOMNode->parentNode!=null)
+		{
+			if ($this->myDOMNode->nodeType===XML_ATTRIBUTE_NODE) $this->myDOMNode->parentNode->removeAttributeNode($this->myDOMNode);
+			else $this->myDOMNode->parentNode->removeChild($this->myDOMNode);
+		}
+	}
+	protected function _importNode($newnode) {return $this->myOwnerDocument===$newnode->myOwnerDocument ? $newnode->myDOMNode : $this->myOwnerDocument->myDOMNode->importNode($newnode->myDOMNode,true);} //To import DOMNode from another DOMDocument
+	static function _newDOMElement($aDOMNode,$aOwnerDocument)
+	{//Check the PHP5 DOMNode before creating a new associated PHP4 DOMNode wrapper
+		if ($aDOMNode==null) return null;
+		switch ($aDOMNode->nodeType)
+		{
+			case XML_ELEMENT_NODE: return new php4DOMElement($aDOMNode,$aOwnerDocument);
+			case XML_TEXT_NODE: return new php4DOMText($aDOMNode,$aOwnerDocument);
+			case XML_ATTRIBUTE_NODE: return new php4DOMAttr($aDOMNode,$aOwnerDocument);
+			case XML_PI_NODE: return new php4DomProcessingInstruction($aDOMNode,$aOwnerDocument);
+			default: return new php4DOMNode($aDOMNode,$aOwnerDocument);
+		}
+	}
+}
+
+class php4DomProcessingInstruction extends php4DOMNode
+{
+	function data() {return $this->myDOMNode->data;}
+	function target() {return $this->myDOMNode->target;}
+}
+
+class php4DOMText extends php4DOMNode
+{
+	function __get($name)
+	{
+		if ($name==='tagname') return '#text';
+		else return parent::__get($name);
+	}
+	function tagname() {return '#text';}
+	function set_content($text) {$this->myDOMNode->nodeValue=$text; return true;}
+}
+
+if (!defined('XPATH_NODESET'))
+{
+	define('XPATH_UNDEFINED',0);
+	define('XPATH_NODESET',1);
+	define('XPATH_BOOLEAN',2);
+	define('XPATH_NUMBER',3);
+	define('XPATH_STRING',4);
+	/*define('XPATH_POINT',5);
+	define('XPATH_RANGE',6);
+	define('XPATH_LOCATIONSET',7);
+	define('XPATH_USERS',8);
+	define('XPATH_XSLT_TREE',9);*/
+}
+
+class php4DOMNodelist
+{
+	private $myDOMNodelist;
+	public $nodeset;
+	public $type=XPATH_UNDEFINED;
+	public $value;
+	function php4DOMNodelist($aDOMNodelist,$aOwnerDocument)
+	{
+		if (!isset($aDOMNodelist)) return; 
+		elseif (is_object($aDOMNodelist)||is_array($aDOMNodelist))
+		{
+			if ($aDOMNodelist->length>0)
+			{
+				$this->myDOMNodelist=$aDOMNodelist;
+				$this->nodeset=array();
+				$this->type=XPATH_NODESET;
+				$i=0;
+				while ($node=$this->myDOMNodelist->item($i++)) $this->nodeset[]=php4DOMNode::_newDOMElement($node,$aOwnerDocument);
+			}
+		}
+		elseif (is_int($aDOMNodelist)||is_float($aDOMNodelist))
+		{
+			$this->type=XPATH_NUMBER;
+			$this->value=$aDOMNodelist;
+		}
+		elseif (is_bool($aDOMNodelist))
+		{
+			$this->type=XPATH_BOOLEAN;
+			$this->value=$aDOMNodelist;
+		}
+		elseif (is_string($aDOMNodelist))
+		{
+			$this->type=XPATH_STRING;
+			$this->value=$aDOMNodelist;
+		}
+	}
+}
+
+class php4DOMXPath
+{
+	public $myDOMXPath;
+	private $myOwnerDocument;
+	function php4DOMXPath($dom_document)
+	{
+		//TODO: If $dom_document is a DomElement, make that default $contextnode and modify XPath. Ex: '/test'
+		$this->myOwnerDocument=$dom_document->myOwnerDocument;
+		$this->myDOMXPath=new DOMXPath($this->myOwnerDocument->myDOMNode);
+	}
+	function xpath_eval($eval_str,$contextnode=null)
+	{
+		if (method_exists($this->myDOMXPath,'evaluate')) $xp=isset($contextnode) ? $this->myDOMXPath->evaluate($eval_str,$contextnode->myDOMNode) : $this->myDOMXPath->evaluate($eval_str);
+		else $xp=isset($contextnode) ? $this->myDOMXPath->query($eval_str,$contextnode->myDOMNode) : $this->myDOMXPath->query($eval_str);
+		$xp=new php4DOMNodelist($xp,$this->myOwnerDocument);
+		return ($xp->type===XPATH_UNDEFINED) ? false : $xp;
+	}
+	function xpath_register_ns($prefix,$namespaceURI) {return $this->myDOMXPath->registerNamespace($prefix,$namespaceURI);}
+}
+
+if (extension_loaded('xsl'))
+{//See also: http://alexandre.alapetite.net/doc-alex/xslt-php4-php5/
+	function domxml_xslt_stylesheet($xslstring) {return new php4DomXsltStylesheet(DOMDocument::loadXML($xslstring));}
+	function domxml_xslt_stylesheet_doc($dom_document) {return new php4DomXsltStylesheet($dom_document);}
+	function domxml_xslt_stylesheet_file($xslfile) {return new php4DomXsltStylesheet(DOMDocument::load($xslfile));}
+	class php4DomXsltStylesheet
+	{
+		private $myxsltProcessor;
+		function php4DomXsltStylesheet($dom_document)
+		{
+			$this->myxsltProcessor=new xsltProcessor();
+			$this->myxsltProcessor->importStyleSheet($dom_document);
+		}
+		function process($dom_document,$xslt_parameters=array(),$param_is_xpath=false)
+		{
+			foreach ($xslt_parameters as $param=>$value) $this->myxsltProcessor->setParameter('',$param,$value);
+			$myphp4DOMDocument=new php4DOMDocument();
+			$myphp4DOMDocument->myDOMNode=$this->myxsltProcessor->transformToDoc($dom_document->myDOMNode);
+			return $myphp4DOMDocument;
+		}
+		function result_dump_file($dom_document,$filename)
+		{
+			$html=$dom_document->myDOMNode->saveHTML();
+			file_put_contents($filename,$html);
+			return $html;
+		}
+		function result_dump_mem($dom_document) {return $dom_document->myDOMNode->saveHTML();}
+	}
+}
+?>
@@ -1,27 +1,79 @@
-<?php
-
-/**
- * @file languages/english.php
- * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
- * @sa @link internalLang Internationalization @endlink
- * @ingroup internalLang
- */
-
-$this->_strings = array(
- CAS_STR_USING_SERVER 
- => 'using server',
- CAS_STR_AUTHENTICATION_WANTED 
- => 'CAS Authentication wanted!',
- CAS_STR_LOGOUT 
- => 'CAS logout wanted!',
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
- => 'You should already have been redirected to the CAS server. Click <a href="%s">here</a> to continue.',
- CAS_STR_AUTHENTICATION_FAILED 
- => 'CAS Authentication failed!',
- CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
- => '<p>You were not authenticated.</p><p>You may submit your request again by clicking <a href="%s">here</a>.</p><p>If the problem persists, you may contact <a href="mailto:%s">the administrator of this site</a>.</p>',
- CAS_STR_SERVICE_UNAVAILABLE
- => 'The service `<b>%s</b>\' is not available (<b>%s</b>).'
-);
-
+<?php
+
+
+
+
+
+/**
+
+
+ * @file languages/english.php
+
+
+ * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
+
+
+ * @sa @link internalLang Internationalization @endlink
+
+
+ * @ingroup internalLang
+
+
+ */
+
+
+
+
+
+$this->_strings = array(
+
+
+ CAS_STR_USING_SERVER 
+
+
+ => 'using server',
+
+
+ CAS_STR_AUTHENTICATION_WANTED 
+
+
+ => 'CAS Authentication wanted!',
+
+
+ CAS_STR_LOGOUT 
+
+
+ => 'CAS logout wanted!',
+
+
+ CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
+
+
+ => 'You should already have been redirected to the CAS server. Click <a href="%s">here</a> to continue.',
+
+
+ CAS_STR_AUTHENTICATION_FAILED 
+
+
+ => 'CAS Authentication failed!',
+
+
+ CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
+
+
+ => '<p>You were not authenticated.</p><p>You may submit your request again by clicking <a href="%s">here</a>.</p><p>If the problem persists, you may contact <a href="mailto:%s">the administrator of this site</a>.</p>',
+
+
+ CAS_STR_SERVICE_UNAVAILABLE
+
+
+ => 'The service `<b>%s</b>\' is not available (<b>%s</b>).'
+
+
+);
+
+
+
+
+
 ?>
@@ -1,28 +1,82 @@
-<?php
-
-/**
- * @file languages/english.php
- * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
- * @sa @link internalLang Internationalization @endlink
- * @ingroup internalLang
- */
-
-$this->_strings = array(
- CAS_STR_USING_SERVER 
- => 'utilisant le serveur',
- CAS_STR_AUTHENTICATION_WANTED 
- => 'Authentication CAS nécessaire&nbsp;!',
- CAS_STR_LOGOUT 
- => 'Déconnexion demandée&nbsp;!',
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
- => 'Vous auriez du etre redirigé(e) vers le serveur CAS. Cliquez <a href="%s">ici</a> pour continuer.',
- CAS_STR_AUTHENTICATION_FAILED 
- => 'Authentification CAS infructueuse&nbsp;!',
- CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
- => '<p>Vous n\'avez pas été authentifié(e).</p><p>Vous pouvez soumettre votre requete à nouveau en cliquant <a href="%s">ici</a>.</p><p>Si le problème persiste, vous pouvez contacter <a href="mailto:%s">l\'administrateur de ce site</a>.</p>',
- CAS_STR_SERVICE_UNAVAILABLE
- => 'Le service `<b>%s</b>\' est indisponible (<b>%s</b>)'
-
-);
-
+<?php
+
+
+
+
+
+/**
+
+
+ * @file languages/english.php
+
+
+ * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
+
+
+ * @sa @link internalLang Internationalization @endlink
+
+
+ * @ingroup internalLang
+
+
+ */
+
+
+
+
+
+$this->_strings = array(
+
+
+ CAS_STR_USING_SERVER 
+
+
+ => 'utilisant le serveur',
+
+
+ CAS_STR_AUTHENTICATION_WANTED 
+
+
+ => 'Authentication CAS nécessaire&nbsp;!',
+
+
+ CAS_STR_LOGOUT 
+
+
+ => 'Déconnexion demandée&nbsp;!',
+
+
+ CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
+
+
+ => 'Vous auriez du etre redirigé(e) vers le serveur CAS. Cliquez <a href="%s">ici</a> pour continuer.',
+
+
+ CAS_STR_AUTHENTICATION_FAILED 
+
+
+ => 'Authentification CAS infructueuse&nbsp;!',
+
+
+ CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
+
+
+ => '<p>Vous n\'avez pas été authentifié(e).</p><p>Vous pouvez soumettre votre requete à nouveau en cliquant <a href="%s">ici</a>.</p><p>Si le problème persiste, vous pouvez contacter <a href="mailto:%s">l\'administrateur de ce site</a>.</p>',
+
+
+ CAS_STR_SERVICE_UNAVAILABLE
+
+
+ => 'Le service `<b>%s</b>\' est indisponible (<b>%s</b>)'
+
+
+
+
+
+);
+
+
+
+
+
 ?>
@@ -1,27 +1,79 @@
-<?php
-
-/**
- * @file languages/german.php
- * @author Henrik Genssen <hg at mediafactory.de>
- * @sa @link internalLang Internationalization @endlink
- * @ingroup internalLang
- */
-
-$this->_strings = array(
- CAS_STR_USING_SERVER 
- => 'via Server',
- CAS_STR_AUTHENTICATION_WANTED 
- => 'CAS Authentifizierung erforderlich!',
- CAS_STR_LOGOUT 
- => 'CAS Abmeldung!',
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
- => 'eigentlich h&auml;ten Sie zum CAS Server weitergeleitet werden sollen. Dr&uuml;cken Sie <a href="%s">hier</a> um fortzufahren.',
- CAS_STR_AUTHENTICATION_FAILED 
- => 'CAS Anmeldung fehlgeschlagen!',
- CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
- => '<p>Sie wurden nicht angemeldet.</p><p>Um es erneut zu versuchen klicken Sie <a href="%s">hier</a>.</p><p>Wenn das Problem bestehen bleibt, kontkatieren Sie den <a href="mailto:%s">Administrator</a> dieser Seite.</p>',
- CAS_STR_SERVICE_UNAVAILABLE
- => 'Der Dienst `<b>%s</b>\' ist nicht verf&uuml;gbar (<b>%s</b>).'
-);
-
+<?php
+
+
+
+
+
+/**
+
+
+ * @file languages/german.php
+
+
+ * @author Henrik Genssen <hg at mediafactory.de>
+
+
+ * @sa @link internalLang Internationalization @endlink
+
+
+ * @ingroup internalLang
+
+
+ */
+
+
+
+
+
+$this->_strings = array(
+
+
+ CAS_STR_USING_SERVER 
+
+
+ => 'via Server',
+
+
+ CAS_STR_AUTHENTICATION_WANTED 
+
+
+ => 'CAS Authentifizierung erforderlich!',
+
+
+ CAS_STR_LOGOUT 
+
+
+ => 'CAS Abmeldung!',
+
+
+ CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
+
+
+ => 'eigentlich h&auml;ten Sie zum CAS Server weitergeleitet werden sollen. Dr&uuml;cken Sie <a href="%s">hier</a> um fortzufahren.',
+
+
+ CAS_STR_AUTHENTICATION_FAILED 
+
+
+ => 'CAS Anmeldung fehlgeschlagen!',
+
+
+ CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
+
+
+ => '<p>Sie wurden nicht angemeldet.</p><p>Um es erneut zu versuchen klicken Sie <a href="%s">hier</a>.</p><p>Wenn das Problem bestehen bleibt, kontkatieren Sie den <a href="mailto:%s">Administrator</a> dieser Seite.</p>',
+
+
+ CAS_STR_SERVICE_UNAVAILABLE
+
+
+ => 'Der Dienst `<b>%s</b>\' ist nicht verf&uuml;gbar (<b>%s</b>).'
+
+
+);
+
+
+
+
+
 ?>
@@ -1,27 +1,79 @@
-<?php
-
-/**
- * @file languages/greek.php
- * @author Vangelis Haniotakis <haniotak at ucnet.uoc.gr>
- * @sa @link internalLang Internationalization @endlink
- * @ingroup internalLang
- */
-
-$this->_strings = array(
- CAS_STR_USING_SERVER 
- => '÷ñçóéìïðïéåßôáé ï åîõðçñåôçôÞò',
- CAS_STR_AUTHENTICATION_WANTED 
- => 'Áðáéôåßôáé ç ôáõôïðïßçóç CAS!',
- CAS_STR_LOGOUT 
- => 'Áðáéôåßôáé ç áðïóýíäåóç áðü CAS!',
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
- => 'Èá Ýðñåðå íá åß÷áôå áíáêáôåõèõíèåß óôïí åîõðçñåôçôÞ CAS. ÊÜíôå êëßê <a href="%s">åäþ</a> ãéá íá óõíå÷ßóåôå.',
- CAS_STR_AUTHENTICATION_FAILED 
- => 'Ç ôáõôïðïßçóç CAS áðÝôõ÷å!',
- CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
- => '<p>Äåí ôáõôïðïéçèÞêáôå.</p><p>Ìðïñåßôå íá îáíáðñïóðáèÞóåôå, êÜíïíôáò êëßê <a href="%s">åäþ</a>.</p><p>Åáí ôï ðñüâëçìá åðéìåßíåé, åëÜôå óå åðáöÞ ìå ôïí <a href="mailto:%s">äéá÷åéñéóôÞ</a>.</p>',
- CAS_STR_SERVICE_UNAVAILABLE
- => 'Ç õðçñåóßá `<b>%s</b>\' äåí åßíáé äéáèÝóéìç (<b>%s</b>).'
-);
-
+<?php
+
+
+
+
+
+/**
+
+
+ * @file languages/greek.php
+
+
+ * @author Vangelis Haniotakis <haniotak at ucnet.uoc.gr>
+
+
+ * @sa @link internalLang Internationalization @endlink
+
+
+ * @ingroup internalLang
+
+
+ */
+
+
+
+
+
+$this->_strings = array(
+
+
+ CAS_STR_USING_SERVER 
+
+
+ => '÷ñçóéìïðïéåßôáé ï åîõðçñåôçôÞò',
+
+
+ CAS_STR_AUTHENTICATION_WANTED 
+
+
+ => 'Áðáéôåßôáé ç ôáõôïðïßçóç CAS!',
+
+
+ CAS_STR_LOGOUT 
+
+
+ => 'Áðáéôåßôáé ç áðïóýíäåóç áðü CAS!',
+
+
+ CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
+
+
+ => 'Èá Ýðñåðå íá åß÷áôå áíáêáôåõèõíèåß óôïí åîõðçñåôçôÞ CAS. ÊÜíôå êëßê <a href="%s">åäþ</a> ãéá íá óõíå÷ßóåôå.',
+
+
+ CAS_STR_AUTHENTICATION_FAILED 
+
+
+ => 'Ç ôáõôïðïßçóç CAS áðÝôõ÷å!',
+
+
+ CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
+
+
+ => '<p>Äåí ôáõôïðïéçèÞêáôå.</p><p>Ìðïñåßôå íá îáíáðñïóðáèÞóåôå, êÜíïíôáò êëßê <a href="%s">åäþ</a>.</p><p>Åáí ôï ðñüâëçìá åðéìåßíåé, åëÜôå óå åðáöÞ ìå ôïí <a href="mailto:%s">äéá÷åéñéóôÞ</a>.</p>',
+
+
+ CAS_STR_SERVICE_UNAVAILABLE
+
+
+ => 'Ç õðçñåóßá `<b>%s</b>\' äåí åßíáé äéáèÝóéìç (<b>%s</b>).'
+
+
+);
+
+
+
+
+
 ?>
@@ -1,27 +1,53 @@
 <?php

+
+
 /**
+
 * @file languages/japanese.php
+
 * @author fnorif (fnorif@yahoo.co.jp)
+
 * 
+
 * Now Encoding is EUC-JP and LF
+
 **/

+
+
 $this->_strings = array(
+
 CAS_STR_USING_SERVER 
+
 => 'using server',
+
 CAS_STR_AUTHENTICATION_WANTED 
+
 => 'CASによる認証を行います',
+
 CAS_STR_LOGOUT 
+
 => 'CASからログアウトします!',
+
 CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
+
 => 'CASサーバに行く必要があります。自動的に転送されない場合は <a href="%s">こちら</a> をクリックして続行します。',
+
 CAS_STR_AUTHENTICATION_FAILED 
+
 => 'CASによる認証に失敗しました',
+
 CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
+
 => '<p>認証できませんでした.</p><p>もう一度リクエストを送信する場合は<a href="%s">こちら</a>をクリック.</p><p>問題が解決しない場合は <a href="mailto:%s">このサイトの管理者</a>に問い合わせてください.</p>',
+
 CAS_STR_SERVICE_UNAVAILABLE
+
 => 'サービス `<b>%s</b>\' は利用できません (<b>%s</b>).'
+
 );

+
+
 ?>
@@ -1,24 +1,70 @@
-<?php
-
-/**
- * @file languages/languages.php
- * Internationalization constants
- * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
- * @sa @link internalLang Internationalization @endlink
- * @ingroup internalLang
- */
-
-//@{
-/**
- * a phpCAS string index
- */
-define("CAS_STR_USING_SERVER",                1);
-define("CAS_STR_AUTHENTICATION_WANTED",       2);
-define("CAS_STR_LOGOUT",                      3);
-define("CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED", 4);
-define("CAS_STR_AUTHENTICATION_FAILED",       5);
-define("CAS_STR_YOU_WERE_NOT_AUTHENTICATED",  6);
-define("CAS_STR_SERVICE_UNAVAILABLE",         7);
-//@}
-
+<?php
+
+
+
+
+
+/**
+
+
+ * @file languages/languages.php
+
+
+ * Internationalization constants
+
+
+ * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
+
+
+ * @sa @link internalLang Internationalization @endlink
+
+
+ * @ingroup internalLang
+
+
+ */
+
+
+
+
+
+//@{
+
+
+/**
+
+
+ * a phpCAS string index
+
+
+ */
+
+
+define("CAS_STR_USING_SERVER",                1);
+
+
+define("CAS_STR_AUTHENTICATION_WANTED",       2);
+
+
+define("CAS_STR_LOGOUT",                      3);
+
+
+define("CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED", 4);
+
+
+define("CAS_STR_AUTHENTICATION_FAILED",       5);
+
+
+define("CAS_STR_YOU_WERE_NOT_AUTHENTICATED",  6);
+
+
+define("CAS_STR_SERVICE_UNAVAILABLE",         7);
+
+
+//@}
+
+
+
+
+
 ?>
@@ -1,4 +1,8 @@
-CAS-module README
-
-
-
+CAS-module README
+
+
+
+
+
+
+
@@ -1,12 +1,24 @@
-
-<div class="loginbox clearfix">
-<div class="loginpanel">
-<div>
-<a href="<?php echo $CFG->wwwroot.'/login/index.php?authCAS=CAS';?>"><?php print_string("accesCAS","auth");?></a>
-</div>
-<br/>
-<div>
-<a href="<?php echo $CFG->wwwroot.'/login/index.php?authCAS=NOCAS';?>"><?php print_string("accesNOCAS","auth");?></a>
-</div>
-</div>
-</div>
+
+
+<div class="loginbox clearfix">
+
+<div class="loginpanel">
+
+<div>
+
+<a href="<?php echo $CFG->wwwroot.'/login/index.php?authCAS=CAS';?>"><?php print_string("accesCAS","auth");?></a>
+
+</div>
+
+<br/>
+
+<div>
+
+<a href="<?php echo $CFG->wwwroot.'/login/index.php?authCAS=NOCAS';?>"><?php print_string("accesNOCAS","auth");?></a>
+
+</div>
+
+</div>
+
+</div>
+
@@ -1,9 +1,17 @@
-<?PHP
-// version $Id$
-// List of CAS langages.
-// You can add langages in /CAS/langage.
-// Please send them to http://esup-phpcas.sourceforge.net
-$CASLANGUAGES = array (
-"english" => "English",
-"french" => "French");
-?>
+<?PHP
+
+// version $Id$
+
+// List of CAS langages.
+
+// You can add langages in /CAS/langage.
+
+// Please send them to http://esup-phpcas.sourceforge.net
+
+$CASLANGUAGES = array (
+
+"english" => "English",
+
+"french" => "French");
+
+?>
@@ -173,6 +173,7 @@ class auth_plugin_db extends auth_plugin_base {
            if ($rs = $authdb->Execute($sql)) {
                if ( $rs->RecordCount() == 1 ) {
                    $fields_obj = rs_fetch_record($rs);
+                    $fields_obj = (object)array_change_key_case((array)$fields_obj , CASE_LOWER);                 
                    foreach ($selectfields as $localname=>$externalname) {
                        $result[$localname] = $textlib->convert($fields_obj->{$localname}, $this->config->extencoding, 'utf-8');
                     }
@@ -429,6 +430,7 @@ class auth_plugin_db extends auth_plugin_base {
            print_error('auth_dbcantconnect','auth');
        } else if ( $rs->RecordCount() ) {
            while ($rec = rs_fetch_next_record($rs)) {
+                $rec = (object)array_change_key_case((array)$rec , CASE_LOWER);
                array_push($result, $rec->username);
            }
        }
@@ -88,7 +88,7 @@ class auth_plugin_fc extends auth_plugin_base {

        $userinfo = array();

-        $fpp = new fcFPP($this->config->host, $this->config->port);
+        $fpp = new fcFPP($this->config->host, $this->config->fppport);
        if ($fpp->open()) {
            if ($fpp->login($this->config->userid, $this->config->passwd)) {
                $userinfo['firstname']   = $fpp->getUserInfo($username,"1202");
@@ -121,7 +121,7 @@ class auth_plugin_fc extends auth_plugin_base {

        $fcgroups = array();

-        $fpp = new fcFPP($this->config->host, $this->config->port);
+        $fpp = new fcFPP($this->config->host, $this->config->fppport);
        if ($fpp->open()) {
            if ($fpp->login($this->config->userid, $this->config->passwd)) {
                $fcgroups = $fpp->getGroups($username);
@@ -224,7 +224,7 @@ class auth_plugin_fc extends auth_plugin_base {
        }

        // save settings
-        set_config('host',      $config->user,     'auth/fc');
+        set_config('host',      $config->host,     'auth/fc');
        set_config('fppport',   $config->fppport,  'auth/fc');
        set_config('userid',    $config->userid,   'auth/fc');
        set_config('passwd',    $config->passwd,   'auth/fc');
@@ -50,7 +50,7 @@ class fcFPP
    $conn = fsockopen($host, $port, $errno, $errstr, 5);
    if (!$conn)
    {
-        print_error('auth_fcconnfail','auth', array($errno, $errstr));
+        print_error('auth_fcconnfail','auth', '', array($errno, $errstr));
        return false;
    }

@@ -45,11 +45,36 @@ class auth_plugin_ldap extends auth_plugin_base {
                $this->config->{$key} = $value[$this->config->user_type];
            }
        }
-        //hack prefix to objectclass
-        if (empty($this->config->objectclass)) {        // Can't send empty filter
-            $this->config->objectclass='objectClass=*';
-        } else if (strpos($this->config->objectclass, 'objectClass=') !== 0) {
-            $this->config->objectclass = 'objectClass='.$this->config->objectclass;
+
+        // Hack prefix to objectclass
+        if (empty($this->config->objectclass)) {
+            // Can't send empty filter
+            $this->config->objectclass='(objectClass=*)';
+        } else if (stripos($this->config->objectclass, 'objectClass=') === 0) {
+            // Value is 'objectClass=some-string-here', so just add ()
+            // around the value (filter _must_ have them).
+            $this->config->objectclass = '('.$this->config->objectclass.')';
+        } else if (stripos($this->config->objectclass, '(') !== 0) {
+            // Value is 'some-string-not-starting-with-left-parentheses',
+            // which is assumed to be the objectClass matching value.
+            // So build a valid filter with it.
+            $this->config->objectclass = '(objectClass='.$this->config->objectclass.')';
+        } else {
+            // There is an additional possible value
+            // '(some-string-here)', that can be used to specify any
+            // valid filter string, to select subsets of users based
+            // on any criteria. For example, we could select the users
+            // whose objectClass is 'user' and have the
+            // 'enabledMoodleUser' attribute, with something like:
+            //
+            //   (&(objectClass=user)(enabledMoodleUser=1))
+            //
+            // This is only used in the functions that deal with the
+            // whole potential set of users (currently sync_users()
+            // and get_user_list() only).
+            //
+            // In this particular case we don't need to do anything,
+            // so leave $this->config->objectclass as is.
        }

    }
@@ -97,7 +122,7 @@ class auth_plugin_ldap extends auth_plugin_base {
        }
        else {
            @ldap_close($ldapconnection);
-            print_error('auth_ldap_noconnect','auth',$this->config->host_url);
+            print_error('auth_ldap_noconnect','auth','',$this->config->host_url);
        }
        return false;
    }
@@ -273,7 +298,7 @@ class auth_plugin_ldap extends auth_plugin_base {
                $newuser['userpassword']  = $extpassword;
                break;
            default:
-               print_error('auth_ldap_unsupportedusertype','auth',$this->config->user_type);
+               print_error('auth_ldap_unsupportedusertype','auth','',$this->config->user_type);
        }
        $uadd = ldap_add($ldapconnection, $this->config->user_attribute.'="'.$this->ldap_addslashes($userobject->username).','.$this->config->create_context.'"', $newuser);
        ldap_close($ldapconnection);
@@ -303,7 +328,7 @@ class auth_plugin_ldap extends auth_plugin_base {
        $ldapconnection = $this->ldap_connect();
        $user_dn = $this->ldap_find_userdn($ldapconnection, $extusername);
        $search_attribs = array($this->config->expireattr);
-        $sr = ldap_read($ldapconnection, $user_dn, 'objectclass=*', $search_attribs);
+        $sr = ldap_read($ldapconnection, $user_dn, '(objectClass=*)', $search_attribs);
        if ($sr)  {
            $info = $this->ldap_get_entries($ldapconnection, $sr);
            if (!empty ($info) and !empty($info[0][$this->config->expireattr][0])) {
@@ -400,7 +425,7 @@ class auth_plugin_ldap extends auth_plugin_base {
        //// get user's list from ldap to sql in a scalable fashion
        ////
        // prepare some data we'll need
-        $filter = "(&(".$this->config->user_attribute."=*)(".$this->config->objectclass."))";
+        $filter = '(&('.$this->config->user_attribute.'=*)'.$this->config->objectclass.')';

        $contexts = explode(";",$this->config->contexts);

@@ -431,7 +456,8 @@ class auth_plugin_ldap extends auth_plugin_base {
                do {
                    $value = ldap_get_values_len($ldapconnection, $entry, $this->config->user_attribute);
                    $value = $textlib->convert($value[0], $this->config->ldapencoding, 'utf-8');
-                    array_push($fresult, $value);
+                    // usernames are __always__ lowercase.
+                    array_push($fresult, moodle_strtolower($value));
                    if (count($fresult) >= $bulk_insert_records) {
                        $this->ldap_bulk_insert($fresult, $temptable);
                        $fresult = array();
@@ -645,6 +671,9 @@ class auth_plugin_ldap extends auth_plugin_base {
                $user->confirmed  = 1;
                $user->auth       = 'ldap';
                $user->mnethostid = $CFG->mnet_localhost_id;
+                // get_userinfo_asobj() might have replaced $user->username with the value
+                // from the LDAP server (which can be mixed-case). Make sure it's lowercase
+                $user->username = trim(moodle_strtolower($user->username));
                if (empty($user->lang)) {
                    $user->lang = $CFG->lang;
                }
@@ -694,7 +723,7 @@ class auth_plugin_ldap extends auth_plugin_base {
        $user = get_record('user', 'username', $username, 'mnethostid', $CFG->mnet_localhost_id);
        if (empty($user)) { // trouble
            error_log("Cannot update non-existent user: ".stripslashes($username));
-            print_error('auth_dbusernotexist','auth',$username);
+            print_error('auth_dbusernotexist','auth','',$username);
            die;
        }

@@ -834,6 +863,21 @@ class auth_plugin_ldap extends auth_plugin_base {
            return true; // just change auth and skip update
        }

+        $attrmap = $this->ldap_attributes();
+
+        // Before doing anything else, make sure really need to update anything
+        // in the external LDAP server.
+        $update_external = false;
+        foreach ($attrmap as $key => $ldapkeys) {
+            if (!empty($this->config->{'field_updateremote_'.$key})) {
+                $update_external = true;
+                break;
+            }
+        }
+        if (!$update_external) {
+            return true;
+        }
+
        $textlib = textlib_get_instance();
        $extoldusername = $textlib->convert($olduser->username, 'utf-8', $this->config->ldapencoding);

@@ -841,7 +885,6 @@ class auth_plugin_ldap extends auth_plugin_base {

        $search_attribs = array();

-        $attrmap = $this->ldap_attributes();
        foreach ($attrmap as $key => $values) {
            if (!is_array($values)) {
                $values = array($values);
@@ -862,9 +905,16 @@ class auth_plugin_ldap extends auth_plugin_base {

            $user_entry = $this->ldap_get_entries($ldapconnection, $user_info_result);
            if (empty($user_entry)) {
+                $error = 'ldap: Could not find user while updating externally. '.
+                         'Details follow: search base: \''.$user_dn.'\'; search filter: \''.
+                         $this->config->objectclass.'\'; search attributes: ';
+                foreach ($search_attribs as $attrib) {
+                    $error .= $attrib.' ';
+                }
+                error_log($error);
                return false; // old user not found!
            } else if (count($user_entry) > 1) {
-                trigger_error("ldap: Strange! More than one user record found in ldap. Only using the first one.");
+                error_log('ldap: Strange! More than one user record found in ldap. Only using the first one.');
                return false;
            }
            $user_entry = $user_entry[0];
@@ -890,6 +940,7 @@ class auth_plugin_ldap extends auth_plugin_base {
                    }

                    $nuvalue = $textlib->convert($newuser->$key, 'utf-8', $this->config->ldapencoding);
+                    empty($nuvalue) ? $nuvalue = array() : $nuvalue;
                    $ouvalue = $textlib->convert($olduser->$key, 'utf-8', $this->config->ldapencoding);

                    foreach ($ldapkeys as $ldapkey) {
@@ -1019,7 +1070,7 @@ class auth_plugin_ldap extends auth_plugin_base {
                }
                //Update password expiration time, grace logins count
                $search_attribs = array($this->config->expireattr, 'passwordExpirationInterval','loginGraceLimit' );
-                $sr = ldap_read($ldapconnection, $user_dn, 'objectclass=*', $search_attribs);
+                $sr = ldap_read($ldapconnection, $user_dn, '(objectClass=*)', $search_attribs);
                if ($sr)  {
                    $info=$this->ldap_get_entries($ldapconnection, $sr);
                    $newattrs = array();
@@ -1156,7 +1207,7 @@ class auth_plugin_ldap extends auth_plugin_base {
                            'rfc2307' => 'shadowExpire',
                            'rfc2307bis' => 'shadowExpire',
                            'samba' => '', //No support yet
-                            'ad' => '', //No support yet
+                            'ad' => 'pwdLastSet',
                            'default' => ''
                            );
        return $default;
@@ -1216,7 +1267,8 @@ class auth_plugin_ldap extends auth_plugin_base {
                $sec=substr($time,12,2);
                $result = mktime($hr,$min,$sec,$mo,$dt,$yr);
                break;
-            case 'posix':
+            case 'rfc2307':
+            case 'rfc2307bis':
                $result = $time * DAYSECS; //The shadowExpire contains the number of DAYS between 01/01/1970 and the actual expiration date
                break;
            case 'ad':
@@ -1239,7 +1291,8 @@ class auth_plugin_ldap extends auth_plugin_base {
            case 'edir':
                $result=date('YmdHis', $time).'Z';
                break;
-            case 'posix':
+            case 'rfc2307':
+            case 'rfc2307bis':
                $result = $time ; //Already in correct format
                break;
            default:
@@ -1338,6 +1391,11 @@ class auth_plugin_ldap extends auth_plugin_base {
                ldap_set_option($connresult, LDAP_OPT_PROTOCOL_VERSION, $this->config->version);
            }

+            // Fix MDL-10921
+            if ($this->config->user_type == 'ad') {
+                 ldap_set_option($connresult, LDAP_OPT_REFERRALS, 0);
+            }
+
            if (!empty($binddn)) {
                //bind with search-user
                //$debuginfo .= 'Using bind user'.$binddn.'and password:'.$bindpwd;
@@ -1360,7 +1418,7 @@ class auth_plugin_ldap extends auth_plugin_base {
        }

        //If any of servers are alive we have already returned connection
-        print_error('auth_ldap_noconnect_all','auth',$this->config->user_type);
+        print_error('auth_ldap_noconnect_all','auth', '', $debuginfo);
        return false;
    }

@@ -1451,7 +1509,7 @@ class auth_plugin_ldap extends auth_plugin_base {
        $ldapconnection = $this->ldap_connect();

        if ($filter=="*") {
-           $filter = "(&(".$this->config->user_attribute."=*)(".$this->config->objectclass."))";
+           $filter = '(&('.$this->config->user_attribute.'=*)'.$this->config->objectclass.')';
        }

        $contexts = explode(";",$this->config->contexts);
@@ -1643,7 +1701,7 @@ class auth_plugin_ldap extends auth_plugin_base {
        if (!isset($config->forcechangepassword))
            {$config->forcechangepassword = 0; }
        if (!isset($config->stdchangepassword))
-            {$config->forcechangepassword = 0; }
+            {$config->stdchangepassword = 0; }
        if (!isset($config->passtype))
            {$config->passtype = 'plaintext'; }
        if (!isset($config->changepasswordurl))
@@ -1664,7 +1722,7 @@ class auth_plugin_ldap extends auth_plugin_base {
        set_config('bind_dn', $config->bind_dn, 'auth/ldap');
        set_config('bind_pw', $config->bind_pw, 'auth/ldap');
        set_config('version', $config->version, 'auth/ldap');
-        set_config('objectclass', $config->objectclass, 'auth/ldap');
+        set_config('objectclass', trim($config->objectclass), 'auth/ldap');
        set_config('memberattribute', $config->memberattribute, 'auth/ldap');
        set_config('memberattribute_isdn', $config->memberattribute_isdn, 'auth/ldap');
        set_config('creators', $config->creators, 'auth/ldap');
@@ -1731,7 +1789,7 @@ class auth_plugin_ldap extends auth_plugin_base {

        // If UF_DONT_EXPIRE_PASSWD flag is set in user's
        // userAccountControl attribute, the password doesn't expire.
-        $sr = ldap_read($ldapconn, $user_dn, 'objectclass=*',
+        $sr = ldap_read($ldapconn, $user_dn, '(objectClass=*)',
                        array('userAccountControl'));
        if (!$sr) {
            error_log("ldap: error getting userAccountControl for $user_dn");
@@ -1777,7 +1835,7 @@ class auth_plugin_ldap extends auth_plugin_base {
        // details below).
        // ----------------------------------------------------------------
    
-        $sr = ldap_read($ldapconn, ROOTDSE, 'objectclass=*',
+        $sr = ldap_read($ldapconn, ROOTDSE, '(objectClass=*)',
                        array('defaultNamingContext'));
        if (!$sr) {
            error_log("ldap: error querying rootDSE for Active Directory");
@@ -1787,7 +1845,7 @@ class auth_plugin_ldap extends auth_plugin_base {
        $info = $this->ldap_get_entries($ldapconn, $sr);
        $domaindn = $info[0]['defaultNamingContext'][0];
    
-        $sr = ldap_read ($ldapconn, $domaindn, 'objectclass=*',
+        $sr = ldap_read ($ldapconn, $domaindn, '(objectClass=*)',
                         array('maxPwdAge'));
        $info = $this->ldap_get_entries($ldapconn, $sr);
        $maxpwdage = $info[0]['maxPwdAge'][0];
@@ -1,4 +1,4 @@
-<?php
+<?php // $Id$

 /**
 * @author Martin Dougiamas
@@ -89,7 +89,7 @@ class auth_plugin_mnet extends auth_plugin_base {
        }

        // session okay, try getting the user
-        if (!$user = get_complete_user_data('id', $mnet_session->userid)) {
+        if (!$user = get_record('user', 'id', $mnet_session->userid)) {
            echo mnet_server_fault(3, get_string('authfail_usermismatch', 'mnet'));
            exit;
        }
@@ -115,7 +115,7 @@ class auth_plugin_mnet extends auth_plugin_base {
        $userdata['session.gc_maxlifetime']  = ini_get('session.gc_maxlifetime');
        $userdata['picture']                 = $user->picture;
        if (!empty($user->picture)) {
-            $imagefile = "{$CFG->dataroot}/users/{$user->id}/f1.jpg";
+            $imagefile = make_user_directory($user->id, true) . "/f1.jpg";
            if (file_exists($imagefile)) {
                $userdata['imagehash'] = sha1(file_get_contents($imagefile));
            }
@@ -244,7 +244,7 @@ class auth_plugin_mnet extends auth_plugin_base {
        require_once $CFG->dirroot . '/mnet/xmlrpc/client.php';

        // verify the remote host is configured locally before attempting RPC call
-        if (! $remotehost = get_record('mnet_host', 'wwwroot', $remotewwwroot)) {
+        if (! $remotehost = get_record('mnet_host', 'wwwroot', $remotewwwroot, 'deleted', 0)) {
            error(get_string('notpermittedtoland', 'mnet'));
        }

@@ -285,11 +285,11 @@ class auth_plugin_mnet extends auth_plugin_base {
        $firsttime = false;

        // get the local record for the remote user
-        $localuser = get_record('user', 'username', $remoteuser->username, 'mnethostid', $remotehost->id);
+        $localuser = get_record('user', 'username', addslashes($remoteuser->username), 'mnethostid', $remotehost->id);

        // add the remote user to the database if necessary, and if allowed
        // TODO: refactor into a separate function
-        if (! $localuser->id) {
+        if (empty($localuser) || ! $localuser->id) {
            if (empty($this->config->auto_add_remote_users)) {
                error(get_string('nolocaluser', 'mnet'));
            }
@@ -319,7 +319,7 @@ class auth_plugin_mnet extends auth_plugin_base {

            // TODO: fetch image if it has changed
            if ($key == 'imagehash') {
-                $dirname = "{$CFG->dataroot}/users/{$localuser->id}";
+                $dirname = make_user_directory($localuser->id, true);
                $filename = "$dirname/f1.jpg";

                $localhash = '';
@@ -771,76 +771,76 @@ class auth_plugin_mnet extends auth_plugin_base {
                          join("\n", $mnet_request->error));
                break;
            }
+            $mnethostlogssql = '
+            SELECT
+                mhostlogs.remoteid, mhostlogs.time, mhostlogs.userid, mhostlogs.ip,
+                mhostlogs.course, mhostlogs.module, mhostlogs.cmid, mhostlogs.action,
+                mhostlogs.url, mhostlogs.info, mhostlogs.username, c.fullname as coursename,
+                c.modinfo
+            FROM
+                (
+                    SELECT
+                        l.id as remoteid, l.time, l.userid, l.ip, l.course, l.module, l.cmid,
+                        l.action, l.url, l.info, u.username
+                    FROM
+                        ' . $CFG->prefix . 'user u
+                        INNER JOIN ' . $CFG->prefix . 'log l on l.userid = u.id
+                    WHERE
+                        u.mnethostid = ' . $mnethostid . '
+                        AND l.id > ' . $mnet_request->response['last log id'] . '
+                    ORDER BY remoteid ASC
+                    LIMIT 500
+                ) mhostlogs
+                INNER JOIN ' . $CFG->prefix . 'course c on c.id = mhostlogs.course
+            ORDER by mhostlogs.remoteid ASC';

-            $query = "SELECT
-                          l.id as remoteid,
-                          l.time,
-                          l.userid,
-                          l.ip,
-                          l.course,
-                          l.module,
-                          l.cmid,
-                          l.action,
-                          l.url,
-                          l.info,
-                          c.fullname as coursename,
-                          c.modinfo as modinfo,
-                          u.username
-                      FROM
-                          {$CFG->prefix}user u,
-                          {$CFG->prefix}log l,
-                          {$CFG->prefix}course c
-                      WHERE
-                          l.userid = u.id AND
-                          u.mnethostid = '$mnethostid' AND
-                          l.id > '".$mnet_request->response['last log id']."' AND
-                          c.id = l.course
-                      ORDER BY
-                          remoteid ASC";
+            $mnethostlogs = get_records_sql($mnethostlogssql);

-            $results = get_records_sql($query);
+            if ($mnethostlogs == false) {
+                continue;
+            }

-            if (false == $results) continue;
+            $processedlogs = array();

-            $param = array();
-
-            foreach($results as $result) {
-                if (!empty($result->modinfo) && !empty($result->cmid)) {
-                    $modinfo = unserialize($result->modinfo);
-                    unset($result->modinfo);
+            foreach($mnethostlogs as $hostlog) {
+                // Extract the name of the relevant module instance from the
+                // course modinfo if possible.
+                if (!empty($hostlog->modinfo) && !empty($hostlog->cmid)) {
+                    $modinfo = unserialize($hostlog->modinfo);
+                    unset($hostlog->modinfo);
                    $modulearray = array();
                    foreach($modinfo as $module) {
                        $modulearray[$module->cm] = urldecode($module->name);
                    }
-                    $result->resource_name = $modulearray[$result->cmid];
+                    $hostlog->resource_name = $modulearray[$hostlog->cmid];
                } else {
-                    $result->resource_name = '';
+                    $hostlog->resource_name = '';
                }

-                $param[] = array (
-                                    'remoteid'      => $result->remoteid,
-                                    'time'          => $result->time,
-                                    'userid'        => $result->userid,
-                                    'ip'            => $result->ip,
-                                    'course'        => $result->course,
-                                    'coursename'    => $result->coursename,
-                                    'module'        => $result->module,
-                                    'cmid'          => $result->cmid,
-                                    'action'        => $result->action,
-                                    'url'           => $result->url,
-                                    'info'          => $result->info,
-                                    'resource_name' => $result->resource_name,
-                                    'username'      => $result->username
+                $processedlogs[] = array (
+                                    'remoteid'      => $hostlog->remoteid,
+                                    'time'          => $hostlog->time,
+                                    'userid'        => $hostlog->userid,
+                                    'ip'            => $hostlog->ip,
+                                    'course'        => $hostlog->course,
+                                    'coursename'    => $hostlog->coursename,
+                                    'module'        => $hostlog->module,
+                                    'cmid'          => $hostlog->cmid,
+                                    'action'        => $hostlog->action,
+                                    'url'           => $hostlog->url,
+                                    'info'          => $hostlog->info,
+                                    'resource_name' => $hostlog->resource_name,
+                                    'username'      => $hostlog->username
                                 );
            }

-            unset($result);
+            unset($hostlog);

            $mnet_request = new mnet_xmlrpc_client();
            $mnet_request->set_method('auth/mnet/auth.php/refresh_log');

            // set $token and $useragent parameters
-            $mnet_request->add_param($param);
+            $mnet_request->add_param($processedlogs);

            if ($mnet_request->send($mnet_peer) === true) {
                if ($mnet_request->response['code'] > 0) {
@@ -885,10 +885,12 @@ class auth_plugin_mnet extends auth_plugin_base {

            unset($logEntryObj->username);

+            $logEntryObj = $this->trim_logline($logEntryObj);
            $insertok = insert_record('mnet_log', addslashes_object($logEntryObj), false);

            if ($insertok) {
                $MNET_REMOTE_CLIENT->last_log_id = $logEntryObj->remoteid;
+                $MNET_REMOTE_CLIENT->updateparams->last_log_id = $logEntryObj->remoteid;
            } else {
                $returnString .= 'Record with id '.$logEntryObj->remoteid." failed to insert.\n";
            }
@@ -1262,8 +1264,8 @@ class auth_plugin_mnet extends auth_plugin_base {
        global $CFG;

        if ($user = get_record('user', 'username', addslashes($username), 'mnethostid', $CFG->mnet_localhost_id)) {
-            $filename1 = "{$CFG->dataroot}/users/{$user->id}/f1.jpg";
-            $filename2 = "{$CFG->dataroot}/users/{$user->id}/f2.jpg";
+            $filename1 = make_user_directory($user->id, true) . "/f1.jpg";
+            $filename2 = make_user_directory($user->id, true) . "/f2.jpg";
            $return = array();
            if (file_exists($filename1)) {
                $return['f1'] = base64_encode(file_get_contents($filename1));
@@ -1311,9 +1313,12 @@ class auth_plugin_mnet extends auth_plugin_base {
                svc.apiversion,
                h2s.id as h2s_id
            FROM
+                {$CFG->prefix}mnet_host h,
                {$CFG->prefix}mnet_service svc,
                {$CFG->prefix}mnet_host2service h2s
            WHERE
+                h.deleted = '0' AND
+                h.id = h2s.hostid AND
                h2s.hostid = '$mnethostid' AND
                h2s.serviceid = svc.id AND
                svc.name = '$servicename' AND
@@ -1348,6 +1353,25 @@ class auth_plugin_mnet extends auth_plugin_base {
        }
    }

+    /**
+     * Trims a log line from mnet peer to limit each part to a length which can be stored in our DB
+     *
+     * @param object $logline The log information to be trimmed
+     * @return object The passed logline object trimmed to not exceed storable limits
+     */
+    function trim_logline ($logline) {
+        $limits = array('ip' => 15, 'coursename' => 40, 'module' => 20, 'action' => 40,
+                        'url' => 255);
+        foreach ($limits as $property => $limit) {
+            if (isset($logline->$property)) {
+                $logline->$property = substr($logline->$property, 0, $limit);
+            }
+        }
+
+        return $logline;
+    }
+
+
 }

 ?>
@@ -68,7 +68,7 @@ class auth_plugin_pam extends auth_plugin_base {

        // call_time_pass_reference of errormessage is deprecated - throws warnings in multiauth
        //if (pam_auth($username, $password, &$errormessage)) {
-        if (pam_auth(stripslashes($username), strislashes($password))) {
+        if (pam_auth(stripslashes($username), stripslashes($password))) {
            return true;
        }
        else {
@@ -16,6 +16,8 @@ Changes:
            Added instructions for IIS
 - 11. 2006: User capabilities are now loaded properly as of Moodle 1.7+
 - 03. 2007: Adapted authentication method to Moodle 1.8
+- 10. 2007: Removed the requirement for email address, surname and given name
+            attributes on request of Markus Hagman

 Moodle Configuration with Dual login
 -------------------------------------------------------------------------------
@@ -168,6 +170,39 @@ Example file:
 ?>
 --

+
+How to upgrade your Service Provider to 2.x
+-------------------------------------------------------------------------------
+
+In case your upgrade your Service Provider 1.3.x to 2.x, be aware of the fact 
+that in version 2.0 the default behaviour regarding attribute propagation 
+changed.
+While the Service Provider 1.3.x published the Shibboleth attributes to the
+web server environment as HTTP Request headers, the Service Provider 2.x 
+publishes attributes as environment variables, which increases the security for
+some platforms.
+However, this change has the effect that the attribute names change.
+E.g. while the surname attribute was published as 'HTTP_SHIB_PERSON_SURNAME' 
+with 1.3.x, this attribute will be available in $_SERVER['Shib-Person-surname']
+or depending on your /etc/shibboleth/attribute-map.xml file just as 
+$_SERVER['sn'].
+Because Moodle needs to know what Shibboleth attributes it shall map onto which
+Moodle user profile field, one has to make sure the mapping is updated as well
+after the Service Provider upgrade.
+
+********************************************************************************
+Because you risk locking yourself out of Moodle it is strongly 
+recommended to use the following approach when upgrading the Service Provider:
+1. Enable manual authentication before the upgrade. 
+2. Make sure that you have at least one manual account with administration 
+   privileges working before upgrading your Service Provider to 2.x.
+3. After the SP upgrade, use this account to log into Moodle and adapt the 
+   attribute mapping in 'Site Administration -> Users -> Shibboleth' to reflect 
+   the changed attribute names.
+4. Test the login with a Shibboleth account
+5. If all is working, disable manual authentication again
+********************************************************************************
+
 --------------------------------------------------------------------------------
 In case of problems and questions with Shibboleth authentication, contact
 Lukas Haemmerle <haemmerle@switch.ch> or Markus Hagman <hagman@hytti.uku.fi>
@@ -18,6 +18,7 @@
 * 2006-08-28  File created, code imported from lib.php
 * 2006-10-27  Upstream 1.7 changes merged in, added above credits from lib.php :-)
 * 2007-03-09  Fixed authentication but may need some other changes
+ * 2007-10-03  Removed requirement for email address, surname and given name on request of Markus Hagman
 */

 if (!defined('MOODLE_INTERNAL')) {
@@ -51,7 +52,7 @@ class auth_plugin_shibboleth extends auth_plugin_base {
        
        // If we are in the shibboleth directory then we trust the server var
        if (!empty($_SERVER[$this->config->user_attribute])) {
-            return ($_SERVER[$this->config->user_attribute] == $username);
+            return (strtolower($_SERVER[$this->config->user_attribute]) == strtolower($username));
        } else {
            // If we are not, the user has used the manual login and the login name is
            // unknown, so we return false.
@@ -72,12 +73,7 @@ class auth_plugin_shibboleth extends auth_plugin_base {
        global $CFG;

        // Check whether we have got all the essential attributes
-        if (
-               empty($_SERVER[$this->config->user_attribute])
-            || empty($_SERVER[$this->config->field_map_firstname])
-            || empty($_SERVER[$this->config->field_map_lastname])
-            || empty($_SERVER[$this->config->field_map_email])
-            ) {
+        if ( empty($_SERVER[$this->config->user_attribute]) ) {
            error(get_string( 'shib_not_all_attributes_error', 'auth' , "'".$this->config->user_attribute."' ('".$_SERVER[$this->config->user_attribute]."'), '".$this->config->field_map_firstname."' ('".$_SERVER[$this->config->field_map_firstname]."'), '".$this->config->field_map_lastname."' ('".$_SERVER[$this->config->field_map_lastname]."') and '".$this->config->field_map_email."' ('".$_SERVER[$this->config->field_map_email]."')"));
        }

@@ -87,7 +83,18 @@ class auth_plugin_shibboleth extends auth_plugin_base {
        $search_attribs = array();

        foreach ($attrmap as $key=>$value) {
-            $result[$key] = $this->get_first_string($_SERVER[$value]);
+          // Check if attribute is present  
+	  if (!isset($_SERVER[$value])){
+	   	$result[$key] = '';
+		continue;
+	   }
+
+            // Make usename lowercase
+            if ($key == 'username'){
+                $result[$key] = strtolower($this->get_first_string($_SERVER[$value]));
+            } else {
+                $result[$key] = $this->get_first_string($_SERVER[$value]);
+            }
        }

         // Provide an API to modify the information to fit the Moodle internal
@@ -118,7 +125,7 @@ class auth_plugin_shibboleth extends auth_plugin_base {

        $moodleattributes = array();
        foreach ($fields as $field) {
-            if ($configarray["field_map_$field"]) {
+            if (isset($configarray["field_map_$field"])) {
                $moodleattributes[$field] = $configarray["field_map_$field"];
            }
        }
@@ -26,7 +26,7 @@

 /// If we can find the Shibboleth attribute, save it in session and return to main login page
    if (!empty($_SERVER[$pluginconfig->user_attribute])) {    // Shibboleth auto-login
-        $frm->username = $_SERVER[$pluginconfig->user_attribute];
+        $frm->username = strtolower($_SERVER[$pluginconfig->user_attribute]);
        $frm->password = substr(base64_encode($_SERVER[$pluginconfig->user_attribute]),0,8);
        // The random password consists of the first 8 letters of the base 64 encoded user ID
        // This password is never used unless the user account is converted to manual
@@ -86,7 +86,7 @@

    // If we can find any (user independent) Shibboleth attributes but no user
    // attributes we probably didn't receive any user attributes
-    elseif (!empty($_SERVER['HTTP_SHIB_APPLICATION_ID'])) {
+    elseif (!empty($_SERVER['HTTP_SHIB_APPLICATION_ID'])  || !empty($_SERVER['Shib-Application-ID'])) {
        error(get_string( 'shib_no_attributes_error', 'auth' , '\''.$pluginconfig->user_attribute.'\', \''.$pluginconfig->field_map_firstname.'\', \''.$pluginconfig->field_map_lastname.'\' and \''.$pluginconfig->field_map_email.'\''));
    } else {
         error(get_string( 'shib_not_set_up_error', 'auth'));
@@ -14,13 +14,14 @@
    $cancel = optional_param( 'cancel' );
    $launch = optional_param( 'launch' );

-    require_login();

    if (!empty($id)) {
+        require_login($id);
        if (!has_capability('moodle/site:backup', get_context_instance(CONTEXT_COURSE, $id))) {
            error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
        }
    } else {
+        require_login();
        if (!has_capability('moodle/site:backup', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
            error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
        }
@@ -58,29 +58,56 @@

    }

-
    //Here we check if backup_users = None. Then, we switch off every module
    //user info, user_files, logs and exercises, workshop and messages backups. A Warning is showed to
    //inform the user.
+    // TODO: Move this logic to one function to be shared by any (manual, scheduled) backup
    if ($backupprefs->backup_users == 2) {
-        if ($allmods = get_records("modules") ) {
+        if ($allmods = get_records('modules') ) {
            foreach ($allmods as $mod) {
+            /// Reset global user_info settings to "no" (0)
                $modname = $mod->name;
-                $var = "backup_user_info_".$modname;
+                $var = 'backup_user_info_'.$modname;
                if (isset($backupprefs->$var)) {
                    $backupprefs->$var = 0;
                }
-                $var = "backup_".$modname;
-                if (isset($backupprefs->$var)) {
-                    if ($modname == "exercise" || $modname == "workshop") {
+            /// Reset each instance userinfo settings to "no" (0)
+                if (isset($backupprefs->mods[$modname])) {
+                /// Set the module userinfo to no (0)
+                    $backupprefs->mods[$modname]->userinfo = 0;
+                /// Set the instances to no (o)
+                    foreach ($backupprefs->mods[$modname]->instances as $key => $instance) {
+                        $backupprefs->mods[$modname]->instances[$key]->userinfo = 0;
+                        $var = 'backup_user_info_' . $modname . '_instance_' . $key;
                        $backupprefs->$var = 0;
                    }
                }
+            /// If modules are workshop or exercise, disable their backup completely
+                if ($modname == 'exercise' || $modname == 'workshop') {
+                    $var = 'backup_'.$modname;
+                    if (isset($backupprefs->$var)) {
+                        $backupprefs->$var = 0;
+                    /// Reset each instance backup settings to "no" (0)
+                        if (isset($backupprefs->mods[$modname])) {
+                        /// Set the module backup to no (0)
+                            $backupprefs->mods[$modname]->backup = 0;
+                            $var = 'backup_' . $modname . '_instances';
+                            $backupprefs->$var = 0;
+                        /// Set the instances backup to no (o)
+                            foreach ($backupprefs->mods[$modname]->instances as $key => $instance) {
+                                $backupprefs->mods[$modname]->instances[$key]->backup = 0;
+                                $var = 'backup_' . $modname . '_instance_' . $key;
+                                $backupprefs->$var = 0;
+                            }
+                        }
+                    }
+                }
            }
+        }
        $backupprefs->backup_user_files = 0;
        $backupprefs->backup_logs = 0;
        $backupprefs->backup_messages = 0;
-        }
+
        print_simple_box("<font color=\"red\">".get_string("backupnoneusersinfo")."</font>","center", "70%", '', "20", "noticebox");
        echo "<hr />";
    }
@@ -115,6 +115,8 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
 <form id="form1" method="post" action="backup.php">
 <table cellpadding="5" style="margin-left:auto;margin-right:auto;">
 <?php
+/// Acummulator for hidden options and proper XHTML output
+    $hidden_options = '';
    //Now, check modules and info and show posibilities
    if ($allmods = get_records("modules") ) {
        //Print option to select/deselect everything with 1 click.
@@ -189,8 +191,8 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
        }
        //Line
        echo "<tr><td colspan=\"4\"><hr /></td></tr>\n";
-        
-        if (empty($to)) {
+
+        if (empty($to) && !empty($course->metacourse)) {
            //Now print the Metacourse tr
            echo "<tr>";
            echo "<td align=\"right\" colspan=\"2\"><b>";
@@ -202,7 +204,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
            echo "</td></tr>";
        }
        else {
-            echo '<input type="hidden" name="backup_metacourse" value="0" />';
+            $hidden_options .= '<input type="hidden" name="backup_metacourse" value="0" />';
        }

        if (empty($to)) {
@@ -218,7 +220,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
            echo "</td></tr>";
        }
        else {
-            echo '<input type="hidden" name="backup_users" value="0" />';
+            $hidden_options .= '<input type="hidden" name="backup_users" value="0" />';
        }
        
        if (empty($to)) {
@@ -233,7 +235,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
            echo "</td></tr>";
        }
        else {
-            echo '<input type="hidden" name="backup_logs" value="0" />';
+            $hidden_options .= '<input type="hidden" name="backup_logs" value="0" />';
        }
 
        if (empty($to)) {
@@ -248,7 +250,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
            echo "</td></tr>";
        }
        else {
-            echo '<input type="hidden" name="backup_user_files" value="0" />';
+            $hidden_options .= '<input type="hidden" name="backup_user_files" value="0" />';
        }
        //Now print the Course Files tr
        echo "<tr>";
@@ -272,7 +274,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
            echo "</td></tr>";
        }
        else {
-            echo '<input type="hidden" name="backup_messages" value="0" />';
+            $hidden_options .= '<input type="hidden" name="backup_messages" value="0" />';
        }
    }

@@ -318,6 +320,10 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
    //the temp-directory name and records in backup temp tables
 ?>
 </table>
+<?php
+/// Print captured hidden options, now that we have closed the table
+    echo $hidden_options;
+?>

 <div style="text-align:center;margin-left:auto;margin-right:auto">
 <input type="hidden" name="id"     value="<?php  p($id) ?>" />
@@ -328,4 +334,4 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
 <input type="submit" value="<?php  print_string("continue") ?>" />
 <input type="submit" name="cancel" value="<?php  print_string("cancel") ?>" />
 </div>
-</form>
+</form>
@@ -177,7 +177,7 @@ function schedule_backup_cron() {
        //Reference
        if ($count_error != 0 || $count_unfinished != 0) {
            $message .= "  ".get_string('backupfailed')."\n\n";
-            $dest_url = $CFG->wwwroot.'/backup/log.php';
+            $dest_url = "$CFG->wwwroot/$CFG->admin/report/backups/index.php";
            $message .= "  ".get_string('backuptakealook','',$dest_url)."\n\n";
            //Set message priority
            $admin->priority = 1;
@@ -192,7 +192,7 @@ function schedule_backup_cron() {
        $prefix = $site->shortname.": ";
        if ($count_error != 0 || $count_unfinished != 0) {
            $prefix .= "[".strtoupper(get_string('error'))."] ";
-        } 
+        }
        $subject = $prefix.get_string("scheduledbackupstatus");

        //Send the message
@@ -387,7 +387,7 @@ function schedule_backup_course_configure($course,$starttime = 0) {
                       }
                       //Now stores all the mods preferences into an array into preferences
                       $preferences->mods[$modname]->backup = $$var;
-                       
+
                       //Check include user info
                       $var = "backup_user_info_".$modname;
                       if (!isset($$var)) {
@@ -401,6 +401,7 @@ function schedule_backup_course_configure($course,$starttime = 0) {
                }
            }
        }
+
        // now set instances
        if ($coursemods = get_course_mods($course->id)) {
            foreach ($coursemods as $mod) {
@@ -415,8 +416,15 @@ function schedule_backup_course_configure($course,$starttime = 0) {
                }
            }
        }
+
+        // finally, clean all the $preferences->mods[] not having instances. Nothing to backup about them
+        foreach ($preferences->mods as $modname => $mod) {
+            if (!isset($mod->instances)) {
+                unset($preferences->mods[$modname]);
+            }
+        }
    }
-    
+
    //Convert other parameters
    if ($status) {
        $preferences->backup_metacourse = $backup_config->backup_sche_metacourse;
@@ -429,7 +437,7 @@ function schedule_backup_course_configure($course,$starttime = 0) {
        $preferences->backup_destination = $backup_config->backup_sche_destination;
        $preferences->backup_keep = $backup_config->backup_sche_keep;
    }
-    
+
    //Calculate the backup string
    if ($status) {
        schedule_backup_log($starttime,$course->id,"    calculating backup name");
@@ -474,7 +482,7 @@ function schedule_backup_course_configure($course,$starttime = 0) {
        $keep_name .= moodle_strtolower($backup_shortname)."-";
        //And finally, clean everything
        $keep_name = clean_filename($keep_name);
- 
+
        $preferences->backup_name = $backup_name;
        $preferences->keep_name = $keep_name;
    }
@@ -643,10 +651,10 @@ function schedule_backup_course_execute($preferences,$starttime = 0) {
            schedule_backup_log($starttime,$preferences->backup_course,"      categories & questions");
            $status = backup_question_categories($backup_file,$preferences);
        }
-        
+
        //Print logs if selected
        if ($status) {
-            if ($preferences->backup_logs) {  
+            if ($preferences->backup_logs) {
                schedule_backup_log($starttime,$preferences->backup_course,"      logs");
                $status = backup_log_info($backup_file,$preferences);
            }
@@ -657,7 +665,13 @@ function schedule_backup_course_execute($preferences,$starttime = 0) {
            schedule_backup_log($starttime,$preferences->backup_course,"      scales");
            $status = backup_scales_info($backup_file,$preferences);
        }
- 
+
+        //Print groupings info
+        if ($status) {
+            schedule_backup_log($starttime,$preferences->backup_course,"      groupings");
+            $status = backup_groupings_info($backup_file,$preferences);
+        }
+
        //Print groups info
        if ($status) {
            schedule_backup_log($starttime,$preferences->backup_course,"      groups");
@@ -682,9 +696,9 @@ function schedule_backup_course_execute($preferences,$starttime = 0) {
            $mods_to_backup = false;
            //Check if we have any mod to backup
            foreach ($preferences->mods as $module) {
-                if ($module->backup) { 
+                if ($module->backup) {
                    $mods_to_backup = true;
-                }    
+                }
            }
            //If we have to backup some module
            if ($mods_to_backup) {
@@ -703,7 +717,13 @@ function schedule_backup_course_execute($preferences,$starttime = 0) {
            }
        }

-        //Prints course end 
+        //Backup course format data, if any.
+        if ($status) {
+            schedule_backup_log($starttime,$preferences->backup_course,"      course format data");
+            $status = backup_format_data($backup_file,$preferences);
+        }
+
+        //Prints course end
        if ($status) {
            $status = backup_course_end($backup_file,$preferences);
        }
@@ -713,7 +733,7 @@ function schedule_backup_course_execute($preferences,$starttime = 0) {
            backup_close_xml($backup_file);
        }
    }
-    
+
    //Now, if selected, copy user files
    if ($status) {
        if ($preferences->backup_user_files) {
@@ -2,82 +2,78 @@
    //This file contains all the function needed in the backup utility
    //except the mod-related funtions that are into every backuplib.php inside
    //every mod directory
- 
-    //Calculate the number of users to backup and put their ids in backup_ids
-    //Return an array of info (name,value)
-    function user_check_backup($course,$backup_unique_code,$backup_users,$backup_messages) {
-        //$backup_users=0-->all
-        //              1-->course (needed + enrolled)
-        //              2-->none

-        global $CFG;
-        global $db;
+    /**
+     * This function calculates the users to be added to backup based in the
+     * settings defined at backup. All the resulting user ids are sent to
+     * backup_ids for later usage.
+     * @param int $courseid id of the course to backup
+     * @param int $backup_unique_code unique code of the backup being executed
+     * @param int $backup_unique_code setting specifying what users to export (0=all, 1=needed, 2=none)
+     * @param int $backup_messages flag (true/false) defining if messages must be
+     *                             considered to extract needed users
+     * @return array one array (key, value) sumarizing the result of the function (number of users)
+     */
+    function user_check_backup($courseid,$backup_unique_code,$backup_users,$backup_messages) {

-        $context = get_context_instance(CONTEXT_COURSE, $course);
+        $context = get_context_instance(CONTEXT_COURSE, $courseid);
        $count_users = 0;
+        $backupable_users = array();

-        //If we've selected none, simply return 0
-        if ($backup_users == 0 or $backup_users == 1) {
-        
-            //Calculate needed users (calling every xxxx_get_participants function + scales users)
-            $needed_users = backup_get_needed_users($course, $backup_messages);
+        if ($backup_users == 0) { /// All users
+            $backupable_users = backup_get_all_users();

-            //Calculate enrolled users (students + teachers)
-            $enrolled_users = backup_get_enrolled_users($course);
+        } else if ($backup_users == 1) { /// Needed users

-            //Calculate all users (every record in users table)
-            $all_users = backup_get_all_users();
+        /// Calculate needed users (calling every xxxx_get_participants function + scales users)
+            $needed_users = backup_get_needed_users($courseid, $backup_messages);

-            //Calculate course users (needed + enrolled)
-            //First, needed
-            $course_users = $needed_users;
-        
-            //Now, enrolled
+        /// Calculate enrolled users (having course:view cap)
+            $enrolled_users = backup_get_enrolled_users($courseid);
+
+        /// Calculate backupable users (needed + enrolled)
+        /// First, needed
+            $backupable_users = $needed_users;
+
+        /// Now, enrolled
            if ($enrolled_users) {
                foreach ($enrolled_users as $enrolled_user) {
-                    $course_users[$enrolled_user->id]->id = $enrolled_user->id; 
+                    $backupable_users[$enrolled_user->id]->id = $enrolled_user->id;
                }
            }
-       
-            //Now, depending of parameters, create $backupable_users
-            if ($backup_users == 0) {
-                $backupable_users = $all_users;
-            } else {
-                $backupable_users = $course_users;
-            }
-
-            //If we have backupable users
-            if ($backupable_users) {
-                //Iterate over users putting their roles
-                foreach ($backupable_users as $backupable_user) {
-                    $backupable_user->info = "";
-                                     
-                    //Is needed user (exists in needed_users) 
-                    if (isset($needed_users[$backupable_user->id])) {
-                        $backupable_user->info .= "needed";
-                    } else if (isset($course_users[$backupable_user->id])) {
-                        $backupable_user->info .= "needed"; 
-                    }   // Yu: also needed because they can view course
-                        // might need another variable
-                                        
-                    //Now create the backup_id record
-                    $backupids_rec->backup_code = $backup_unique_code;
-                    $backupids_rec->table_name = "user";
-                    $backupids_rec->old_id = $backupable_user->id;
-                    $backupids_rec->info = $backupable_user->info;
-        
-                    //Insert the record id. backup_users decide it.
-                    //When all users
-                    $status = insert_record('backup_ids', $backupids_rec, false);
-                    $count_users++;
-                }
-                //Do some output     
-                backup_flush(30);
-            }
        }

-        //Prepare Info
-        //Gets the user data
+    /// If we have backupable users
+        if ($backupable_users) {
+        /// Iterate over users putting their roles
+            foreach ($backupable_users as $backupable_user) {
+                $backupable_user->info = "";
+
+            /// Is needed user or enrolled user, mark it as needed
+                if (isset($needed_users[$backupable_user->id]) || isset($enrolled_users[$backupable_user->id])) {
+                    $backupable_user->info .= "needed";
+                }   ///  Yu: also needed because they can view course
+                    /// might need another variable
+
+            /// Now create the backup_id record
+                $backupids_rec->backup_code = $backup_unique_code;
+                $backupids_rec->table_name = "user";
+                $backupids_rec->old_id = $backupable_user->id;
+                $backupids_rec->info = $backupable_user->info;
+
+            /// TODO: Change this call inserting to a standard backup_putid() call
+            /// And read data acordingly with backup_getid() when needed.
+            /// TODO: Also analyse it the "needed" info is really needed for anything. Drop if not.
+            /// Insert the user to the backup_ids table. backup_user_info() will use that info
+                $status = insert_record('backup_ids', $backupids_rec, false);
+                $count_users++;
+            }
+        /// Do some output
+            backup_flush(30);
+        }
+
+      /// Prepare Info
+      /// Gets the user data
        $info[0][0] = get_string("users");
        $info[0][1] = $count_users;

@@ -313,7 +309,7 @@
 
        global $CFG;

-            $status = check_dir_exists($CFG->dataroot."/temp/backup/".$backup_unique_code."/user_files",true);
+        $status = check_dir_exists($CFG->dataroot."/temp/backup/".$backup_unique_code."/user_files",true);

        return $status;
    }
@@ -634,7 +630,6 @@
            fwrite ($bf,full_tag("STUDENTS",3,false,$course->students));
            fwrite ($bf,full_tag("GUEST",3,false,$course->guest));
            fwrite ($bf,full_tag("STARTDATE",3,false,$course->startdate));
-            fwrite ($bf,full_tag("ENROLPERIOD",3,false,$course->enrolperiod));
            fwrite ($bf,full_tag("NUMSECTIONS",3,false,$course->numsections));
            //fwrite ($bf,full_tag("SHOWRECENT",3,false,$course->showrecent));    INFO: This is out in 1.3
            fwrite ($bf,full_tag("MAXBYTES",3,false,$course->maxbytes));
@@ -657,11 +652,18 @@
            } else {
                $status = fwrite ($bf,full_tag("METACOURSE",3,false,$course->metacourse));
            }
+            fwrite ($bf,full_tag("EXPIRENOTIFY",3,false,$course->expirynotify));
+            fwrite ($bf,full_tag("NOTIFYSTUDENTS",3,false,$course->notifystudents));
+            fwrite ($bf,full_tag("EXPIRYTHRESHOLD",3,false,$course->expirythreshold));
+            fwrite ($bf,full_tag("ENROLLABLE",3,false,$course->enrollable));
+            fwrite ($bf,full_tag("ENROLSTARTDATE",3,false,$course->enrolstartdate));
+            fwrite ($bf,full_tag("ENROLENDDATE",3,false,$course->enrolenddate));
+            fwrite ($bf,full_tag("ENROLPERIOD",3,false,$course->enrolperiod));
       
            /// write local course overrides here?
            write_role_overrides_xml($bf, $context, 3);
            /// write role_assign code here
-            write_role_assignments_xml($bf, $context, 3);
+            write_role_assignments_xml($bf, $preferences, $context, 3);
            //Print header end
            fwrite ($bf,end_tag("HEADER",2,true));
        } else { 
@@ -912,7 +914,7 @@
                        $context = get_context_instance(CONTEXT_BLOCK, $instance->id);
                        write_role_overrides_xml($bf, $context, 4);
                        /// write role_assign code here
-                        write_role_assignments_xml($bf, $context, 4);
+                        write_role_assignments_xml($bf, $preferences, $context, 4);
                        //End Block
                        fwrite ($bf,end_tag('BLOCK',3,true));
                    }
@@ -1048,9 +1050,9 @@
               // get all the role_capabilities overrides in this mod
               write_role_overrides_xml($bf, $context, 6);
                /// write role_assign code here
-               write_role_assignments_xml($bf, $context, 6);         
+               write_role_assignments_xml($bf, $preferences, $context, 6);
                /// write role_assign code here
-               
+
               fwrite ($bf,end_tag("MOD",5,true));
           }
           //check for next
@@ -1145,26 +1147,10 @@
                /// write assign/override code for context_userid

                $user->isneeded = strpos($user->info,"needed");
-                //Output every user role (with its associated info) 
-                /*
-                $user->isadmin = strpos($user->info,"admin");
-                $user->iscoursecreator = strpos($user->info,"coursecreator");
-                $user->isteacher = strpos($user->info,"teacher");
-                $user->isstudent = strpos($user->info,"student");
-                
-                
-                if ($user->isadmin!==false or 
-                    $user->iscoursecreator!==false or 
-                    $user->isteacher!==false or 
-                    $user->isstudent!==false or
-                    $user->isneeded!==false) {
-                */
+
                fwrite ($bf,start_tag("ROLES",4,true));
                if ($user->info != "needed" && $user->info!="") {
-                    //Begin ROLES tag
-                    
                    //PRINT ROLE INFO
-                    //Admins
                    $roles = explode(",", $user->info);
                    foreach ($roles as $role) {
                        if ($role!="" && $role!="needed") {
@@ -1172,66 +1158,10 @@
                            //Print Role info
                            fwrite ($bf,full_tag("TYPE",6,false,$role));
                            //Print ROLE end
-                            fwrite ($bf,end_tag("ROLE",5,true)); 
-                        }  
+                            fwrite ($bf,end_tag("ROLE",5,true));
+                        }
                    }
                }
-                    /*
-                    if ($user->isadmin!==false) {
-                        //Print ROLE start
-                        fwrite ($bf,start_tag("ROLE",5,true));
-                        //Print Role info
-                        fwrite ($bf,full_tag("TYPE",6,false,"admin"));
-                        //Print ROLE end
-                        fwrite ($bf,end_tag("ROLE",5,true));
-                    }
-                    //CourseCreator
-                    if ($user->iscoursecreator!==false) {
-                        //Print ROLE start 
-                        fwrite ($bf,start_tag("ROLE",5,true)); 
-                        //Print Role info 
-                        fwrite ($bf,full_tag("TYPE",6,false,"coursecreator"));
-                        //Print ROLE end
-                        fwrite ($bf,end_tag("ROLE",5,true));   
-                    }
-                    //Teacher
-                    if ($user->isteacher!==false) {
-                        //Print ROLE start 
-                        fwrite ($bf,start_tag("ROLE",5,true)); 
-                        //Print Role info 
-                        fwrite ($bf,full_tag("TYPE",6,false,"teacher"));
-                        //Get specific info for teachers
-                        $tea = get_record("user_teachers","userid",$user->old_id,"course",$preferences->backup_course);
-                        fwrite ($bf,full_tag("AUTHORITY",6,false,$tea->authority));
-                        fwrite ($bf,full_tag("TEA_ROLE",6,false,$tea->role));
-                        fwrite ($bf,full_tag("EDITALL",6,false,$tea->editall));
-                        fwrite ($bf,full_tag("TIMESTART",6,false,$tea->timestart));
-                        fwrite ($bf,full_tag("TIMEEND",6,false,$tea->timeend));
-                        fwrite ($bf,full_tag("TIMEMODIFIED",6,false,$tea->timemodified));
-                        fwrite ($bf,full_tag("TIMEACCESS",6,false,$tea->timeaccess));
-                        fwrite ($bf,full_tag("ENROL",6,false,$tea->enrol));
-                        //Print ROLE end
-                        fwrite ($bf,end_tag("ROLE",5,true));   
-                    }
-                    //Student
-                    if ($user->isstudent!==false) {
-                        //Print ROLE start 
-                        fwrite ($bf,start_tag("ROLE",5,true)); 
-                        //Print Role info 
-                        fwrite ($bf,full_tag("TYPE",6,false,"student"));
-                        //Get specific info for students
-                        $stu = get_record("user_students","userid",$user->old_id,"course",$preferences->backup_course);
-                        fwrite ($bf,full_tag("TIMESTART",6,false,$stu->timestart));
-                        fwrite ($bf,full_tag("TIMEEND",6,false,$stu->timeend));
-                        fwrite ($bf,full_tag("TIME",6,false,$stu->time));
-                        fwrite ($bf,full_tag("TIMEACCESS",6,false,$stu->timeaccess));
-                        fwrite ($bf,full_tag("ENROL",6,false,$stu->enrol));
-                        //Print ROLE end
-                        fwrite ($bf,end_tag("ROLE",5,true));   
-                    }*/
-                    
-                    
-                    
                    //Needed
                if ($user->isneeded!==false) {
                    //Print ROLE start
@@ -1264,7 +1194,7 @@
                    
                write_role_overrides_xml($bf, $context, 4);
                /// write role_assign code here
-                write_role_assignments_xml($bf, $context, 4);
+                write_role_assignments_xml($bf, $preferences, $context, 4);
              //End User tag
                fwrite ($bf,end_tag("USER",3,true));
                //Do some output
@@ -1692,9 +1622,15 @@
        
        $status = true;

-        //Get groups_members
-        $groups_members = groups_get_member_records($groupid);
-        
+        //Get groups_members that are being included in backup
+        $groups_members = get_records_sql("SELECT gm.*
+                                           FROM {$CFG->prefix}groups_members gm,
+                                                {$CFG->prefix}backup_ids bi
+                                           WHERE gm.groupid = $groupid
+                                             AND bi.backup_code = $preferences->backup_unique_code
+                                             AND bi.table_name = 'user'
+                                             AND bi.old_id = gm.userid");
+
        //Pring groups_members header
        if ($groups_members) {
            //Pring groups_members header
@@ -1843,6 +1779,16 @@

        global $CFG,$preferences;

+    /// MDL-14072: Prevent NULLs, empties and numbers to be processed by the
+    /// heavy interlinking. Just a few cpu cycles saved.
+        if ($content === NULL) {
+            return NULL;
+        } else if ($content === '') {
+            return '';
+        } else if (is_numeric($content)) {
+            return $content;
+        }
+
        //Use one static variable to cache all the require_once calls that,
        //under PHP5 seems to increase load too much, and we are requiring
        //them here thousands of times (one per content). MDL-8700. 
@@ -1905,26 +1851,29 @@
        //in temp/backup/$backup_code  dir
        $status = check_and_create_user_files_dir($preferences->backup_unique_code);
 
-        //Now iterate over directories under "users" to check if that user must be 
-        //copied to backup
+        //Now iterate over directories under "user" to check if that user must be copied to backup
+
+        // Method to get a list of userid=>array(basedir => $basedir, userfolder => $userfolder) 
+        $userlist = get_user_directories();
        
-        $rootdir = $CFG->dataroot."/users";
-        //Check if directory exists
-        if (is_dir($rootdir)) {
-            $list = list_directories ($rootdir);
-            if ($list) {
-                //Iterate
-                foreach ($list as $dir) {
-                    //Look for dir like username in backup_ids
-                    $data = get_record ("backup_ids","backup_code",$preferences->backup_unique_code,
-                                                     "table_name","user", 
-                                                     "old_id",$dir);
-                    //If exists, copy it
-                    if ($data) {
-                        $status = backup_copy_file($rootdir."/".$dir,
-                                       $CFG->dataroot."/temp/backup/".$preferences->backup_unique_code."/user_files/".$dir);
-                    }
+        foreach ($userlist as $userid => $userinfo) {
+            //Look for dir like username in backup_ids
+            $data = count_records("backup_ids","backup_code",$preferences->backup_unique_code, "table_name","user", "old_id",$userid);
+            
+            //If exists, copy it
+            if ($data) {
+                $parts = explode('/', $userinfo['userfolder']);
+                $status = true;
+
+                if (is_array($parts)) {
+                    $group = $parts[0];
+                    $userid = $parts[1];
+
+                    // Create group dir first
+                    $status = check_dir_exists("$CFG->dataroot/temp/backup/$preferences->backup_unique_code/user_files/". $group, true);
                }
+                $status = $status && backup_copy_file($userinfo['basedir'] . '/' . $userinfo['userfolder'], 
+                    "$CFG->dataroot/temp/backup/$preferences->backup_unique_code/user_files/{$userinfo['userfolder']}");
            }
        }

@@ -2294,40 +2243,43 @@
        }
        fwrite ($bf, end_tag("ROLES_OVERRIDES", $startlevel, true));
    }
-    
+
    /* function to print xml for assignment */
-    function write_role_assignments_xml($bf, $context, $startlevel) {
+    function write_role_assignments_xml($bf, $preferences, $context, $startlevel) {
     /// write role_assign code here
        fwrite ($bf, start_tag("ROLES_ASSIGNMENTS", $startlevel, true));
-        
+
        if ($roles = get_roles_with_assignment_on_context($context)) {
-            foreach ($roles as $role) {          
+            foreach ($roles as $role) {
                fwrite ($bf, start_tag("ROLE", $startlevel+1, true));
                fwrite ($bf, full_tag("ID", $startlevel+2, false, $role->id));
                fwrite ($bf, full_tag("NAME", $startlevel+2, false, $role->name));
-                fwrite ($bf, full_tag("SHORTNAME", $startlevel+2, false, $role->shortname)); 
+                fwrite ($bf, full_tag("SHORTNAME", $startlevel+2, false, $role->shortname));
                fwrite ($bf, start_tag("ASSIGNMENTS", $startlevel+2, true));
                if ($assignments = get_users_from_role_on_context($role, $context)) {
                    foreach ($assignments as $assignment) {
-                        fwrite ($bf, start_tag("ASSIGNMENT", $startlevel+3, true));
-                        fwrite ($bf, full_tag("USERID", $startlevel+4, false, $assignment->userid));
-                        fwrite ($bf, full_tag("HIDDEN", $startlevel+4, false, $assignment->hidden));
-                        fwrite ($bf, full_tag("TIMESTART", $startlevel+4, false, $assignment->timestart));
-                        fwrite ($bf, full_tag("TIMEEND", $startlevel+4, false, $assignment->timeend));
-                        fwrite ($bf, full_tag("TIMEMODIFIED", $startlevel+4, false, $assignment->timemodified));
-                        if (!isset($assignment->modifierid)) {
-                            $assignment->modifierid = 0;  
+                    /// Role assignments are only sent to backup if the user is one target user
+                        if (backup_getid($preferences->backup_unique_code, 'user', $assignment->userid)) {
+                            fwrite ($bf, start_tag("ASSIGNMENT", $startlevel+3, true));
+                            fwrite ($bf, full_tag("USERID", $startlevel+4, false, $assignment->userid));
+                            fwrite ($bf, full_tag("HIDDEN", $startlevel+4, false, $assignment->hidden));
+                            fwrite ($bf, full_tag("TIMESTART", $startlevel+4, false, $assignment->timestart));
+                            fwrite ($bf, full_tag("TIMEEND", $startlevel+4, false, $assignment->timeend));
+                            fwrite ($bf, full_tag("TIMEMODIFIED", $startlevel+4, false, $assignment->timemodified));
+                            if (!isset($assignment->modifierid)) {
+                                $assignment->modifierid = 0;
+                            }
+                            fwrite ($bf, full_tag("MODIFIERID", $startlevel+4, false, $assignment->modifierid));
+                            fwrite ($bf, full_tag("ENROL", $startlevel+4, false, $assignment->enrol));
+                            fwrite ($bf, full_tag("SORTORDER", $startlevel+4, false, $assignment->sortorder));
+                            fwrite ($bf, end_tag("ASSIGNMENT", $startlevel+3, true));
                        }
-                        fwrite ($bf, full_tag("MODIFIERID", $startlevel+4, false, $assignment->modifierid));
-                        fwrite ($bf, full_tag("ENROL", $startlevel+4, false, $assignment->enrol));
-                        fwrite ($bf, full_tag("SORTORDER", $startlevel+4, false, $assignment->sortorder));
-                        fwrite ($bf, end_tag("ASSIGNMENT", $startlevel+3, true));     
-                    }     
+                    }
                }
                fwrite ($bf, end_tag("ASSIGNMENTS", $startlevel+2, true));
-                fwrite ($bf, end_tag("ROLE", $startlevel+1, true));   
-            }  
-        }   
-        fwrite ($bf, end_tag("ROLES_ASSIGNMENTS", $startlevel, true));     
+                fwrite ($bf, end_tag("ROLE", $startlevel+1, true));
+            }
+        }
+        fwrite ($bf, end_tag("ROLES_ASSIGNMENTS", $startlevel, true));
    }
 ?>
@@ -9,7 +9,7 @@ require_once($CFG->dirroot.'/backup/bb/xsl_emulate_xslt.inc');
  
 function get_subdirs($directory){
    $opendirectory = opendir( $directory );
-    while($filename = readdir($opendirectory)) {
+    while(false !== ($filename = readdir($opendirectory))) {
        if (is_dir($directory.$filename) and $filename != ".." and $filename != "."){
            $subdirs[] = $filename;
        }
@@ -119,7 +119,7 @@
        }

        // Loop through all directory entries, and construct two temporary arrays containing files and sub directories
-        while($entry = readdir($handle)) {
+        while(false !== ($entry = readdir($handle))) {
            if (is_dir($dir. $slash .$entry) && $entry != ".." && $entry != "." && $entry != $excludeddir) {
                $dir_subdirs[] = $dir. $slash .$entry;
            }
@@ -143,7 +143,7 @@
                return false;
            }
            else {
-                if (rmdir($dir_subdirs[$i]) == FALSE) {
+                if (remove_dir($dir_subdirs[$i]) == FALSE) {
                return false;
                }
            }
@@ -196,7 +196,7 @@
        $results = null;
  
        $dir = opendir($rootdir);
-        while ($file=readdir($dir)) {
+        while (false !== ($file=readdir($dir))) {
            if ($file=="." || $file=="..") {
                continue;
            }
@@ -215,7 +215,7 @@
        $results = "";
 
        $dir = opendir($rootdir);
-        while ($file=readdir($dir)) {
+        while (false !== ($file=readdir($dir))) {
            if ($file=="." || $file=="..") {
                continue;
            }
@@ -299,10 +299,10 @@
        if (!is_dir($to_file)) {
            //echo "<br />Creating ".$to_file;                                //Debug
            umask(0000);
-            $status = mkdir($to_file,$CFG->directorypermissions);
+            $status = mkdir($to_file,$CFG->directorypermissions); 
        }
        $dir = opendir($from_file);
-        while ($file=readdir($dir)) {
+        while (false !== ($file=readdir($dir))) {
            if ($file=="." || $file=="..") {
                continue;
            }
@@ -1,142 +1,13 @@
 <?php  // $Id$
-       // backup.php - allows admin to edit all configuration variables for scheduled backups
+       // log.php - old scheduled backups report. Now redirecting
+       // to the new admin one

    require_once("../config.php");
-    require_once("../backup/lib.php");
-
-    $courseid = optional_param('courseid',0,PARAM_INT);

    require_login();

    require_capability('moodle/site:backup', get_context_instance(CONTEXT_SYSTEM, SITEID));

-    if (!$site = get_site()) {
-        error("Site isn't defined!");
-    }
-
-    //Get needed strings
-    $backuploglaststatus = get_string("backuploglaststatus");
-    $backuplogdetailed = get_string("backuplogdetailed");
-    $stradmin = get_string("administration");
-    $strconfiguration = get_string("configuration");
-    $strbackup = get_string("backup");
-    $strbackupdetails = get_string("backupdetails");
-    $strlogs = get_string("logs");
-    $strftimedatetime = get_string("strftimerecent");
-    $strftimetime = get_string("strftimetime").":%S";
-    $strerror = get_string("error");
-    $strok = get_string("ok");
-    $strunfinished = get_string("unfinished");
-    $strskipped = get_string("skipped");
-    $strcourse = get_string("course");
-    $strtimetaken = get_string("timetaken","quiz");
-    $strstatus = get_string("status");
-    $strnext = get_string("next");
-
-    //Decide when to show last execution logs or detailed logs
-    //Lastlog view
-    if (!$courseid) {
-        print_header("$site->shortname: $strconfiguration: $strbackup", $site->fullname,
-                      "<a href=\"../$CFG->admin/index.php\">$stradmin</a> -> ".
-                      "<a href=\"../$CFG->admin/configure.php\">$strconfiguration</a> -> ".
-                      "<a href=\"../$CFG->admin/backup.php?sesskey=$USER->sesskey\">$strbackup</a> -> ".
-                      $strlogs);
-
-        print_heading($backuploglaststatus);
-        print_simple_box_start('center');
-        //Now, get every record from backup_courses
-        $courses = get_records("backup_courses");
-
-        if (!$courses) {
-            notify("No logs found!");
-        } else {
-            echo "<table border=\"0\" align=\"center\" cellpadding=\"3\" cellspacing=\"3\">";
-            //Print table header
-            echo "<tr>";
-            echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"3\">$strcourse</font></td>";
-            echo "<td nowrap=\"nowrap\" align=\"center\" colspan=\"3\"><font size=\"3\">$strtimetaken</font></td>";
-            echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"3\">$strstatus</font></td>";
-            echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"3\">$strnext</font></td></tr>";
-            foreach ($courses as $course) {
-                //Get the course shortname
-                $coursename = get_field ("course","fullname","id",$course->courseid);
-                if ($coursename) {
-                    echo "<tr>";
-                    echo "<td nowrap=\"nowrap\"><font size=\"2\"><a href=\"log.php?courseid=$course->courseid\">".$coursename."</a></font></td>";
-                    echo "<td nowrap=\"nowrap\"><font size=\"2\">".userdate($course->laststarttime,$strftimedatetime)."</font></td>";
-                    echo "<td nowrap=\"nowrap\"><font size=\"2\"> - </font></td>";
-                    echo "<td nowrap=\"nowrap\"><font size=\"2\">".userdate($course->lastendtime,$strftimedatetime)."</font></td>";
-                    if ($course->laststatus == 1) {
-                        echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"2\" color=\"green\">".$strok."</font></td>";
-                    } else if ($course->laststatus == 2) {
-                        echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"2\" color=\"red\">".$strunfinished."</font></td>";
-                    } else if ($course->laststatus == 3) {
-                        echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"2\" color=\"green\">".$strskipped."</font></td>";
-                    } else {
-                        echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"2\" color=\"red\">".$strerror."</font></td>";
-                    }
-                    echo "<td nowrap=\"nowrap\"><font size=\"2\">".userdate($course->nextstarttime,$strftimedatetime)."</font></td>";
-                    echo "</tr>";
-                }
-            }
-            echo "</table>";
-        }
-        print_simple_box_end();
-    //Detailed View !!
-    } else {
-        print_header("$site->shortname: $strconfiguration: $strbackup", $site->fullname,
-                      "<a href=\"../$CFG->admin/index.php\">$stradmin</a> -> ".
-                      "<a href=\"../$CFG->admin/configure.php\">$strconfiguration</a> -> ".
-                      "<a href=\"../$CFG->admin/backup.php?sesskey=$USER->sesskey\">$strbackup</a> -> ".
-                      "<a href=\"log.php\">$strlogs</a> -> ".
-                      $strbackupdetails);
-
-        print_heading($backuplogdetailed);
-
-        $coursename = get_field("course","fullname","id","$courseid");
-        print_heading("$strcourse: $coursename");
-
-        print_simple_box_start('center');
-        
-        //First, me get all the distinct backups for that course in backup_log
-        $executions = get_records_sql("SELECT DISTINCT laststarttime,laststarttime
-                                       FROM {$CFG->prefix}backup_log
-                                       WHERE courseid = '$courseid'
-                                       ORDER BY laststarttime DESC");
-
-        //Iterate over backup executions
-        if (!$executions) {
-            notify("No logs found!");
-        } else {
-            echo "<table border=\"0\" align=\"center\" cellpadding=\"3\" cellspacing=\"3\">";
-            foreach($executions as $execution) {
-                echo "<tr>";
-                echo "<td nowrap=\"nowrap\" align=\"center\" colspan=\"3\">";
-                print_simple_box("<center>".userdate($execution->laststarttime)."</center>", "center");
-                echo "</td>";
-                echo "</tr>";
-                $logs = get_records_sql("SELECT * 
-                                         FROM {$CFG->prefix}backup_log
-                                         WHERE courseid = '$courseid'  AND
-                                               laststarttime = '$execution->laststarttime'
-                                         ORDER BY id");
-                if ($logs) {
-                    foreach ($logs as $log) {
-                        echo "<tr>";
-                        echo "<td nowrap=\"nowrap\"><font size=\"2\">".userdate($log->time,$strftimetime)."</font></td>";
-                        $log->info = str_replace("- ERROR!!","- <font color=\"red\">ERROR!!</font>",$log->info);
-                        $log->info = str_replace("- OK","- <font color=\"green\">OK</font>",$log->info);
-                        echo "<td nowrap=\"nowrap\"><font size=\"2\">".str_replace("  ","&nbsp;&nbsp;&nbsp;&nbsp;",$log->info)."</font></td>";
-                        echo "</tr>";
-                    }
-                }
-            }
-            echo "</table>";
-        }
-        print_simple_box_end();
-    }
-
-
-    print_footer();
+    redirect("$CFG->wwwroot/$CFG->admin/report/backups/index.php", '', 'admin', 1);

 ?>
@@ -50,11 +50,13 @@
    }

    if (!empty($id)) {
+        require_login($id);
        if (!has_capability('moodle/site:restore', get_context_instance(CONTEXT_COURSE, $id))) {
            if (empty($to)) {
                error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
            } else {
-                if (!has_capability('moodle/site:restore', get_context_instance(CONTEXT_COURSE, $to))) {
+                if (!has_capability('moodle/site:restore', get_context_instance(CONTEXT_COURSE, $to))
+                    && !has_capability('moodle/site:import',  get_context_instance(CONTEXT_COURSE, $to))) {
                    error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
                }
            }
@@ -104,7 +106,7 @@
        print_header("$site->shortname: $strcourserestore", $site->fullname,
                     "<a href=\"$CFG->wwwroot/$CFG->admin/index.php\">$stradministration</a> -> $strcourserestore");
        print_heading(get_string("restorecancelled"));
-        print_continue("$CFG->wwwroot/$CFG->admin/index.php");
+        print_continue("$CFG->wwwroot/course/view.php?id=".$id);
        print_footer();
        exit;
    }
@@ -18,13 +18,21 @@

    if ($form1 = data_submitted()) {
        $currentcourseshortname = $course_header->course_shortname; //"store_ShortName";
-        $course_header->course_shortname =  $form1->shortname;  //"update_ShortName";    
-        $course_header->course_fullname =   $form1->fullname;   //"update_FullName";  
-        $form1->startdate = make_timestamp($form1->startyear, $form1->startmonth, $form1->startday);          
-        $currentcoursestartdate = $course_header->course_startdate;
-        $coursestartdatedateoffset = $form1->startdate - $currentcoursestartdate;
-        $restore->course_startdateoffset = $coursestartdatedateoffset; //change to restore
-    } 
+        $course_header->course_shortname =  stripslashes_safe($form1->shortname);  //"update_ShortName";    
+        $course_header->course_fullname =   stripslashes_safe($form1->fullname);   //"update_FullName";  
+    /// Roll dates only if the backup course has a start date
+    /// (some formats like main page, social..., haven't it and rolling dates
+    /// from 0 produces crazy dates. MDL-10125 and we have passed some custom startyear/month/day. MDL-12922
+        if ($course_header->course_startdate && !empty($form1->startyear)) {
+            $form1->startdate = make_timestamp($form1->startyear, $form1->startmonth, $form1->startday);
+            $currentcoursestartdate = $course_header->course_startdate;
+            $coursestartdatedateoffset = $form1->startdate - $currentcoursestartdate;
+            $restore->course_startdateoffset = $coursestartdatedateoffset; //change to restore
+        } else { // don't roll if the course hasn't start date
+            $coursestartdatedateoffset = 0;
+            $restore->course_startdateoffset = 0;
+        }
+    }

    ///Enforce SESSION->course_header rewrite (PHP 4.x needed because assigns are by value) MDL-8298
    $SESSION->course_header = $course_header;
@@ -153,6 +161,13 @@
            $restore->course_id=$course_id;
        }
    } 
+    
+    // pass in the course category param
+    $cat_id = optional_param('restore_restorecatto', 0, PARAM_INT);
+    if ($cat_id) {
+        $restore->restore_restorecatto = $cat_id;
+    }
+    
    //We have the object with data, put it in the session
    $SESSION->restore = $restore;

@@ -189,7 +204,7 @@
    //    2-New course: Create the restore object and launch the execute.

    //If the user is a teacher and not a creator
-    if (!has_capability('moodle/course:create', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+    if (!user_can_create_courses()) {
        $restore->course_id = $id;
        if ($restore->restoreto == 0) {
            $restore->deleting = true;
@@ -199,7 +214,8 @@
    }

    //If the user is a creator (or admin)
-    if (has_capability('moodle/course:create', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+    //if (has_capability('moodle/course:create', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+    if (user_can_create_courses()) {    
        //Set restore->deleting as needed
        if ($restore->restoreto == 0) {
            $restore->deleting = true;
@@ -209,7 +225,8 @@
    }

    //Now, select the course if needed
-    if (($restore->restoreto == 0 or $restore->restoreto == 1) and ($restore->course_id == 0) and has_capability('moodle/course:create', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+    //if (($restore->restoreto == 0 or $restore->restoreto == 1) and ($restore->course_id == 0) and get_capability_courses('moodle/site:restore')) {
+    if (($restore->restoreto == 0 or $restore->restoreto == 1) and ($restore->course_id == 0)) {
        if ($courses = get_courses("all","c.fullname","c.id,c.fullname,c.shortname,c.visible")) {
            print_heading(get_string("choosecourse"));
            print_simple_box_start("center");
@@ -222,7 +239,7 @@
                } else {
                    $optdimmed = '';
                }
-                echo "<a $optdimmed href=\"restore.php?course_id=$course->id&launch=check&id=$id&file=$file\">".format_string($course->fullname).' ('.format_string($course->shortname).')</a><br />'."\n";
+                echo "<a $optdimmed href=\"restore.php?course_id=$course->id&amp;launch=check&amp;id=$id&amp;file=$file\">".format_string($course->fullname).' ('.format_string($course->shortname).')</a><br />'."\n";
            }
            print_simple_box_end();
        } else {
@@ -232,7 +249,7 @@
    //Checks everything and execute restore
    } else if ((($restore->restoreto == 0 or $restore->restoreto == 1) and ($restore->course_id != 0)) or ($restore->restoreto == 2)) {
        //Final access control check
-        if ($restore->course_id == 0 and !has_capability('moodle/course:create', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+        if ($restore->course_id == 0 and !user_can_create_courses()) {
            error("You need to be a creator or admin to restore into new course!");
        } else if ($restore->course_id != 0 and !has_capability('moodle/site:backup', get_context_instance(CONTEXT_COURSE, $restore->course_id))) {
            error("You need to be an edit teacher or admin to restore into selected course!");
@@ -26,7 +26,8 @@
            if (empty($to)) {
                error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
            } else {
-                if (!has_capability('moodle/site:restore', get_context_instance(CONTEXT_COURSE, $to))) {
+                if (!has_capability('moodle/site:restore', get_context_instance(CONTEXT_COURSE, $to)) 
+                    && !has_capability('moodle/site:import',  get_context_instance(CONTEXT_COURSE, $to))) {
                    error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
                }
            }
@@ -92,14 +92,17 @@
        }

    if (!isset($restore_restoreto)) {
-        if (!has_capability('moodle/site:restore', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+        if (!user_can_create_courses()) {
            $restore_restoreto = 1;
-        }
-        if (has_capability('moodle/site:restore', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+        } else {
            $restore_restoreto = 2;
        }
    }

+    if (!isset($course_header->category->id)) {
+        $course_header->category->id = 0;
+    }
+
    if(!isset($form1->startdate)) {
        $form1->startdate = $course_header->course_startdate; //$course_header->course_startdate;    
    }
@@ -171,40 +174,91 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
    echo get_string("restoreto").":</b>";
    echo "</td><td colspan=\"3\">";
    
-    if (has_capability('moodle/course:create', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+    // permission should have been checked already
+    
+    /**
+     * if user has manageactivities in any course, we show 
+     *      existingcoursedeleting 
+     *      existingcourseadding
+     * else we show
+     *      currentcoursedeleting
+     *      currentcourse
+     * if user has course:create in any category, we show
+     *      newcourse
+     */
+    
+    $mycourses = get_capability_courses('moodle/site:restore');
+    // if the user can manage 2 or more courses,
+    // or if the only course the user can manage is not the current course
+    // we show options for existing courses
+    if (count($mycourses) > 1 || !in_array($id, $mycourses)) {
+        // if user can manage more than 1 course, or if user can restore to a single different course
        $restore_restoreto_options[0] = get_string("existingcoursedeleting");
        $restore_restoreto_options[1] = get_string("existingcourseadding");
-        $restore_restoreto_options[2] = get_string("newcourse"); 
-    } else { // fix for MDL-7773
+    // else if the user can write to current course
+    } else if (has_capability('moodle/site:restore', get_context_instance(CONTEXT_COURSE, $id))){
        $restore_restoreto_options[0] = get_string("currentcoursedeleting");
-        $restore_restoreto_options[1] = get_string("currentcourseadding");
+        $restore_restoreto_options[1] = get_string("currentcourseadding");   
+    }
+    
+    // if user can create any course at all, give the option
+    if (user_can_create_courses()) {
+        $restore_restoreto_options[2] = get_string("newcourse"); 
    }
   
    choose_from_menu($restore_restoreto_options, "restore_restoreto", $restore_restoreto, "");
    echo "</td></tr>";
-    if (iscreator()) {  //display these fields conditionally
+    if (user_can_create_courses()) {  //display these fields conditionally
+        
+        // find the list of cates user can edit
+        echo "<tr valign=\"top\" >";
+        echo "<td align=\"right\">";
+        print_string('category');
+        echo " :</td>";
+        echo "<td>";
+        choose_from_menu(get_creatable_categories(), "restore_restorecatto", $course_header->category->id, "");        
+        echo "</td>";
+        echo "</tr>";
+        
        echo "<tr valign=\"top\" >";
        echo "<td align=\"right\">";
        print_string("shortname");
        echo " :</td>";
-        echo "<td><input type=\"text\" name=\"shortname\" maxlength=\"15\"  size=\"10\" value=\"$form1->shortname\" alt=\"".get_string("shortname")."\"  />" ;
+        echo "<td><input type=\"text\" name=\"shortname\" maxlength=\"15\"  size=\"10\" value=\"".s($form1->shortname)."\" alt=\"".get_string("shortname")."\"  />" ;
        helpbutton("courseshortname", get_string("shortname")) ;
-        if (isset($err["shortname"])) formerr($err["shortname"]); 
+        if (isset($err["shortname"])) formerr($err["shortname"]);
+        echo "</td>";
+        echo "</tr>";
        echo "<tr valign=\"top\" >";
        echo "<td align=\"right\">";
        print_string("fullname");
        echo " :</td>";
-        echo "<td><input type=\"text\" name=\"fullname\" maxlength=\"254\" size=\"50\" value=\"$form1->fullname\" alt=\" ".get_string("fullname")."\"  />" ;
+        echo "<td><input type=\"text\" name=\"fullname\" maxlength=\"254\" size=\"50\" value=\"".s($form1->fullname)."\" alt=\" ".get_string("fullname")."\"  />" ;
        helpbutton("coursefullname", get_string("fullname")) ;
        if (isset($err["fullname"])) formerr($err["fullname"]); 
        echo"</td></tr>";
        echo "<tr valign=\"top\"> ";
        echo "<td align=\"right\"> ";
-        print_string("startdate"); 
-        echo ":</td><td>"; 
-        print_date_selector("startday", "startmonth", "startyear", $form1->startdate);
+        print_string("startdate");
+        echo ":</td><td>";
+    /// Show the roll dates option only if the backup course has a start date
+    /// (some formats like main page, social..., haven't it and rolling dates
+    /// from 0 produces crazy dates. MDL-10125
+        if ($form1->startdate) {
+            print_date_selector("startday", "startmonth", "startyear", $form1->startdate);
+        } else {
+            print_string('notavailable');
+            echo '<input type="hidden" name="startyear" value="0" />';
+            echo '<input type="hidden" name="startmonth" value="0" />';
+            echo '<input type="hidden" name="startday" value="0" />';
+        }
        helpbutton("coursestartdate", get_string("startdate"));
        echo "</td></tr>";
+    } else {
+    /// If user cannot create course, prevent any change in startyear/month/day (so restore wont calculate any roll. MDL-12922
+        echo '<input type="hidden" name="startyear" value="0" />';
+        echo '<input type="hidden" name="startmonth" value="0" />';
+        echo '<input type="hidden" name="startday" value="0" />';
    }
    //Line
    echo "<tr><td colspan=\"4\"><hr /></td></tr>";
@@ -231,6 +285,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
        echo "</tr>";
        echo "<tr><td colspan=\"4\"><hr /></td></tr>";
        $currentrow = 0;
+        $nonrestmod = '';
        foreach ($allmods as $mod) {
            $modname = $mod->name;
            $modrestore = $modname."_restore_mods";
@@ -429,6 +484,7 @@ $info = restore_read_xml_info($xml_file);
 // fix for MDL-9068, front page course is just a normal course
 $siterolesarray = get_assignable_roles (get_context_instance(CONTEXT_COURSE, $course->id), "shortname");
 $siterolesnamearray = get_assignable_roles (get_context_instance(CONTEXT_COURSE, $course->id), "name");
+$allroles = get_records('role');

 echo ('<table width="100%" class="restore-form-instances">');
 echo ('<tr><td align="right" style="width:50%"><b>'.get_string('sourcerole').'</b></td><td align="left" style="width:50%"><b>'.get_string('targetrole').'</b></td></tr>');
@@ -483,21 +539,34 @@ if ($info->backup_moodle_version < 2006092801) {
        }

        foreach ($roles->roles as $roleid=>$role) {
+         
+            $mappableroles = $siteroleschoicearray;
+         
            echo ('<tr><td align="right">');
            echo $role->name." (".($role->shortname).")";
            echo ('</td><td align="left">');
-    
-            // see if any short name match
-            $matchrole = 0;
-            foreach ($siterolesarray as $siteroleid=>$siteroleshortname) {
-                if ($siteroleshortname == $role->shortname) {
-                    $matchrole = $siteroleid;
-                    break;  
-                }  
+
+            /// first, we see if any exact role definition is found
+            /// if found, that is the only option of restoring to
+            
+            if ($samerole = restore_samerole($roleid, $role)) {
+                $matchrole = $samerole->id;
+                // if an exact role is found, it does not matter whether this user can assign this role or not,
+                // this will be presented as a valid option regardless
+                $mappableroles[$samerole->id] = $allroles[$samerole->id]->name." (". $allroles[$samerole->id]->shortname.")";
+            } else {
+                // no exact role found, let's try to match shortname
+                // this is useful in situations where basic roles differ slightly in definition
+                $matchrole = 0;
+                foreach ($siterolesarray as $siteroleid=>$siteroleshortname) {
+                    if ($siteroleshortname == $role->shortname) {
+                        $matchrole = $siteroleid;
+                        break;
+                    }
+                }
            }
-    
-            choose_from_menu ($siteroleschoicearray, "roles_".$roleid, $matchrole, 'new role', '', '0');
-            echo ('</td></tr>'); 
+            choose_from_menu ($mappableroles, "roles_".$roleid, $matchrole, 'new role', '', '0');
+            echo ('</td></tr>');
        }
    }
    
@@ -516,3 +585,59 @@ echo ('</table>'); // end of role mappings table
 </div>
 </div>
 </form>
+
+<?php
+
+/* 
+ * If there is a role with exactly the same definition, we pull it out from db
+ */
+function restore_samerole($roleid, $role) {
+    global $CFG;
+    
+    $systemcontext = get_context_instance(CONTEXT_SYSTEM);
+    // first let's use the id
+
+    if ($trole = get_records_sql("SELECT roleid,capability,permission
+                                   FROM {$CFG->prefix}role_capabilities
+                                   WHERE roleid = $roleid")) {
+        
+        if (restore_is_samerole($trole, $role)) {
+            $firstcap = array_shift($trole);
+            return get_record('role', 'id', $firstcap->roleid); 
+        } 
+    }   
+    
+    // unfortunately then we have to loop all roles with the same number of capabiltiies
+    if ($proles = get_records_sql("SELECT roleid, roleid
+                                   FROM {$CFG->prefix}role_capabilities
+                                   GROUP BY roleid
+                                   HAVING COUNT(capability) = ".count($role->capabilities))) {                    
+        foreach ($proles as $proleid=>$proleobj) {
+            if ($prole = get_records('role_capabilities', 'roleid', $proleid)) {
+                if (restore_is_samerole($prole, $role)) {
+                    return get_record('role', 'id', $proleid); 
+                }
+            }       
+        }                               
+    }
+ 
+    return false;
+}
+
+/* 
+ * rolea from db, roleb from xml
+ */
+function restore_is_samerole($rolea, $roleb) {
+  
+    if (count($rolea) != count($roleb->capabilities)) {
+        return false; 
+    }
+    
+    foreach ($rolea as $cap) {
+        if ($cap->permission != $roleb->capabilities[$cap->capability]->permission) {
+            return false; 
+        }     
+    }
+    return true;
+}
+?>
@@ -18,7 +18,8 @@
            if (empty($to)) {
                error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
            } else {
-                if (!has_capability('moodle/site:restore', get_context_instance(CONTEXT_COURSE, $to))) {
+                if (!has_capability('moodle/site:restore', get_context_instance(CONTEXT_COURSE, $to))
+                    && !has_capability('moodle/site:import',  get_context_instance(CONTEXT_COURSE, $to))) {
                    error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
                }
            }
@@ -71,6 +71,42 @@
            echo "<ul>";
        }

+        // Recode links in the course summary.
+        if (!defined('RESTORE_SILENTLY')) {
+            echo '<li>' . get_string('from') . ' ' . get_string('course');
+        }
+        $course = get_record('course', 'id', $restore->course_id, '', '', '', '', 'id,summary');
+        $coursesummary = restore_decode_content_links_worker($course->summary, $restore);
+        if ($coursesummary != $course->summary) {
+            $course->summary = addslashes($coursesummary);
+            if (!update_record('course', $course)) {
+                $status = false;
+            }
+        }
+        if (!defined('RESTORE_SILENTLY')) {
+            echo '</li>';
+        }
+
+        // Recode links in section summaries.
+        $sections = get_records('course_sections', 'course', $restore->course_id, 'id', 'id,summary');
+        if ($sections) {
+            if (!defined('RESTORE_SILENTLY')) {
+                echo '<li>' . get_string('from') . ' ' . get_string('sections');
+            }
+            foreach ($sections as $section) {
+                $sectionsummary = restore_decode_content_links_worker($section->summary, $restore);
+                if ($sectionsummary != $section->summary) {
+                    $section->summary = addslashes($sectionsummary);
+                    if (!update_record('course_sections', $section)) {
+                        $status = false;
+                    }
+                }
+            }
+            if (!defined('RESTORE_SILENTLY')) {
+                echo '</li>';
+            }
+        }
+
        // Restore links in modules.
        foreach ($restore->mods as $name => $info) {
            //If the module is being restored
@@ -533,8 +569,18 @@
        $course_header->course_shortname = $currentshortname;
        
        //Now calculate the category
-        $category = get_record("course_categories","id",$course_header->category->id,
-                                                   "name",addslashes($course_header->category->name));
+        
+        // first try to get it from restore
+        if ($restore->restore_restorecatto) {
+            $category = get_record('course_categories', 'id', $restore->restore_restorecatto);
+        }
+        
+        // else we try to get it from the xml file
+        //Now calculate the category
+        if (!$category) {
+            $category = get_record("course_categories","id",$course_header->category->id,
+                                   "name",addslashes($course_header->category->name));
+        }
        //If no exists, try by name only
        if (!$category) {
            $category = get_record("course_categories","name",addslashes($course_header->category->name));
@@ -585,7 +631,6 @@
            $course->guest = addslashes($course_header->course_guest);
            $course->startdate = addslashes($course_header->course_startdate);
            $course->startdate += $restore->course_startdateoffset;
-            $course->enrolperiod = addslashes($course_header->course_enrolperiod);
            $course->numsections = addslashes($course_header->course_numsections);
            //$course->showrecent = addslashes($course_header->course_showrecent);   INFO: This is out in 1.3
            $course->maxbytes = addslashes($course_header->course_maxbytes);
@@ -606,6 +651,19 @@
            $course->timecreated = addslashes($course_header->course_timecreated);
            $course->timemodified = addslashes($course_header->course_timemodified);
            $course->metacourse = addslashes($course_header->course_metacourse);
+            $course->expirynotify = isset($course_header->course_expirynotify) ? addslashes($course_header->course_expirynotify):0;
+            $course->notifystudents = isset($course_header->course_notifystudents) ? addslashes($course_header->course_notifystudents) : 0;
+            $course->expirythreshold = isset($course_header->course_expirythreshold) ? addslashes($course_header->course_expirythreshold) : 0;
+            $course->enrollable = isset($course_header->course_enrollable) ? addslashes($course_header->course_enrollable) : 1;
+            $course->enrolstartdate = isset($course_header->course_enrolstartdate) ? addslashes($course_header->course_enrolstartdate) : 0;
+            if ($course->enrolstartdate)  { //Roll course dates
+                $course->enrolstartdate += $restore->course_startdateoffset;
+            }
+            $course->enrolenddate = isset($course_header->course_enrolenddate) ? addslashes($course_header->course_enrolenddate) : 0;
+            if ($course->enrolenddate) { //Roll course dates
+                $course->enrolenddate  += $restore->course_startdateoffset;
+            }
+            $course->enrolperiod = addslashes($course_header->course_enrolperiod);
            //Calculate sortorder field
            $sortmax = get_record_sql('SELECT MAX(sortorder) AS max
                                       FROM ' . $CFG->prefix . 'course
@@ -778,6 +836,11 @@
                        continue;
                    }
                    $getid = backup_getid($restore->backup_unique_code, $parts[1], $instance->pageid);
+
+                    if (empty($getid->new_id)) {
+                        // Failed, perhaps the module was not included in the restore  MDL-13554
+                        continue;
+                    }
                    $instance->pageid = $getid->new_id;
                }
                else {
@@ -833,10 +896,22 @@

                    //Add this instance
                    $instance->blockid = $blocks[$instance->name]->id;
-                    
-                    if ($newid = insert_record('block_instance', $instance)) {
-                        if (!empty($instance->id)) { // this will only be set if we come from 1.7 and above backups
-                            backup_putid ($restore->backup_unique_code,"block_instance",$instance->id,$newid);
+
+                    if (!empty($instance->id)) {
+                        $oldid = $instance->id;
+                    } else {
+                        $oldid = 0;
+                    }
+
+                    if ($instance->id = insert_record('block_instance', $instance)) {
+                        // Create block instance
+                        if (!$blockobj = block_instance($instance->name, $instance)) {
+                            $status = false;
+                            break;
+                        }
+                        // Save oldid after block restore process because info will be over-written with blank string
+                        if ($oldid) {
+                            backup_putid ($restore->backup_unique_code,"block_instance",$oldid,$instance->id);
                        }
                    } else {
                        $status = false;
@@ -935,14 +1010,18 @@
                            // Yu: This part is called repeatedly for every instance, 
                            // so it is necessary to set the granular flag and check isset() 
                            // when the first instance of this type of mod is processed.
-                            if (!isset($restore->mods[$mod->type]->granular) && isset($restore->mods[$mod->type]->instances) && is_array($restore->mods[$mod->type]->instances)) {
-                                // This defines whether we want to restore specific
-                                // instances of the modules (granular restore), or
-                                // whether we don't care and just want to restore
-                                // all module instances (non-granular).
-                                $restore->mods[$mod->type]->granular = true;
-                            } else {
-                                $restore->mods[$mod->type]->granular = false;
+                            //if (!isset($restore->mods[$mod->type]->granular) && isset($restore->mods[$mod->type]->instances) && is_array($restore->mods[$mod->type]->instances)) {
+                            
+                            if (!isset($restore->mods[$mod->type]->granular)) {
+                                if (isset($restore->mods[$mod->type]->instances) && is_array($restore->mods[$mod->type]->instances)) {                              
+                                    // This defines whether we want to restore specific
+                                    // instances of the modules (granular restore), or
+                                    // whether we don't care and just want to restore
+                                    // all module instances (non-granular).
+                                    $restore->mods[$mod->type]->granular = true;
+                                } else {
+                                    $restore->mods[$mod->type]->granular = false;
+                                }
                            }
                          
                            //Check if we've to restore this module (and instance) 
@@ -1181,7 +1260,7 @@
                    if (!$preferencescount) {
                        $continue = false;
                        if (!defined('RESTORE_SILENTLY')) {
-                            echo '<li>'.get_string('backupwithoutgradebook','grade').'</li>';
+                            echo '<li>'.get_string('backupwithoutgradebook','grades').'</li>';
                        }
                    }

@@ -1192,7 +1271,7 @@
                            if ($pref_rec->value == 0) {
                                $continue = false;
                                if (!defined('RESTORE_SILENTLY')) {
-                                    echo '<li>'.get_string('respectingcurrentdata','grade').'</li>';
+                                    echo '<li>'.get_string('respectingcurrentdata','grades').'</li>';
                                }
                            }
                        }
@@ -1208,7 +1287,7 @@
                            //Fetch recordset_size records in each iteration
                            $recs = get_records_select("backup_ids","table_name = 'grade_preferences' AND backup_code = '$restore->backup_unique_code'",
                                                       "old_id",
-                                                       "old_id, old_id",
+                                                       "old_id",
                                                       $counter,
                                                       $recordset_size);
                            if ($recs) {
@@ -1262,7 +1341,7 @@
                            //Fetch recordset_size records in each iteration
                            $recs = get_records_select("backup_ids","table_name = 'grade_letter' AND backup_code = '$restore->backup_unique_code'",
                                                       "old_id",
-                                                       "old_id, old_id",
+                                                       "old_id",
                                                       $counter,
                                                       $recordset_size);
                            if ($recs) {
@@ -1312,7 +1391,7 @@
                            //Fetch recordset_size records in each iteration
                            $recs = get_records_select("backup_ids","table_name = 'grade_category' AND backup_code = '$restore->backup_unique_code'",
                                                       "old_id",
-                                                       "old_id, old_id",
+                                                       "old_id",
                                                       $countercat,
                                                       $recordset_size);
                            if ($recs) {
@@ -1471,7 +1550,7 @@
            //in backup_ids->info will be the real info (serialized)
            $info = restore_read_xml_users($restore,$xml_file);
        }
-
+        
        //Now, get evey user_id from $info and user data from $backup_ids
        //and create the necessary records (users, user_students, user_teachers
        //user_course_creators and user_admins
@@ -1482,15 +1561,37 @@

            $languages = get_list_of_languages();

+        /// Iterate over all users loaded from xml
+            $counter = 0;
            foreach ($info->users as $userid) {
-                $rec = backup_getid($restore->backup_unique_code,"user",$userid); 
+                $rec = backup_getid($restore->backup_unique_code,"user",$userid);
                $user = $rec->info;
+                foreach (array_keys(get_object_vars($user)) as $field) {
+                    if (!is_array($user->$field)) {
+                        $user->$field = backup_todb($user->$field);
+                        if (is_null($user->$field)) {
+                            $user->$field = '';
+                        }
+                    }
+                }

                //Now, recode some languages (Moodle 1.5)
                if ($user->lang == 'ma_nt') {
                    $user->lang = 'mi_nt';
                }

+                //Country list updates - MDL-13060 
+                //Any user whose country code has been deleted or modified needs to be assigned a valid one.
+                $country_update_map = array(
+                    'ZR' => 'CD', 
+                    'TP' => 'TL',
+                    'FX' => 'FR', 
+                    'KO' => 'RS', 
+                    'CS' => 'RS',
+                    'WA' => 'GB');
+                if (array_key_exists($user->country, $country_update_map)) {
+                    $user->country = $country_update_map[$user->country];
+                }

                //If language does not exist here - use site default
                if (!array_key_exists($user->lang, $languages)) {
@@ -1562,17 +1663,13 @@
                if ($create_user) {
                    //Unset the id because it's going to be inserted with a new one
                    unset ($user->id);
-                    //We addslashes to necessary fields
-                    $user->username = addslashes($user->username);
-                    $user->firstname = addslashes($user->firstname);
-                    $user->lastname = addslashes($user->lastname);
-                    $user->email = addslashes($user->email);
-                    $user->institution = addslashes($user->institution);
-                    $user->department = addslashes($user->department);
-                    $user->address = addslashes($user->address);
-                    $user->city = addslashes($user->city);
-                    $user->url = addslashes($user->url);
-                    $user->description = restore_decode_absolute_links(addslashes($user->description));
+                    // relink the descriptions
+                    $user->description = restore_decode_absolute_links($user->description);
+
+                /// Disable pictures based on global setting of existing empty value (old backups can contain wrong empties)
+                    if (!empty($CFG->disableuserimages) || empty($user->picture)) {
+                        $user->picture = 0;
+                    }

                    //We need to analyse the AUTH field to recode it:
                    //   - if the field isn't set, we are in a pre 1.4 backup and we'll 
@@ -1604,7 +1701,7 @@

                    //We are going to create the user
                    //The structure is exactly as we need
-                    $newid = insert_record ("user",$user);
+                    $newid = insert_record ("user", addslashes_recursive($user));
                    //Put the new id
                    $status = backup_putid($restore->backup_unique_code,"user",$userid,$newid,"new");
                }
@@ -1745,9 +1842,20 @@
                        }
                    }
                }
-            }
+                //Do some output
+                $counter++;
+                if ($counter % 10 == 0) {
+                    if (!defined('RESTORE_SILENTLY')) {
+                        echo ".";
+                        if ($counter % 200 == 0) {
+                            echo "<br />";
+                        }
+                    }
+                    backup_flush(300);
+                }
+            } /// End of loop over all the users loaded from xml
        }
-        
+
        return $status;
    }

@@ -1790,7 +1898,7 @@
                        $counter = 0;
                        while ($counter < $unreadcount) {
                            //Fetch recordset_size records in each iteration
-                            $recs = get_records_select("backup_ids","table_name = 'message' AND backup_code = '$restore->backup_unique_code'","old_id","old_id, old_id",$counter,$recordset_size);
+                            $recs = get_records_select("backup_ids","table_name = 'message' AND backup_code = '$restore->backup_unique_code'","old_id","old_id",$counter,$recordset_size);
                            if ($recs) {
                                foreach ($recs as $rec) {
                                    //Get the full record from backup_ids
@@ -1855,7 +1963,7 @@
                        $counter = 0;
                        while ($counter < $readcount) {
                            //Fetch recordset_size records in each iteration
-                            $recs = get_records_select("backup_ids","table_name = 'message_read' AND backup_code = '$restore->backup_unique_code'","old_id","old_id, old_id",$counter,$recordset_size);
+                            $recs = get_records_select("backup_ids","table_name = 'message_read' AND backup_code = '$restore->backup_unique_code'","old_id","old_id",$counter,$recordset_size);
                            if ($recs) {
                                foreach ($recs as $rec) {
                                    //Get the full record from backup_ids
@@ -1922,7 +2030,7 @@
                        $counter = 0;
                        while ($counter < $contactcount) {
                            //Fetch recordset_size records in each iteration
-                            $recs = get_records_select("backup_ids","table_name = 'message_contacts' AND backup_code = '$restore->backup_unique_code'","old_id","old_id, old_id",$counter,$recordset_size);
+                            $recs = get_records_select("backup_ids","table_name = 'message_contacts' AND backup_code = '$restore->backup_unique_code'","old_id","old_id",$counter,$recordset_size);
                            if ($recs) {
                                foreach ($recs as $rec) {
                                    //Get the full record from backup_ids
@@ -2182,10 +2290,22 @@
                        $gro->hidepicture = backup_todb($info['GROUP']['#']['HIDEPICTURE']['0']['#']);
                        $gro->timecreated = backup_todb($info['GROUP']['#']['TIMECREATED']['0']['#']);
                        $gro->timemodified = backup_todb($info['GROUP']['#']['TIMEMODIFIED']['0']['#']);
-                
-                        //Now search if that group exists (by name and description field) in 
+
+                        //Now search if that group exists (by name and description field) in
                        //restore->course_id course
-                        $gro_db = groups_group_matches($restore->course_id, $gro->name, $gro->description); 
+                        //Going to compare LOB columns so, use the cross-db sql_compare_text() in both sides.
+                        $description_clause = '';
+                        if (!empty($gro->description)) { /// Only for groups having a description
+                            $literal_description = "'" . $gro->description . "'";
+                            $description_clause = " AND " .
+                                                  sql_compare_text('description') . " = " .
+                                                  sql_compare_text($literal_description);
+                        }
+                        $gro_db = get_record_sql("SELECT *
+                                                  FROM {$CFG->prefix}groups g, {$CFG->prefix}groups_courses_groups gcg
+                                                  WHERE gcg.courseid = $restore->course_id 
+                                                        AND g.id = gcg.groupid
+                                                        AND g.name = '{$gro->name}'" . $description_clause, true);
                        //If it doesn't exist, create
                        if (!$gro_db) {
                            $create_group = true;
@@ -2480,19 +2600,6 @@
                                //Assign it to admin
                                $eve->userid = $adminid;
                            }
-
-                            //We must recode the repeatid if the event has it
-                            if (!empty($eve->repeatid)) {
-                                $repeat_rec = backup_getid($restore->backup_unique_code,"event_repeatid",$eve->repeatid);
-                                if ($repeat_rec) {    //Exists, so use it...
-                                    $eve->repeatid = $repeat_rec->new_id;
-                                } else {              //Doesn't exists, calculate the next and save it
-                                    $oldrepeatid = $eve->repeatid;
-                                    $max_rec = get_record_sql('SELECT 1, MAX(repeatid) AS repeatid FROM '.$CFG->prefix.'event');
-                                    $eve->repeatid = empty($max_rec) ? 1 : $max_rec->repeatid + 1;
-                                    backup_putid($restore->backup_unique_code,"event_repeatid", $oldrepeatid, $eve->repeatid);
-                                }
-                            }
 
                            //We have to recode the groupid field
                            $group = backup_getid($restore->backup_unique_code,"groups",$eve->groupid);
@@ -2505,6 +2612,22 @@

                            //The structure is equal to the db, so insert the event
                            $newid = insert_record ("event",$eve);
+
+                            //We must recode the repeatid if the event has it
+                            //The repeatid now refers to the id of the original event. (see Bug#5956)
+                            if ($newid && !empty($eve->repeatid)) {
+                                $repeat_rec = backup_getid($restore->backup_unique_code,"event_repeatid",$eve->repeatid);
+                                if ($repeat_rec) {    //Exists, so use it...
+                                    $eve->repeatid = $repeat_rec->new_id;
+                                } else {              //Doesn't exists, calculate the next and save it
+                                    $oldrepeatid = $eve->repeatid;
+                                    $eve->repeatid = $newid;
+                                    backup_putid($restore->backup_unique_code,"event_repeatid", $oldrepeatid, $eve->repeatid);
+                                }
+                                $eve->id = $newid;
+                                // update the record to contain the correct repeatid
+                                update_record('event',$eve);
+                            }
                        } else {
                            //get current event id
                            $newid = $eve_db->id;
@@ -2532,8 +2655,18 @@
    //step in the restore execution, because we need to have it 
    //finished to know all the oldid, newid equivaleces
    function restore_decode_absolute_links($content) {
-                                     
-        global $CFG,$restore;    
+
+        global $CFG,$restore;
+
+    /// MDL-14072: Prevent NULLs, empties and numbers to be processed by the
+    /// heavy interlinking. Just a few cpu cycles saved.
+        if ($content === NULL) {
+            return NULL;
+        } else if ($content === '') {
+            return '';
+        } else if (is_numeric($content)) {
+            return $content;
+        }

        //Now decode wwwroot and file.php calls
        $search = array ("$@FILEPHP@$");
@@ -2569,48 +2702,53 @@

        $counter = 0;

-        //First, we check to "users" exists and create is as necessary
+        // 'users' is the old users folder, 'user' is the new one, with a new hierarchy. Detect which one is here and treat accordingly 
        //in CFG->dataroot
-        $dest_dir = $CFG->dataroot."/users";
+        $dest_dir = $CFG->dataroot."/user";
        $status = check_dir_exists($dest_dir,true);

        //Now, we iterate over "user_files" records to check if that user dir must be
        //copied (and renamed) to the "users" dir.
        $rootdir = $CFG->dataroot."/temp/backup/".$restore->backup_unique_code."/user_files";
+        
        //Check if directory exists
-        if (is_dir($rootdir)) {
-            $list = list_directories ($rootdir);
-            if ($list) {
-                //Iterate
-                $counter = 0;
-                foreach ($list as $dir) {
-                    //Look for dir like username in backup_ids
-                    $data = get_record ("backup_ids","backup_code",$restore->backup_unique_code,
-                                                     "table_name","user",
-                                                     "old_id",$dir);
-                    //If thar user exists in backup_ids
-                    if ($data) {
-                        //Only it user has been created now
-                        //or if it existed previously, but he hasn't image (see bug 1123)
-                        if ((strpos($data->info,"new") !== false) or 
-                            (!check_dir_exists($dest_dir."/".$data->new_id,false))) {
-                            //Copy the old_dir to its new location (and name) !!
-                            //Only if destination doesn't exists
-                            if (!file_exists($dest_dir."/".$data->new_id)) {
-                                $status = backup_copy_file($rootdir."/".$dir,
-                                              $dest_dir."/".$data->new_id,true);
-                                $counter ++;
-                            }
-                            //Do some output
-                            if ($counter % 2 == 0) {
-                                if (!defined('RESTORE_SILENTLY')) {
-                                    echo ".";
-                                    if ($counter % 40 == 0) {
-                                        echo "<br />";
-                                    }
+        $userlist = array();
+
+        if (is_dir($rootdir) && ($list = list_directories ($rootdir))) {
+            $counter = 0;
+            foreach ($list as $dir) {
+                // If there are directories in this folder, we are in the new user hierarchy
+                if ($newlist = list_directories("$rootdir/$dir")) {
+                    foreach ($newlist as $olduserid) {
+                        $userlist[$olduserid] = "$rootdir/$dir/$olduserid";
+                    }
+                } else {
+                    $userlist[$dir] = "$rootdir/$dir";
+                }
+            }
+
+            foreach ($userlist as $olduserid => $backup_location) { 
+                //Look for dir like username in backup_ids
+                //If that user exists in backup_ids
+                if ($user = backup_getid($restore->backup_unique_code,"user",$olduserid)) {
+                    //Only if user has been created now or if it existed previously, but he hasn't got an image (see bug 1123)
+                    $newuserdir = make_user_directory($user->new_id, true); // Doesn't create the folder, just returns the location
+
+                    // restore images if new user or image does not exist yet
+                    if (!empty($user->new) or !check_dir_exists($newuserdir)) {
+                        if (make_user_directory($user->new_id)) { // Creates the folder
+                            $status = backup_copy_file($backup_location, $newuserdir, true);
+                            $counter ++;
+                        }
+                        //Do some output
+                        if ($counter % 2 == 0) {
+                            if (!defined('RESTORE_SILENTLY')) {
+                                echo ".";
+                                if ($counter % 40 == 0) {
+                                    echo "<br />";
                                }
-                                backup_flush(300);
                            }
+                            backup_flush(300);
                        }
                    }
                }
@@ -2817,7 +2955,7 @@
            while ($counter < $count_logs) {
                //Get a chunk of records
                //Take old_id twice to avoid adodb limitation
-                $logs = get_records_select("backup_ids","table_name = 'log' AND backup_code = '$restore->backup_unique_code'","old_id","old_id,old_id",$counter,$recordset_size);
+                $logs = get_records_select("backup_ids","table_name = 'log' AND backup_code = '$restore->backup_unique_code'","old_id","old_id",$counter,$recordset_size);
                //We have logs
                if ($logs) {
                    //Iterate
@@ -3205,6 +3343,18 @@
                } else {
                    $status = false;
               }
+               // MDL-14326 remove empty course modules instance's (credit goes to John T. Macklin from Remote Learner)
+               $course_modules_inst_zero = get_records_sql("SELECT id, course, instance
+                                           FROM {$CFG->prefix}course_modules
+                                           WHERE id = '$cm_module->new_id' AND
+                                                 instance = '0'");
+                                                 
+                    if($course_modules_inst_zero){ // Clean up the invalid instances
+                         foreach($course_modules_inst_zero as $course_modules_inst){
+                             delete_records('course_modules', 'id',$course_modules_inst->id);
+                         }
+                    }
+
            }
        }

@@ -3244,7 +3394,7 @@
            $this->tree[$this->level] = $tagName;

            //Output something to avoid browser timeouts...
-            backup_flush();
+            //backup_flush();

            //Check if we are into INFO zone
            //if ($this->tree[2] == "INFO")                                                             //Debug
@@ -3258,7 +3408,7 @@
            $this->tree[$this->level] = $tagName;

            //Output something to avoid browser timeouts...
-            backup_flush();
+            //backup_flush();

            //Check if we are into INFO zone
            //if ($this->tree[2] == "INFO")                                                             //Debug
@@ -3273,7 +3423,7 @@
            $this->tree[$this->level] = $tagName;

            //Output something to avoid browser timeouts...
-            backup_flush();
+            //backup_flush();

            //Check if we are into COURSE_HEADER zone
            //if ($this->tree[3] == "HEADER")                                                           //Debug
@@ -3287,7 +3437,7 @@
            $this->tree[$this->level] = $tagName;   
            
            //Output something to avoid browser timeouts...
-            backup_flush();
+            //backup_flush();

            //Check if we are into BLOCKS zone
            //if ($this->tree[3] == "BLOCKS")                                                         //Debug
@@ -3301,7 +3451,7 @@
            $this->tree[$this->level] = $tagName;   

            //Output something to avoid browser timeouts...
-            backup_flush();
+            //backup_flush();

            //Check if we are into SECTIONS zone
            //if ($this->tree[3] == "SECTIONS")                                                         //Debug
@@ -3315,7 +3465,7 @@
            $this->tree[$this->level] = $tagName;   

            //Output something to avoid browser timeouts...
-            backup_flush();
+            //backup_flush();

            //Accumulate all the data inside this tag
            if (isset($this->tree[3]) && $this->tree[3] == "FORMATDATA") {
@@ -3338,7 +3488,7 @@
            $this->tree[$this->level] = $tagName;   
            
            //Output something to avoid browser timeouts...
-            backup_flush();
+            //backup_flush();

            //Check if we are into METACOURSE zone
            //if ($this->tree[3] == "METACOURSE")                                                         //Debug
@@ -3353,7 +3503,7 @@
            $this->tree[$this->level] = $tagName;

            //Output something to avoid browser timeouts...
-            backup_flush();
+            //backup_flush();

            //Check if we are into GRADEBOOK zone
            //if ($this->tree[3] == "GRADEBOOK")                                                         //Debug
@@ -3389,7 +3539,7 @@
            $this->tree[$this->level] = $tagName;

            //Output something to avoid browser timeouts...
-            backup_flush();
+            //backup_flush();

            //Check if we are into MESSAGES zone
            //if ($this->tree[3] == "MESSAGES")                                                          //Debug
@@ -3416,7 +3566,7 @@
            //}                                                                                        //Debug

            //Output something to avoid browser timeouts...
-            backup_flush();
+            //backup_flush();

            //Check if we are into QUESTION_CATEGORIES zone
            //if ($this->tree[3] == "QUESTION_CATEGORIES")                                              //Debug
@@ -3444,7 +3594,7 @@
            //}                                                                                        //Debug

            //Output something to avoid browser timeouts...
-            backup_flush();
+            //backup_flush();

            //Check if we are into SCALES zone
            //if ($this->tree[3] == "SCALES")                                                           //Debug
@@ -3471,7 +3621,7 @@
            //}                                                                                        //Debug

            //Output something to avoid browser timeouts...
-            backup_flush();
+            //backup_flush();

            //Check if we are into GROUPS zone
            //if ($this->tree[3] == "GROUPS")                                                           //Debug
@@ -3498,7 +3648,7 @@
            //}                                                                                        //Debug

            //Output something to avoid browser timeouts...
-            backup_flush();
+            //backup_flush();

            //Check if we are into GROUPINGS zone
            //if ($this->tree[3] == "GROUPINGS")                                                           //Debug
@@ -3526,7 +3676,7 @@
            //}                                                                                        //Debug

            //Output something to avoid browser timeouts...
-            backup_flush();
+            //backup_flush();

            //Check if we are into EVENTS zone
            //if ($this->tree[3] == "EVENTS")                                                           //Debug
@@ -3554,7 +3704,7 @@
            //}                                                                                           //Debug

            //Output something to avoid browser timeouts...
-            backup_flush();
+            //backup_flush();

            //Check if we are into MODULES zone
            //if ($this->tree[3] == "MODULES")                                                          //Debug
@@ -3582,7 +3732,7 @@
            //}                                                                                           //Debug

            //Output something to avoid browser timeouts...
-            backup_flush();
+            //backup_flush();

            //Check if we are into LOGS zone
            //if ($this->tree[3] == "LOGS")                                                             //Debug
@@ -3605,7 +3755,7 @@
            $this->tree[$this->level] = $tagName;

            //Output something to avoid browser timeouts...
-            backup_flush();
+            //backup_flush();

            echo $this->level.str_repeat("&nbsp;",$this->level*2)."&lt;".$tagName."&gt;<br />\n";   //Debug
        }
@@ -3831,9 +3981,6 @@
                        case "STARTDATE":
                            $this->info->course_startdate = $this->getContents();
                            break;
-                        case "ENROLPERIOD":
-                            $this->info->course_enrolperiod = $this->getContents();
-                            break;
                        case "NUMSECTIONS":
                            $this->info->course_numsections = $this->getContents();
                            break;
@@ -3882,6 +4029,27 @@
                        case "METACOURSE":
                            $this->info->course_metacourse = $this->getContents();
                            break;
+                        case "EXPIRENOTIFY":
+                            $this->info->course_expirynotify = $this->getContents();
+                            break;
+                        case "NOTIFYSTUDENTS":
+                            $this->info->course_notifystudents = $this->getContents();
+                            break;
+                        case "EXPIRYTHRESHOLD":
+                            $this->info->course_expirythreshold = $this->getContents();
+                            break;
+                        case "ENROLLABLE":
+                            $this->info->course_enrollable = $this->getContents();
+                            break;
+                        case "ENROLSTARTDATE":
+                            $this->info->course_enrolstartdate = $this->getContents();
+                            break;
+                        case "ENROLENDDATE":
+                            $this->info->course_enrolenddate = $this->getContents();
+                            break;
+                        case "ENROLPERIOD":
+                            $this->info->course_enrolperiod = $this->getContents();
+                            break;
                    }
                }
                if ($this->tree[4] == "CATEGORY") {
@@ -5420,11 +5588,20 @@
        $fp = fopen($xml_file,"r")
            or $status = false;
        if ($status) {
-            while ($data = fread($fp, 4096) and !$moodle_parser->finished)
-                    xml_parse($xml_parser, $data, feof($fp))
-                            or die(sprintf("XML error: %s at line %d",
-                            xml_error_string(xml_get_error_code($xml_parser)),
-                                    xml_get_current_line_number($xml_parser)));
+            // MDL-9290 performance improvement on reading large xml
+            $lasttime = time(); // crmas
+            while ($data = fread($fp, 4096) and !$moodle_parser->finished) {
+             
+                if ((time() - $lasttime) > 5) {
+                    $lasttime = time();
+                    backup_flush(1);
+                }
+             
+                xml_parse($xml_parser, $data, feof($fp))
+                        or die(sprintf("XML error: %s at line %d",
+                        xml_error_string(xml_get_error_code($xml_parser)),
+                                xml_get_current_line_number($xml_parser)));
+            }
            fclose($fp);
        }
        //Get info from parser
@@ -5574,6 +5751,11 @@
            $info = restore_read_xml_info ($xml_file);
            //Reading course_header from file
            $course_header = restore_read_xml_course_header ($xml_file);
+
+            if(!is_object($course_header)){
+                // ensure we fail if there is no course header
+                $course_header = false;
+            }
        }
        
        if (!defined('RESTORE_SILENTLY')) {
@@ -6687,7 +6869,7 @@
            $newcontext = get_context_instance($contextlevel, $oldinstance->new_id);
            $assignment->contextid = $newcontext->id; // new context id
            // might already have same assignment           
-            role_assign($assignment->roleid, $assignment->userid, 0, $assignment->contextid, $assignment->timestart, $assignment->timeend, $assignment->hidden, $assignment->enrol);
+            role_assign($assignment->roleid, $assignment->userid, 0, $assignment->contextid, $assignment->timestart, $assignment->timeend, $assignment->hidden, $assignment->enrol, $assignment->timemodified);
            
        }  
    }
@@ -6704,7 +6886,7 @@
        foreach ($overrides as $override) {            
            $override->capability = $override->name;
            $oldmodifier = backup_getid($restore->backup_unique_code,"user",$override->modifierid);
-            $override->modifierid = $oldmodifier->new_id?$oldmodifier->new_id:0; // new modifier id here
+            $override->modifierid = !empty($oldmodifier->new_id)?$oldmodifier->new_id:0; // new modifier id here
            $override->roleid = $role->new_id; // restored new role id
            
            // hack to make the correct contextid for course level imports
@@ -164,38 +164,17 @@ class block_admin extends block_list {

        if (empty($course->metacourse) && ($course->id!==SITEID)) {
            if (has_capability('moodle/legacy:guest', $context, NULL, false)) {   // Are a guest now
-                $this->content->items[]='<a href="enrol.php?id='.$this->instance->pageid.'">'.get_string('enrolme', '', format_string($course->shortname)).'</a>';
+                $this->content->items[]='<a href="'.$CFG->wwwroot.'/course/enrol.php?id='.$this->instance->pageid.'">'.get_string('enrolme', '', format_string($course->shortname)).'</a>';
                $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" class="icon" alt="" />';
            } else if (has_capability('moodle/role:unassignself', $context, NULL, false)) {  // Have some role
-                $this->content->items[]='<a href="unenrol.php?id='.$this->instance->pageid.'">'.get_string('unenrolme', '', format_string($course->shortname)).'</a>';
+                $this->content->items[]='<a href="'.$CFG->wwwroot.'/course/unenrol.php?id='.$this->instance->pageid.'">'.get_string('unenrolme', '', format_string($course->shortname)).'</a>';
                $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" class="icon" alt="" />';
            }
        }

-    /// Should the following two be in this block?
-
-
-    /// View own activity report
-//        if ($course->showreports) {
-//            $this->content->items[]='<a href="user.php?id='.$this->instance->pageid.'&amp;user='.$USER->id.'">'.get_string('activityreport').'</a>';
-//            $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/report.gif" alt="" />';
-//        }
-
-
-    /// Edit your own profile
-
-//        $fullname = fullname($USER, has_capability('moodle/site:viewfullnames', $context));
-//        $editmyprofile = '<a title="'.$fullname.'" href="'.$CFG->wwwroot.'/user/edit.php?id='.$USER->id.'&amp;course='.$this->instance->pageid.'">'.get_string('editmyprofile').'</a>';
-//        if (empty($USER->description)) {
-//                //Accessibility: replace non-standard <blink> with CSS (<a> makes title visible in IE).
-//            $text = get_string('profile').' '.get_string('missingdescription');
-//            $this->content->items[]= $editmyprofile.' <a title="'.$text.'" class="useredit blink">*<span class="accesshide">'.$text.'</span></a>';
-//        } else {
-//            $this->content->items[]= $editmyprofile;
-//        }
-//        $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" alt="" />';
-
-
+	/// Link to the user own profile
+        $this->content->items[]='<a href="'.$CFG->wwwroot.'/user/view.php?id='.$USER->id.'&amp;course='.$course->id.'">'.get_string('profile').'</a>';
+        $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" alt="" />';

        return $this->content;
    }
@@ -41,7 +41,8 @@ class block_admin_tree extends block_base {
            $this->tempcontent .= "&nbsp; &nbsp;";
        }
        $this->tempcontent .= '<a href="#" onclick="toggle(\'vh_span'. $this->spancounter .'\');return false">';
-        $this->tempcontent .= '<span id="vh_span' . $this->spancounter . 'indicator"><img src="' . $CFG->wwwroot . '/blocks/admin_tree/open.gif" alt="'.$strfolderopened.'" /></span> ';
+        $this->tempcontent .= '<span id="vh_span' . $this->spancounter . 'indicator"><img src="' . $CFG->pixpath . '/i/open.gif" alt="'.$strfolderopened.'" /></span> ';
+        
        $this->tempcontent .= $visiblename . '</a><br /><span id="vh_span' . $this->spancounter . '">' . "\n";
        $this->currentdepth++;
        $this->spancounter++;
@@ -66,12 +67,12 @@ class block_admin_tree extends block_base {
        if (is_a($content, 'admin_settingpage')) {
            if ($content->check_access() and !$content->is_hidden()) {
                $class = ($content->name == $this->section) ? 'link current' : 'link';
-                $this->create_item($content->visiblename,$CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=' . $content->name,$CFG->wwwroot .'/blocks/admin_tree/item.gif', $class);
+                $this->create_item($content->visiblename,$CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=' . $content->name,$CFG->pixpath .'/i/item.gif', $class);
            }
        } else if (is_a($content, 'admin_externalpage')) {
            if ($content->check_access() and !$content->is_hidden()) {
                $class = ($content->name == $this->section) ? 'link current' : 'link';
-                $this->create_item($content->visiblename, $content->url, $CFG->wwwroot . '/blocks/admin_tree/item.gif', $class);
+                $this->create_item($content->visiblename, $content->url, $CFG->pixpath . '/i/item.gif', $class);
            }
        } else if (is_a($content, 'admin_category')) {
            if ($content->check_access() and !$content->is_hidden()) {
@@ -144,11 +145,11 @@ class block_admin_tree extends block_base {
            $this->content->text .= 'function toggle(spanid) {' . "\n";
            $this->content->text .= '  if (getspan(spanid).innerHTML == "") {' . "\n";
            $this->content->text .= '    getspan(spanid).innerHTML = vh_content[spanid];' . "\n";
-            $this->content->text .= '    getspan(spanid + "indicator").innerHTML = \'<img src="' . $CFG->wwwroot . '/blocks/admin_tree/open.gif" alt="'.$strfolderopened.'" />\';' . "\n";
+            $this->content->text .= '    getspan(spanid + "indicator").innerHTML = \'<img src="' . $CFG->pixpath . '/i/open.gif" alt="'.$strfolderopened.'" />\';' . "\n";
            $this->content->text .= '  } else {' . "\n";
            $this->content->text .= '    vh_content[spanid] = getspan(spanid).innerHTML;' . "\n";
            $this->content->text .= '    getspan(spanid).innerHTML = "";' . "\n";
-            $this->content->text .= '    getspan(spanid + "indicator").innerHTML = \'<img src="' . $CFG->wwwroot . '/blocks/admin_tree/closed.gif" alt="'.$strfolderclosed.'" />\';' . "\n";
+            $this->content->text .= '    getspan(spanid + "indicator").innerHTML = \'<img src="' . $CFG->pixpath . '/i/closed.gif" alt="'.$strfolderclosed.'" />\';' . "\n";
            $this->content->text .= '  }' . "\n";
            $this->content->text .= '}' . "\n";

@@ -156,13 +157,13 @@ class block_admin_tree extends block_base {
            $this->content->text .= '  if (getspan(spanid).innerHTML !== "") {' . "\n";
            $this->content->text .= '    vh_content[spanid] = getspan(spanid).innerHTML;' . "\n";
            $this->content->text .= '    getspan(spanid).innerHTML = "";' . "\n";
-            $this->content->text .= '    getspan(spanid + "indicator").innerHTML = \'<img src="' . $CFG->wwwroot . '/blocks/admin_tree/closed.gif" alt="'.$strfolderclosed.'" />\';' . "\n";
+            $this->content->text .= '    getspan(spanid + "indicator").innerHTML = \'<img src="' . $CFG->pixpath . '/i/closed.gif" alt="'.$strfolderclosed.'" />\';' . "\n";
            $this->content->text .= '  }' . "\n";
            $this->content->text .= '}' . "\n";

            $this->content->text .= 'function expand(spanid) {' . "\n";
            $this->content->text .= '  getspan(spanid).innerHTML = vh_content[spanid];' . "\n";
-            $this->content->text .= '  getspan(spanid + "indicator").innerHTML = \'<img src="' . $CFG->wwwroot . '/blocks/admin_tree/open.gif" alt="'.$strfolderopened.'" />\';' . "\n";
+            $this->content->text .= '  getspan(spanid + "indicator").innerHTML = \'<img src="' . $CFG->pixpath . '/i/open.gif" alt="'.$strfolderopened.'" />\';' . "\n";
            $this->content->text .= '}' . "\n";

            $this->content->text .= 'function expandall() {' . "\n";
@@ -195,7 +196,7 @@ class block_admin_tree extends block_base {
            $searchcontent = isset($CFG->adminsearchquery) ? $CFG->adminsearchquery : '';

            $this->content->footer = '<div class="adminsearchform">'.
-                                     '<form action="'.$CFG->wwwroot.'/admin/search.php" method="get"><div>'.
+                                     '<form action="'.$CFG->wwwroot.'/'.$CFG->admin.'/search.php" method="get"><div>'.
                                     '<label for="query" class="accesshide">'.get_string('searchinsettings', 'admin').'</label>'.
                                     '<input type="text" name="query" id="query" size="8" value="'.s($searchcontent).'" />'.
                                     '<input type="submit" value="'.get_string('search').'" /></div>'.
@@ -45,6 +45,12 @@ class block_calendar_month extends block_base {
        // We 'll need this later
        calendar_set_referring_course($courseshown);

+        // MDL-9059, set to show this course when admins go into a course, then unset it.
+        if ($COURSE->id != SITEID && !isset($SESSION->cal_courses_shown[$COURSE->id]) && has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM))) {
+            $courseset = true;
+            $SESSION->cal_courses_shown[$COURSE->id] = $COURSE;
+        }
+    
        // Be VERY careful with the format for default courses arguments!
        // Correct formatting is [courseid] => 1 to be concise with moodlelib.php functions.
        calendar_set_filters($courses, $group, $user, $filtercourse, $filtercourse);
@@ -63,6 +69,11 @@ class block_calendar_month extends block_base {
            $this->content->text .= '<div class="filters">'.calendar_filter_controls('course', '', $COURSE).'</div>';
            
        }
+        
+        // MDL-9059, unset this so that it doesn't stay in session
+        if (!empty($courseset)) {
+            unset($SESSION->cal_courses_shown[$COURSE->id]);
+        }

        return $this->content;
    }
@@ -53,10 +53,10 @@ class block_course_list extends block_list {
                if (has_capability('moodle/course:update', get_context_instance(CONTEXT_SYSTEM)) || empty($CFG->block_course_list_hideallcourseslink)) {
                    $this->content->footer = "<a href=\"$CFG->wwwroot/course/index.php\">".get_string("fulllistofcourses")."</a> ...";
                }
-                $this->get_remote_courses();
-                if ($this->content->items) { // make sure we don't return an empty list
-                    return $this->content;
-                }
+            }
+            $this->get_remote_courses();
+            if ($this->content->items) { // make sure we don't return an empty list
+                return $this->content;
            }
        }

@@ -208,5 +208,17 @@ class block_glossary_random extends block_base {
        return false;
    }

+    /**
+     * Executed after block instance has been created, we use it to recode
+     * the glossary config setting to point to the new (restored) one
+     */
+    function after_restore($restore) {
+    /// We need to transform the glossary->id from the original one to the restored one
+        if ($rec = backup_getid($restore->backup_unique_code, 'glossary', $this->config->glossary)) {
+            $this->config->glossary = $rec->new_id;
+            $this->instance_config_commit();
+        }
+    }
+
 }
 ?>
@@ -12,7 +12,7 @@ class block_html extends block_base {
    }

    function specialization() {
-        $this->title = isset($this->config->title) ? $this->config->title : get_string('newhtmlblock', 'block_html');
+        $this->title = isset($this->config->title) ? format_string($this->config->title) : get_string('newhtmlblock', 'block_html');
    }

    function instance_allow_multiple() {
@@ -24,8 +24,13 @@ class block_html extends block_base {
            return $this->content;
        }

-        $filteropt = new stdClass;
-        $filteropt->noclean = true;
+        if (!empty($this->instance->pinned) or $this->instance->pagetype === 'course-view') {
+            // fancy html allowed only on course page and in pinned blocks for security reasons
+            $filteropt = new stdClass;
+            $filteropt->noclean = true;
+        } else {
+            $filteropt = null;
+        }

        $this->content = new stdClass;
        $this->content->text = isset($this->config->text) ? format_text($this->config->text, FORMAT_HTML, $filteropt) : '';
@@ -1,4 +1,11 @@
-<?php $usehtmleditor = can_use_html_editor(); ?>
+<?php
+    $usehtmleditor = can_use_html_editor();
+
+    $text = isset($this->config->text) ? $this->config->text : '';
+    if (empty($this->instance->pinned) and $this->instance->pagetype !== 'course-view') {
+        $text = clean_text($text, FORMAT_HTML);
+    }
+?>
 <table cellpadding="9" cellspacing="0">
 <tr valign="top">
    <td align="right"><?php print_string('configtitle', 'block_html'); ?>:</td>
@@ -6,7 +13,7 @@
 </tr>
 <tr valign="top">
    <td align="right"><?php print_string('configcontent', 'block_html'); ?>:</td>
-    <td><?php print_textarea($usehtmleditor, 25, 50, 0, 0, 'text', isset($this->config->text)?$this->config->text:'') ?></td>
+    <td><?php print_textarea($usehtmleditor, 25, 50, 0, 0, 'text', $text) ?></td>
 </tr>
 <tr>
    <td colspan="3" align="center">
--- a/Show More
+++ b/Show More