Release 1.8.6

(mnet-enabled) course. (backport from 1.9)

admin/auth.php

@@ -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;
     }
 }
 

admin/auth_config.php

@@ -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,32 +51,39 @@ 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);
 
 // choose an authentication method
 echo "<form $CFG->frametarget id=\"authmenu\" method=\"post\" action=\"auth_config.php\">\n";
+echo "<div>\n";
 echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\" />\n";
 echo "<input type=\"hidden\" name=\"auth\" value=\"".$auth."\" />\n";
 
 // auth plugin description
 print_simple_box_start('center', '80%');
-print_heading($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);
 print_simple_box_end();
-echo '<center><p><input type="submit" value="' . get_string("savechanges") . "\" /></p></center>\n";
+echo '<p style="text-align: center"><input type="submit" value="' . get_string("savechanges") . "\" /></p>\n";
+echo "</div>\n";
 echo "</form>\n";
 
 admin_externalpage_print_footer($adminroot);
@@ -146,7 +154,7 @@ function print_auth_lock_options ($auth, $user_fields, $helptext, $retrieveopts,
             echo '</td><td>';
 
             echo "<input id=\"lockconfig_{$varname}\" name=\"lockconfig_{$varname}\" type=\"text\" size=\"30\" value=\"{$pluginconfig->$varname}\" />";
-            echo '<div align="right">';
+            echo '<div style="text-align: right">';
             echo '<label for="menulockconfig_field_updatelocal_'.$field.'">'.get_string('auth_updatelocal', 'auth') . '</label>&nbsp;';
             choose_from_menu($updatelocaloptions, "lockconfig_field_updatelocal_{$field}", $pluginconfig->{"field_updatelocal_$field"}, "");
             echo '<br />';

admin/block.php

@@ -59,7 +59,7 @@
 
     print_heading($strblockname);
 
-    print_simple_box('<center>'.get_string('configwarning', 'admin').'</center>', 'center', '50%');
+    print_simple_box(get_string('configwarning', 'admin'), 'center', '50%');
     echo '<br />';
 
     echo '<form method="post" action="block.php">';

admin/blocks.php

@@ -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>";

admin/cron.php

@@ -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.');
                 }
             }
@@ -137,18 +149,31 @@
 
     if (!empty($CFG->langcache)) {
         mtrace('Updating languages cache');
-        get_list_of_languages();
+        get_list_of_languages(true);
     }
 
     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');
@@ -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)

admin/delete.php

@@ -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') {

admin/environment.xml

@@ -117,6 +117,156 @@
           <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_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" />
+    </DATABASE>
+    <PHP version="5.2.0" 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="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="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </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_CHECKS>
+  </MOODLE>
 </COMPATIBILITY_MATRIX>

admin/filter.php

@@ -74,21 +74,21 @@
     admin_externalpage_print_header($adminroot);
     print_heading( $filtername );
 
-    print_simple_box("<center>".get_string("configwarning", "admin")."</center>", "center", "50%");
+    print_simple_box(get_string("configwarning", "admin"), "center", "50%");
     echo "<br />";
 
     print_simple_box_start("center",'');
 
     ?>
     <form action="filter.php?filter=<?php echo urlencode($param->filter); ?>" method="post">
+    <div style="text-align: center">
     <input type="hidden" name="sesskey" value="<?php echo sesskey(); ?>" />
 
     <?php include "$CFG->dirroot/$param->filter/filterconfig.html"; ?>
 
-    <center>
         <input type="submit" name="submit" value="<?php print_string('savechanges'); ?>" />
         <input type="submit" name="reset" value="<?php echo print_string('resettodefaults'); ?>" />
-    </center>
+    </div>
     </form>
 
     <?php

admin/index.php

@@ -189,10 +189,16 @@
     /// Continue with the instalation
         $db->debug = false;
         if ($status) {
+            //ugly hack - install new groups: MDL-9217
+            require("$CFG->dirroot/group/version.php");
+            set_config('group_version', $group_version);
+            //install_group_db();
+
             // Install the roles system.
             moodle_install_roles();
             set_config('statsrolesupgraded',time());
 
+
             // Write default settings unconditionally (i.e. even if a setting is already set, overwrite it)
             // (this should only have any effect during initial install).
             $adminroot = admin_get_root();
@@ -276,16 +282,21 @@
                 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" />';
                     echo '</div>';
-                    echo '<div class="continuebutton"><input name="autopilot" id="autopilot" type="checkbox" value="0" /><label for="autopilot">'.get_string('unattendedoperation', 'admin').'</label>';
+                    echo '<div class="continuebutton"><input name="autopilot" id="autopilot" type="checkbox" value="1" /><label for="autopilot">'.get_string('unattendedoperation', 'admin').'</label>';
                     echo '<br /><br /><input type="submit" value="'.get_string('continue').'" /></div>';
                     echo '</form>';
                 }
@@ -320,6 +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");
+                        // 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);
@@ -367,6 +382,11 @@
         }
     }
 
+/// ugly hack - convert to new groups if upgrading from 1.7; must be reworked
+    require_once("$CFG->dirroot/group/db/upgrade.php");
+    upgrade_group_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
+
+
 /// Find and check all main modules and load them up or upgrade them if necessary
 /// first old *.php update and then the new upgrade.php script
     upgrade_activity_modules("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
@@ -394,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");
 
@@ -402,10 +425,6 @@
     require_once("$CFG->dirroot/lib/locallib.php");
     upgrade_local_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
-/// Check for new groups and upgrade if necessary. TODO:
-    require_once("$CFG->dirroot/group/db/upgrade.php");
-    upgrade_group_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
-
 /// Check for changes to RPC functions
     require_once($CFG->dirroot.'/admin/mnet/adminlib.php');
     upgrade_RPC_functions("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
@@ -479,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 !!!");
         }
     }
@@ -540,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');
@@ -583,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>';

admin/lang.php

@@ -82,7 +82,7 @@
     if (!$mode) {
         print_box_start();
         $currlang = current_language();
-        $langs = get_list_of_languages();
+        $langs = get_list_of_languages(false, true);
         popup_form ("$CFG->wwwroot/$CFG->admin/lang.php?lang=", $langs, "chooselang", $currlang, "", "", "", false, 'self', $strcurrentlanguage.':');
         print_heading("<a href=\"lang.php?mode=missing\">$strmissingstrings</a>");
         print_heading("<a href=\"lang.php?mode=compare\">$streditstrings</a>");
@@ -455,7 +455,7 @@
                     echo $missingnext . '</td>';
 
                 } else {
-                    echo '<td bgcolor="'.$cellcolour.'" valign="top">'.$value.'</td>';
+                    echo '<td '.$cellcolour.' valign="top">'.$value.'</td>';
                 }
                 echo '</tr>'."\n";
             }
@@ -468,8 +468,10 @@
                 echo '</td></tr>';
             }
             echo '</table>';
-            echo '</div>'; 
-            echo '</form>'; 
+            if ($editable) {
+                echo '</div>'; 
+                echo '</form>'; 
+            }
 
         } else {
             // no $currentfile specified
@@ -526,10 +528,12 @@ function lang_save_file($path, $file, $strings, $local, $packstrings) {
         $value = lang_fix_value_before_save($value);
         if ($id == "string" and $value != ""){
             if ((!$local) || (lang_fix_value_from_file($packstrings[$stringname]) <> lang_fix_value_from_file($value))) {
+                // Either we are saving the master language pack
+                // or we are saving local language pack and the strings differ.
                 fwrite($f,"\$string['$stringname'] = '$value';\n");
-                if (LANG_KEEP_ORPHANS && isset($orphans[$stringname])) {
-                    unset($orphans[$stringname]);
-                }
+            }
+            if (LANG_KEEP_ORPHANS && isset($orphans[$stringname])) {
+                unset($orphans[$stringname]);
             }
         }
     }
@@ -560,6 +564,7 @@ function lang_fix_value_from_file($value='') {
     $value = trim($value);                             // Delete leading/trailing white space
     $value = str_replace("\\","",$value);              // Delete all slashes
     $value = str_replace("%%","%",$value);
+    $value = str_replace("&","&amp;",$value);          // Fixes MDL-9248
     $value = str_replace("<","&lt;",$value);
     $value = str_replace(">","&gt;",$value);
     $value = str_replace('"',"&quot;",$value);
@@ -578,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

admin/langimport.php

@@ -29,6 +29,12 @@
 
     admin_externalpage_print_header($adminroot);
 
+    //reset and diagnose lang cache permissions
+    @unlink($CFG->dataroot.'/cache/languages');
+    if (file_exists($CFG->dataroot.'/cache/languages')) {
+        notify('Language cache can not be deleted, please check permissions in dataroot.');
+    }
+    get_list_of_languages(true); //refresh lang cache
 
     switch ($mode){
 
@@ -56,7 +62,7 @@
                         break;
 
                         case INSTALLED:
-                            @unlink($CFG->dataroot.'/cache/languages');
+                            get_list_of_languages(true); //refresh lang cache
                             redirect('langimport.php', get_string('langpackupdated','admin',$pack), -1, $adminroot);
                         break;
 
@@ -103,14 +109,14 @@
                 if (file_exists($dest2)){
                     $rm2 = remove_dir($dest2);
                 }
+                get_list_of_languages(true); //refresh lang cache
                 //delete the direcotries
                 if ($rm1 or $rm2) {
-                    redirect('langimport.php', get_string('langpackremoved','admin'));
+                    redirect('langimport.php', get_string('langpackremoved','admin'), 3, $adminroot);
                 } else {    //nothing deleted, possibly due to permission error
                     error('An error has occurred, language pack is not completely uninstalled, please check file permissions');
                 }
             }
-            @unlink($CFG->dataroot.'/cache/languages');
         break;
 
         case UPDATE_ALL_LANG:    //1 click update for all updatable language packs
@@ -120,8 +126,7 @@
             $source = 'http://download.moodle.org/lang16/languages.md5';
             $md5array = array();
             $updated = 0;    //any packs updated?
-            unset($CFG->langlist);   // ignore admin's langlist
-            $alllangs = array_keys(get_list_of_languages());
+            $alllangs = array_keys(get_list_of_languages(false, true)); //get all available langs
             $lang16 = array();   //all the Moodle 1.6 unicode lang packs (updated and not updated)
             $packs = array();    //all the packs that needs updating
 
@@ -247,8 +252,7 @@
             echo '<form id="uninstallform" action="langimport.php?mode=4" method="post">';
             echo '<fieldset class="invisiblefieldset">';
             echo '<input name="sesskey" type="hidden" value="'.sesskey().'" />';
-            unset($CFG->langlist);   // ignore admin's langlist
-            $installedlangs = get_list_of_languages();
+            $installedlangs = get_list_of_languages(false, true);
 
             /// display installed langs here
 
@@ -304,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>';

admin/mnet/adminlib.php

@@ -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();

admin/mnet/delete.html

@@ -5,8 +5,8 @@ print_header("$site->shortname: $strmnetsettings", "$site->fullname",
 
 print_heading(get_string('mnetsettings', 'mnet'));
 ?>
-<center>
-    <table align="center"   class="generalbox" border="0" cellpadding="5" cellspacing="0">
+<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->
+    <table class="generalbox standard" border="0" cellpadding="5" cellspacing="0">
         <tr>
             <td  class="generalboxcontent">
             <table cellpadding="9" cellspacing="0" >
@@ -14,7 +14,7 @@ print_heading(get_string('mnetsettings', 'mnet'));
                     <td colspan="2" class="header" cellpadding="0"><span><?php print_string('deleteaserver', 'mnet'); ?>Deleting a Server</span></td>
                 </tr>
                 <?php
-                if (count($warn) > 0):
+                if (count($warn) > 0){
                 ?>
                 <tr valign="top">
                     <td align="right" colspan="2"><?php print_string('receivedwarnings','mnet'); ?>:<br />
@@ -22,7 +22,7 @@ print_heading(get_string('mnetsettings', 'mnet'));
                     </td>
                 </tr>
                 <?php
-                endif;
+                }
                 ?>
                 <tr valign="top">
                     <td colspan="2"><?php print_string('reallydeleteserver','mnet'); ?>: "<?php echo $mnet_peer->name; ?>"?</td>
@@ -46,7 +46,7 @@ print_heading(get_string('mnetsettings', 'mnet'));
             </td>
         </tr>
     </table>
-</center>
+</div>
 <?php
 print_footer();
 ?>

admin/mnet/enr_course_enrol.html

@@ -1,10 +1,11 @@
 
 <form id="assignform" method="post" action="">
+<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->
 <input type="hidden" name="previoussearch" value="<?php p($previoussearch) ?>" />
 <input type="hidden" name="courseid" value="<?php p($courseid) ?>" />
 <input type="hidden" name="host" value="<?php p($mnet_peer->id) ?>" />
 <input type="hidden" name="sesskey" value="<?php p(sesskey()) ?>" />
-  <table align="center" border="0" cellpadding="5" cellspacing="0">
+  <table class="generaltable" border="0" cellpadding="5" cellspacing="0">
     <tr>
       <td valign="top">
           <?php print_string('existingusers', 'role', count($mnetenrolledusers)); ?>
@@ -99,4 +100,5 @@
       <td valign="top"></td>
     </tr>
   </table>
+  </div>
 </form>

admin/mnet/enr_courses.php

@@ -29,9 +29,10 @@
     print_box('<strong>' . s($host->name) . ' </strong><br />'
               . get_string("enrolcourses_desc", "mnet"));
 
-    echo "<hr />";
+    echo '<hr />';
 
-    print ('<table align="center" >');
+    echo '<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->'
+           . '<table class="generaltable">';
 
     $icon  = "<img src=\"$CFG->pixpath/i/course.gif\"".
     " class=\"icon\" alt=\"".get_string("course")."\" />";
@@ -39,7 +40,7 @@
     foreach ($courses as $course) {
         $link = $CFG->wwwroot . '/admin/mnet/enr_course_enrol.php?'
             . "host={$mnethost}&amp;courseid={$course->id}&amp;sesskey={$USER->sesskey}";
-        print ('<tr>'
+        echo '<tr>'
                . "<td>$icon</td>"
                . "<td><a href=\"$link\">".format_string($course->fullname). "</a></td>"
                . '</tr><tr>'
@@ -48,9 +49,9 @@
                . '</tr><tr>'
                . '<td></td>'
                . "<td align=\"left\" >{$course->summary}</td>"
-               . '</tr>');
+               . '</tr>';
     }
-    print ('</table>');
+    echo '</table></div>';
 
     admin_externalpage_print_footer($adminroot);
 

admin/mnet/enr_hosts.php

@@ -22,19 +22,20 @@
 
     print_box(get_string("remoteenrolhosts_desc", "mnet"));
 
-    echo "<hr />";
+    echo '<hr />';
 
     if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict') {
         print_box(get_string('mnetdisabled','mnet'));
     }
 
-    print ('<table align="center" cellspacing="0" cellpadding="5"  width="500" id="hosts" class="generaltable generalbox" >'
+    echo '<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->'
+           . '<table cellspacing="0" cellpadding="5" id="hosts" class="generaltable generalbox" >'
            . '<tr>'
            . '<th class="header c0"> '.get_string('host', 'mnet').' </th>'
            . '<th class="header c1"> '.get_string('enrolments', 'mnet').' </th>'
            . '<th class="header c2"> '.get_string('courses', 'mnet').' </th>'
            // . '<th class="header c3"> &nbsp; </th>'
-           . '</tr>');
+           . '</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}";
@@ -44,16 +45,17 @@
         }
         $enrolcount = get_field_sql("SELECT count(id) FROM {$CFG->prefix}mnet_enrol_assignments WHERE hostid={$host->id}");
 
-        print ('<tr>'
+        echo '<tr>'
                . "<td><a href=\"{$coursesurl}\">{$host->name}</a></td>"
                . "<td align=\"center\" >$enrolcount</td>"
                . "<td align=\"center\" >$coursecount - <a href=\"{$coursesurl}\">".get_string('editenrolments', 'mnet')."</a></td>"
                // TODO: teach report/log/index.php to show per-host-logs
                // . '<td align="center" ><a href="{$CFG->wwwroot}/admin/report/log/index.php?course_host={$host->id}">'
                // . get_string('logs', 'mnet').'</a> </td>'
-               . '</tr>');
+               . '</tr>';
     }
-    print ('</table>');
+    echo '</table>'
+       . '</div>';
 
     admin_externalpage_print_footer($adminroot);
 

admin/mnet/index.php

@@ -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 {
@@ -112,8 +112,8 @@
                 <tr valign="top">
                     <td align="right"><?php print_string('net', 'mnet'); ?>:</td>
                     <td><input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
-                        <input type="radio" name="mode" value="off" <?php echo ("off" == $CFG->mnet_dispatcher_mode)? 'checked="true"' : '' ?> /> <?php print_string('off', 'mnet'); ?> <br />
-                        <input type="radio" name="mode" value="strict" <?php echo ("strict" == $CFG->mnet_dispatcher_mode)? 'checked="true"' : '' ?> /> <?php print_string('on', 'mnet'); ?><br />
+                        <input type="radio" name="mode" value="off" <?php echo ("off" == $CFG->mnet_dispatcher_mode)? 'checked="checked"' : '' ?> /> <?php print_string('off', 'mnet'); ?> <br />
+                        <input type="radio" name="mode" value="strict" <?php echo ("strict" == $CFG->mnet_dispatcher_mode)? 'checked="checked"' : '' ?> /> <?php print_string('on', 'mnet'); ?><br />
                         <input type="submit" name="submit" value="<?php print_string('savechanges'); ?>" />
                     </td>
                 </tr>

admin/mnet/mnet_review.html

@@ -19,6 +19,7 @@ print_tabs(array($tabs), 'mnetdetails');
 print_simple_box_start("center", "");
 ?>
 <form method="post" action="peers.php">
+<div>
 <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
 <input type="hidden" name="step" value="commit" />
 <input type="hidden" name="last_connect_time" value="<?php echo $mnet_peer->last_connect_time; ?>" />
@@ -74,7 +75,7 @@ if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0) {
 </tr>
 <?php
 
-if(!empty($currentkey)):
+if(!empty($currentkey)) {
 ?>
     <tr>
         <td align="right" valign="top"></td>
@@ -85,30 +86,30 @@ if(!empty($currentkey)):
         <td valign="top"><pre style="font-size: 8px;"><?php echo $currentkey;?></pre></td>
     </tr>
 <?php
-endif;
+}
 
-if (isset($mnet_peer->id) && $mnet_peer->id > 0):
+if (isset($mnet_peer->id) && $mnet_peer->id > 0) {
 ?>
     <tr>
         <td align="right" valign="top"><?php print_string('last_connect_time', 'mnet'); ?>:</td>
         <td valign="top"><?php echo ($mnet_peer->last_connect_time == 0)? get_string('never','mnet') : date('H:i:s d/m/Y',$mnet_peer->last_connect_time);?></td>
     </tr>
 <?php
-endif;
+}
 
-if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0):
+if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0){
 ?>
     <tr>
         <td align="right" valign="top"><?php print_string('deleted'); ?>:</td>
         <td valign="top">
-            <input type="radio" name="deleted" value="0" checked="true" /> <?php print_string('reenableserver','mnet'); ?><br />
+            <input type="radio" name="deleted" value="0" checked="checked" /> <?php print_string('reenableserver','mnet'); ?><br />
             <input type="radio" name="deleted" value="1"  /> <?php print_string('yes'); ?><br />
         </td>
     </tr>
 <?php
-endif;
+}
 
-if (isset($mnet_peer->ip_address) && '' != $mnet_peer->ip_address):
+if (isset($mnet_peer->ip_address) && '' != $mnet_peer->ip_address){
 ?>
     <tr>
         <td align="right" valign="top"><?php print_string('ipaddress', 'mnet');
@@ -119,13 +120,14 @@ if (isset($mnet_peer->ip_address) && '' != $mnet_peer->ip_address):
     </tr>
 
 <?php
-endif;
+}
 ?>
 <tr>
     <td></td>
     <td><input type="submit" value="<?php print_string("savechanges"); ?>" /></td>
 </tr>
 </table>
+</div>
 </form>
 <?php
 print_simple_box_end();

admin/mnet/mnet_services.html

@@ -16,21 +16,22 @@ print_simple_box_start("center", "");
 ?>
 
 <form method="post" action="mnet_services.php">
+<div>
 <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
 <input type="hidden" name="step" value="<?php echo $mnet_peer->nextstep; ?>" />
 <input type="hidden" name="hostid" value="<?php echo ($mnet_peer->id)?  $mnet_peer->id : '0' ; ?>" />
 <table cellpadding="9" cellspacing="0" >
 <?php 
-    foreach($myservices as $name => $versions):
+    foreach($myservices as $name => $versions) {
     $version = current($versions);
 ?>
 <tr>
     <td align="left" valign="top" colspan="2">
     <h3><?php echo get_string($name.'_name', $version['parent_type'].'_'.$version['parent'] , $mnet_peer->name); ?></h3>
-    <p><?php echo get_string($name.'_description', $version['parent_type'].'_'.$version['parent'], $mnet_peer->name); ?></p>
+    <?php echo get_string($name.'_description', $version['parent_type'].'_'.$version['parent'], $mnet_peer->name); ?>
 <?php
         $breakstring = '';
-        foreach($versions as $version):
+        foreach($versions as $version){
             if (count($versions) > 1) {
                 $versionstring = '('.get_string('version','mnet') .' '.$version['apiversion'].')';
             } else {
@@ -40,16 +41,37 @@ print_simple_box_start("center", "");
             echo $breakstring;
 ?>
     <input type="hidden" name="exists[<?php echo  $version['serviceid']; ?>]" value="1" />
-    <input type="checkbox" name="publish[<?php echo $version['serviceid']; ?>]" <?php echo (!empty($version['I_publish']))? 'checked="checked" ': '' ; ?>/><?php print_string('publish','mnet'); ?><?php echo $versionstring; if (!empty($version['hostsubscribes'])) echo '<a href="#" title="'.get_string('issubscribed','mnet', $mnet_peer->name).'">&radic;</a> '; if (!empty($version['allhosts_publish'])) print_string("enabled_for_all",'mnet',!empty($version['I_publish']));  ?><br />
-    <input type="checkbox" name="subscribe[<?php echo $version['serviceid']; ?>]" <?php echo (!empty($version['I_subscribe']))? 'checked="checked" ': '' ; ?>/><?php print_string('subscribe','mnet'); ?><?php echo $versionstring; if (!empty($version['hostpublishes'])) echo '<a href="#" title="'.get_string('ispublished','mnet', $mnet_peer->name).'">&radic;</a> '; if (!empty($version['allhosts_subscribe'])) print_string("enabled_for_all",'mnet',!empty($version['I_subscribe'])); ?><br />
-<?php
+    <input type="checkbox" name="publish[<?php echo $version['serviceid']; ?>]" <?php echo (!empty($version['I_publish']))? 'checked="checked" ': '' ; ?>/>
+<?php 
+            print_string('publish','mnet');
+            echo $versionstring; 
+            if (!empty($version['hostsubscribes'])) { 
+                echo '<a href="#" title="'.get_string('issubscribed','mnet', $mnet_peer->name).'">&radic;</a> '; 
+            }
+            if (!empty($version['allhosts_publish'])) { 
+                print_string("enabled_for_all",'mnet',!empty($version['I_publish']));
+            } 
+            echo '<br />';
+?>
+    <input type="checkbox" name="subscribe[<?php echo $version['serviceid']; ?>]" <?php echo (!empty($version['I_subscribe']))? 'checked="checked" ': '' ; ?>/>
+<?php 
+            print_string('subscribe','mnet');
+            echo $versionstring; 
+            if (!empty($version['hostpublishes'])) { 
+                echo '<a href="#" title="'.get_string('ispublished','mnet', $mnet_peer->name).'">&radic;</a> ';
+            } 
+            if (!empty($version['allhosts_subscribe'])) {
+                print_string("enabled_for_all",'mnet',!empty($version['I_subscribe']));
+            }
+            
+            echo '<br />';  
             $breakstring = '. . . . . . . . . . . . . . . . . . . . . . . . <br>';
-        endforeach;
+        } // end foreach
 ?>
     </td>
 </tr>
 <?php
-    endforeach;
+    } // end foreach
 ?>
 <tr>
     <td align="left" valign="top" colspan="2">
@@ -70,6 +92,7 @@ print_simple_box_start("center", "");
     </td>
 </tr>
 </table>
+</div>
 </form>
 <?php
 print_simple_box_end();

admin/mnet/mnet_services.php

@@ -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;

admin/mnet/peers.html

@@ -5,36 +5,38 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict'
     print_box(get_string('mnetdisabled','mnet'));
 }
 ?>
-<center>
-<form  method="post" action="peers.php">
-<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
-<input type="hidden" name="updateregisterall" value="1" />
-<table cellspacing="0" cellpadding="5"  width="500" id="hosts" class="generaltable generalbox" >
-    <tr>
-        <th class="header c0" nowrap="nowrap" colspan="2"><?php print_string('registerallhosts', 'mnet'); ?></th>
-    </tr>
-    <tr>
-        <td class="cell c1" colspan="2"><?php print_string('registerallhostsexplain', 'mnet'); ?></td>
-    </tr>
-    <tr>
-        <td class="cell c1"><input type="checkbox" name="registerallhosts" <?php if (!empty($CFG->mnet_register_allhosts)) echo 'checked="checked" '; ?>/></td>
-        <td class="cell c1"> <?php print_string('registerallhosts', 'mnet'); ?> </td>
-    </tr>
-    <tr>
-        <td align="right" colspan="2"><input type="submit" name="submit" value="<?php print_string('savechanges'); ?>" /></td>
-    </tr>
-</table>
-</form>
-<table cellspacing="0" cellpadding="5" id="hosts" class="generaltable generalbox" >
-    <tr>
-        <th class="header c0" nowrap="nowrap"><?php print_string('site'); ?></th>
-        <th class="header c1" nowrap="nowrap"><?php print_string('system','mnet'); ?></th>
-        <th class="header c2" nowrap="nowrap"><?php print_string('last_connect_time', 'mnet'); ?></th>
-        <th class="header c3" nowrap="nowrap"></th>
-    </tr>
+<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->
+    <form  method="post" action="peers.php">
+        <div>
+            <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+            <input type="hidden" name="updateregisterall" value="1" />
+            <table cellspacing="0" cellpadding="5" class="generaltable generalbox" >
+                <tr>
+                    <th class="header c0" colspan="2"><?php print_string('registerallhosts', 'mnet'); ?></th>
+                </tr>
+                <tr>
+                    <td class="cell c1" colspan="2"><?php print_string('registerallhostsexplain', 'mnet'); ?></td>
+                </tr>
+                <tr>
+                    <td class="cell c1"><input type="checkbox" name="registerallhosts" <?php if (!empty($CFG->mnet_register_allhosts)) echo 'checked="checked" '; ?>/></td>
+                    <td class="cell c1"> <?php print_string('registerallhosts', 'mnet'); ?> </td>
+                </tr>
+                <tr>
+                    <td align="right" colspan="2"><input type="submit" name="submit" value="<?php print_string('savechanges'); ?>" /></td>
+                </tr>
+            </table>
+        </div>
+    </form>
+    <table cellspacing="0" cellpadding="5" class="generaltable generalbox standard" >
+        <tr>
+            <th class="header c0"><?php print_string('site'); ?></th>
+            <th class="header c1"><?php print_string('system','mnet'); ?></th>
+            <th class="header c2"><?php print_string('last_connect_time', 'mnet'); ?></th>
+            <th class="header c3"></th>
+        </tr>
 <?php
 
-    foreach($hosts as $host):
+    foreach($hosts as $host) {
 
         if ($host->last_connect_time == 0) {
             $last_connect = get_string('never');
@@ -46,43 +48,46 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict'
     <tr>
         <td class="cell c0"><a href="peers.php?step=update&amp;hostid=<?php echo $host->id; ?>"><?php echo $host->name; ?></a></td>
         <td class="cell c1"><a href="peers.php?step=update&amp;hostid=<?php echo $host->id; ?>"><?php echo $host->wwwroot; ?></a></td>
-        <td class="cell c2" nowrap="nowrap"><?php if ($host->id != $CFG->mnet_all_hosts_id) echo $last_connect; ?></td>
+        <td class="cell c2"><?php if ($host->id != $CFG->mnet_all_hosts_id) echo $last_connect; ?></td>
         <td class="cell c3">
-<?php   if ($host->id != $CFG->mnet_all_hosts_id): ?>
+<?php   if ($host->id != $CFG->mnet_all_hosts_id){ ?>
             <form method="post" action="delete.php">
+                <div>
                 <input type="hidden" name="hostid" value="<?php echo $host->id; ?>" />
                 <input type="hidden" name="step" value="verify" />
                 <input type="submit" name="submit" value="<?php print_string('delete'); ?>"/>
+                </div>
             </form>
-<?php   endif; ?>
+<?php   } ?>
         </td>
     </tr>
 <?php
-    endforeach;
+    }
 ?>
-    <tr>
-        <td class="cell c4" colspan="4">&nbsp;</td>
-    </tr>
+    </table>
     <form method="post" action="peers.php">
-    <tr>
-        <th class="header c4" nowrap="nowrap" colspan="4">
-            <?php print_string('addnewhost', 'mnet'); ?>
-            <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
-            <input type="hidden" name="step" value="input" />
-        </th>
-    </tr>
-    <tr>
-        <td class="cell c0"></td>
-        <td class="cell c1"><input type="text" name="wwwroot" value="" /></td>
-        <td class="cell c2"></td>
-        <td class="cell c3"></td>
-    </tr>
-    <tr>
-        <td class="cell c4" align="right" colspan="4"><input type="submit" value="<?php print_string('addhost','mnet'); ?>" /></td>
-    </tr>
+        <table cellspacing="0" cellpadding="5" class="generaltable generalbox standard" >
+            
+            <tr>
+                <th class="header c4" colspan="4">
+                    <?php print_string('addnewhost', 'mnet'); ?>
+                    <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+                    <input type="hidden" name="step" value="input" />
+                </th>
+            </tr>
+            <tr>
+                <td class="cell c0">wwwroot:</td>
+                <td class="cell c1"><input type="text" name="wwwroot" value="" /></td>
+                <td class="cell c2"></td>
+                <td class="cell c3"></td>
+            </tr>
+            <tr>
+                <td class="cell c4" align="right" colspan="4"><input type="submit" value="<?php print_string('addhost','mnet'); ?>" /></td>
+            </tr>
+        
+        </table>
     </form>
-</table>
-</center>
+</div>
 <?php
 admin_externalpage_print_footer($adminroot);
-?>
+?>

admin/mnet/peers.php

@@ -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')) {

admin/mnet/trustedhosts.html

@@ -1,36 +1,39 @@
 <?php
 admin_externalpage_print_header($adminroot);
 ?>
-<center>
-<table cellspacing="0" cellpadding="5"  width="500" id="hosts" class="generaltable generalbox" >
+<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->
+<table cellspacing="0" cellpadding="5"  class="generaltable generalbox" >
     <tr>
-        <th class="header c0" nowrap="nowrap" colspan="2"><?php print_string('trustedhosts', 'mnet'); ?></th>
+        <th class="header c0" colspan="2"><?php print_string('trustedhosts', 'mnet'); ?></th>
     </tr>
     <tr>
         <td class="cell c1" colspan="2"><?php print_string('trustedhostsexplain', 'mnet'); ?></td>
     </tr>
     <tr>
-        <td class="cell c1" colspan="2"><form  method="post" action="trustedhosts.php">
-            <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
-            <textarea name="hostlist" cols="40" rows="20"><?php echo $trusted_hosts; ?></textarea><br />
-            <input type="submit" value="<?php print_string('savechanges'); ?>" />
+        <td class="cell c1" colspan="2">
+            <form  method="post" action="trustedhosts.php">
+            <div>
+                <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+                <textarea name="hostlist" cols="40" rows="20"><?php echo $trusted_hosts; ?></textarea><br />
+                <input type="submit" value="<?php print_string('savechanges'); ?>" />
+            </div>
             </form>
         </td>
     </tr>
 </table>
-<table cellspacing="0" cellpadding="5"  width="500" id="hosts" class="generaltable generalbox" >
+<table cellspacing="0" cellpadding="5" class="generaltable generalbox" >
     <tr>
-        <th class="header c0" nowrap="nowrap" colspan="2"><?php print_string('testtrustedhosts', 'mnet'); ?></th>
+        <th class="header c0" colspan="2"><?php print_string('testtrustedhosts', 'mnet'); ?></th>
     </tr>
 <?php 
-    if (!empty($test_ip_address)):
+    if (!empty($test_ip_address)){
 ?>
     <tr>
         <td class="cell c1" colspan="2">
             <?php
                 if ($in_range) {
                     print_string('is_in_range',  'mnet', $test_ip_address);
-                    echo '<br>';
+                    echo '<br />';
                     print_string('validated_by', 'mnet', $validated_by);
                 } else {
                     print_string('not_in_range',  'mnet', $test_ip_address);
@@ -39,24 +42,27 @@ admin_externalpage_print_header($adminroot);
         </td>
     </tr>
 <?php
-    else:
+   } else {
 ?>
     <tr>
         <td class="cell c1" colspan="2"><?php print_string('testtrustedhostsexplain', 'mnet'); ?></td>
     </tr>
 <?php
-    endif;
+   } 
 ?>
     <tr>
-        <td class="cell c1" colspan="2"><form  method="get" action="trustedhosts.php">
-            <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
-            <input type="text" name="testipaddress" value="<?php echo $test_ip_address; ?>" />
-            <input type="submit" value="<?php print_string('go'); ?>" />
+        <td class="cell c1" colspan="2">
+            <form  method="get" action="trustedhosts.php">
+            <div>
+                <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+                <input type="text" name="testipaddress" value="<?php echo $test_ip_address; ?>" />
+                <input type="submit" value="<?php print_string('go'); ?>" />
+            </div>
             </form>
         </td>
     </tr>
 </table>
-</center>
+</div>
 <?php
 admin_externalpage_print_footer($adminroot);
-?>
+?>

admin/mnet/trustedhosts.php

@@ -49,7 +49,6 @@
 
     /// If data submitted, process and store
     if (($form = data_submitted()) && confirm_sesskey()) {
-        echo 'a';
         $hostlist = preg_split("/[\s,]+/", $form->hostlist);
         foreach($hostlist as $host) {
             list($address, $mask) = explode('/', $host.'/');

admin/module.php

@@ -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);
 
@@ -55,7 +55,7 @@
 
     print_heading($strmodulename);
 
-    print_simple_box("<center>".get_string("configwarning", 'admin')."</center>", "center", "60%");
+    print_simple_box(get_string("configwarning", 'admin'), "center", "60%");
     echo "<br />";
 
     print_simple_box_start("center", "");

admin/modules.php

@@ -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")) {

admin/multilangupgrade.php

@@ -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);
+                        }
                     }
                 }
             }

admin/process_email.php

@@ -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';
 

admin/report/backups/index.php

@@ -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);
+
+?>

admin/report/courseoverview/reportsgraph.php

@@ -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);
 

admin/report/question/index.php

@@ -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);
+?>

admin/report/simpletest/ex_reporter.php

@@ -45,8 +45,7 @@ class ExHtmlReporter extends HtmlReporter {
 
         $this->strrunonlyfolder = $this->get_string('runonlyfolder');
         $this->strrunonlyfile = $this->get_string('runonlyfile');
-        check_theme_arrows();
-        $this->strseparator = ' <span class="sep">'.$THEME->rarrow.'</span> ';
+        $this->strseparator = get_separator();
     }
 
     /**

admin/roles/allowassign.php

@@ -80,9 +80,9 @@
 
     echo '<form action="allowassign.php" method="post">';
     print_table($table);
-    echo '<div class="buttons"><input type="submit" value="'.get_string('savechanges').'"/></div>';
+    echo '<div class="buttons"><input type="submit" value="'.get_string('savechanges').'"/>';
     echo '<input type="hidden" name="dummy" value="1" />'; // this is needed otherwise we do not know a form has been submitted
-    echo '</form>';
+    echo '</div></form>';
 
     admin_externalpage_print_footer($adminroot);
 

admin/roles/allowoverride.php

@@ -78,9 +78,9 @@
 
     echo '<form action="allowoverride.php" method="post">';
     print_table($table);
-    echo '<div class="buttons"><input type="submit" value="'.get_string('savechanges').'"/></div>';
+    echo '<div class="buttons"><input type="submit" value="'.get_string('savechanges').'"/>';
     echo '<input type="hidden" name="dummy" value="1" />'; // this is needed otherwise we do not know a form has been submitted
-    echo '</form>';
+    echo '</div></form>';
 
     admin_externalpage_print_footer($adminroot);
 

admin/roles/assign.html

@@ -38,15 +38,13 @@
         <br />
         <label title="<?php print_string('hiddenassign') ?>">
             <input type="checkbox" name="hidden" value="1" />
-            <img src="<?php echo $CFG->pixpath; ?>/t/hide.gif" alt="<?php print_string('hiddenassign') ?>" class="hide-show-image" />            <? 
-            helpbutton ('hiddenassign', get_string('hiddenassign'));
-            ?>
+            <img src="<?php echo $CFG->pixpath; ?>/t/hide.gif" alt="<?php print_string('hiddenassign') ?>" class="hide-show-image" />
+            <?php helpbutton('hiddenassign', get_string('hiddenassign')); ?>
         </label>
         <?php check_theme_arrows(); ?>
         <p class="arrow_button">
-            <input name="add" id="add" type="submit" value="<?php echo '&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">
@@ -59,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";
 
@@ -75,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++;
                     }
                 }
             }

admin/roles/assign.php

@@ -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=",

admin/roles/manage.html

@@ -89,7 +89,7 @@
 <?php
     print_heading_with_help(get_string('permissions','role'), 'permissions');
 
-    $strinherit = get_string('inherit','role');
+    $strinherit = get_string('notset','role');
     $strallow = get_string('allow','role');
     $strprevent = get_string('prevent','role');
     $strprohibit = get_string('prohibit','role');
@@ -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)) {

admin/roles/manage.php

@@ -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&roleid='.$roleid);
 
             } else {

admin/roles/override.html

@@ -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) {
 

admin/roles/override.php

@@ -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);
     }
 

admin/roles/tabs.php

@@ -162,6 +162,25 @@ if ($context->contextlevel != CONTEXT_SYSTEM) {    // Print tabs for anything ex
         $activetwo = array();
     }
 
+/// Here other core tabs should go (always calling tabs.php files)
+/// All the logic to decide what to show must be self-cointained in the tabs file
+/// ej.:
+/// include_once($CFG->dirroot . '/grades/tabs.php');
+
+/// Finally, we support adding some 'on-the-fly' tabs here
+/// All the logic to decide what to show must be self-cointained in the tabs file
+    if (isset($CFG->extratabs) && !empty($CFG->extratabs)) {
+        if ($extratabs = explode(',', $CFG->extratabs)) {
+            asort($extratabs);
+            foreach($extratabs as $extratab) {
+            /// Each extra tab mus be one $CFG->dirroot relative file
+                if (file_exists($CFG->dirroot . '/' . $extratab)) {
+                    include_once($CFG->dirroot . '/' . $extratab);
+                }
+            }
+        }
+    }
+
     if (!empty($secondrow)) {
         $tabs = array($toprow, $secondrow);
     } else {

admin/settings/courses.php

@@ -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));

admin/settings/language.php

@@ -6,7 +6,7 @@
 $temp = new admin_settingpage('langsettings', get_string('languagesettings', 'admin'));
 $temp->add(new admin_setting_configselect('lang', get_string('lang', 'admin'), get_string('configlang', 'admin'), current_language(), get_list_of_languages())); // $CFG->lang might be set in installer already, default en or en_utf8 is in setup.php
 $temp->add(new admin_setting_configcheckbox('langmenu', get_string('langmenu', 'admin'), get_string('configlangmenu', 'admin'), 1));
-$temp->add(new admin_setting_configtext('langlist', get_string('langlist', 'admin'), get_string('configlanglist', 'admin'), '', PARAM_NOTAGS));
+$temp->add(new admin_setting_langlist());
 $temp->add(new admin_setting_configcheckbox('langcache', get_string('langcache', 'admin'), get_string('configlangcache', 'admin'), 1));
 $temp->add(new admin_setting_configtext('locale', get_string('localetext', 'admin'), get_string('configlocale', 'admin'), '', PARAM_FILE));
 

admin/settings/location.php

@@ -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();

admin/settings/security.php

@@ -25,7 +25,7 @@ $temp->add(new admin_setting_configselect('fullnamedisplay', get_string('fullnam
               'lastname firstname' => get_string('lastname') . ' + ' . get_string('firstname'),
               'firstname' => get_string('firstname'))));
 $temp->add(new admin_setting_configcheckbox('extendedusernamechars', get_string('extendedusernamechars', 'admin'), get_string('configextendedusernamechars', 'admin'), 0));
-$temp->add(new admin_setting_configtext('sitepolicy', get_string('sitepolicy', 'admin'), get_string('configsitepolicy', 'admin'), '', PARAM_URL));
+$temp->add(new admin_setting_configtext('sitepolicy', get_string('sitepolicy', 'admin'), get_string('configsitepolicy', 'admin'), '', PARAM_RAW));
 $temp->add(new admin_setting_configselect('bloglevel', get_string('bloglevel', 'admin'), get_string('configbloglevel', 'admin'), 4, array(5 => get_string('worldblogs','blog'),
                                                                                                                                           4 => get_string('siteblogs','blog'),
                                                                                                                                           3 => get_string('courseblogs','blog'),
@@ -35,6 +35,7 @@ $temp->add(new admin_setting_configselect('bloglevel', get_string('bloglevel', '
 
 $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'), 0));
 
 $ADMIN->add('security', $temp);
 

admin/settings/server.php

@@ -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),

admin/stickyblocks.php

@@ -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>';

admin/timezoneimport.php

@@ -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);

admin/upgradesettings.php

@@ -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
 

admin/uploaduser.php

@@ -67,8 +67,11 @@ if ($um->preprocess_files() && confirm_sesskey()) {
         @apache_child_terminate();
     }
 
-    //Fix mac/dos newlines
     $text = my_file_get_contents($filename);
+    //trim utf-8 bom
+    $textlib = new textlib();
+    $text = $textlib->trim_utf8_bom($text);
+    //Fix mac/dos newlines
     $text = preg_replace('!\r\n?!',"\n",$text);
     $fp = fopen($filename, "w");
     fwrite($fp,$text);
@@ -101,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,
@@ -265,7 +266,6 @@ if ($um->preprocess_files() && confirm_sesskey()) {
                             //This can be used to obtain a list of userids for existing users
                             notify("$olduser->id ".get_string('usernotaddedregistered', 'error', $username));
                             $userserrors++;
-                            continue;
                         }
 
                     } else { // new user
@@ -299,8 +299,8 @@ if ($um->preprocess_files() && confirm_sesskey()) {
                             if (!$course[$i]) {
                                 notify(get_string('coursegroupunknown','error',$addgroup[$i]));
                             } else {
-                                if ($groupid = groups_get_group_by_name($course[$i]->id, $addgroup[$i])) { //TODO:check.
-                                    $groupid[$i] = $groupid;
+                                if ($gid = groups_get_group_by_name($course[$i]->id, $addgroup[$i])) {
+                                    $groupid[$i] = $gid;
                                 } else {
                                     notify(get_string('groupunknown','error',$addgroup[$i]));
                                 }
@@ -419,4 +419,3 @@ function my_file_get_contents($filename, $use_include_path = 0) {
 }
 
 ?>
-

admin/user.php

@@ -63,19 +63,24 @@
     $strsearch = get_string('search');
     $strshowallusers = get_string('showallusers');
 
+    if (empty($CFG->loginhttps)) {
+        $securewwwroot = $CFG->wwwroot;
+    } else {
+        $securewwwroot = str_replace('http:','https:',$CFG->wwwroot);
+    }
+
     admin_externalpage_print_header($adminroot);
 
     if ($confirmuser and confirm_sesskey()) {
         if (!$user = get_record('user', 'id', $confirmuser)) {
-            error("No such user!");
+            error("No such user!", '', true);
         }
 
-        $confirmeduser = new object();
-        $confirmeduser->id = $confirmuser;
-        $confirmeduser->confirmed = 1;
-        $confirmeduser->timemodified = time();
+        $auth = get_auth_plugin($user->auth);
 
-        if (update_record('user', $confirmeduser)) {
+        $result = $auth->user_confirm(addslashes($user->username), addslashes($user->secret));
+
+        if ($result == AUTH_CONFIRM_OK or $result == AUTH_CONFIRM_ALREADY) {
             notify(get_string('userconfirmed', '', fullname($user, true)) );
         } else {
             notify(get_string('usernotconfirmed', '', fullname($user, true)));
@@ -88,12 +93,12 @@
         }
 
         if (!$user = get_record('user', 'id', $delete)) {
-            error("No such user!");
+            error("No such user!", '', true);
         }
 
         $primaryadmin = get_admin();
         if ($user->id == $primaryadmin->id) {
-            error("You are not allowed to delete the primary admin user!");
+            error("You are not allowed to delete the primary admin user!", '', true);
         }
 
         if ($confirm != md5($delete)) {
@@ -113,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 {
@@ -127,7 +133,7 @@
             error('You are not permitted to modify the MNET access control list.');
         }
         if (!$user = get_record('user', 'id', $acl)) {
-            error("No such user.");
+            error("No such user.", '', true);
         }
         if (!is_mnet_remote_user($user)) {
             error('Users in the MNET access control list must be remote MNET users.');
@@ -143,12 +149,12 @@
             $aclrecord->username = $user->username;
             $aclrecord->accessctrl = $accessctrl;
             if (!insert_record('mnet_sso_access_control', $aclrecord)) {
-                error("Database error - Couldn't modify the MNET access control list.");
+                error("Database error - Couldn't modify the MNET access control list.", '', true);
             }
         } else {
             $aclrecord->accessctrl = $accessctrl;
             if (!update_record('mnet_sso_access_control', $aclrecord)) {
-                error("Database error - Couldn't modify the MNET access control list.");
+                error("Database error - Couldn't modify the MNET access control list.", '', true);
             }
         }
         $mnethosts = get_records('mnet_host', '', '', 'id', 'id,wwwroot,name');
@@ -197,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);
 
@@ -297,13 +303,19 @@
         }
 
         $mainadmin = get_admin();
-        if(empty($CFG->loginhttps)) {
-            $securewwwroot = $CFG->wwwroot;
-        } else {
-            $securewwwroot = str_replace('http:','https:',$CFG->wwwroot);
-        }
 
-        $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) {
@@ -408,7 +420,7 @@
     echo "</td></tr></table>";
 
     if (has_capability('moodle/user:create', $sitecontext)) {
-        print_heading('<a href="../user/editadvanced.php?id=-1">'.get_string('addnewuser').'</a>');
+        print_heading('<a href="'.$securewwwroot.'/user/editadvanced.php?id=-1">'.get_string('addnewuser').'</a>');
     }
     if (!empty($table)) {
         print_table($table);
@@ -416,7 +428,7 @@
                          "user.php?sort=$sort&amp;dir=$dir&amp;perpage=$perpage".
                          "&amp;firstinitial=$firstinitial&amp;lastinitial=$lastinitial&amp;search=".urlencode(stripslashes($search))."&amp;");
         if (has_capability('moodle/user:create', $sitecontext)) {
-            print_heading('<a href="../user/editadvanced.php?id=-1">'.get_string('addnewuser').'</a>');
+            print_heading('<a href="'.$securewwwroot.'/user/editadvanced.php?id=-1">'.get_string('addnewuser').'</a>');
         }
     }
 

admin/xmldb/actions/check_indexes/check_indexes.class.php

@@ -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;
+    }
+}
+?>

admin/xmldb/actions/edit_field/edit_field.class.php

@@ -173,7 +173,7 @@ class edit_field extends XMLDBAction {
         $o.= '    </table>';
         $o.= '</div></form>';
     /// Calculate the buttons
-        $b = ' <p class="buttons">';
+        $b = ' <p class="centerpara buttons">';
     /// The view original XML button
         if ($table->getField($fieldparam)) {
             $b .= '&nbsp;<a href="index.php?action=view_field_xml&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '&amp;select=original&amp;table=' . $tableparam . '&amp;field=' . $fieldparam . '">[' . $this->str['vieworiginal'] . ']</a>';

admin/xmldb/actions/edit_index/edit_index.class.php

@@ -128,7 +128,7 @@ class edit_index extends XMLDBAction {
         $o.= '    </table>';
         $o.= '</div></form>';
     /// Calculate the buttons
-        $b = ' <p class="buttons">';
+        $b = ' <p class="centerpara buttons">';
     /// The view original XML button
         if ($table->getIndex($indexparam)) {
             $b .= '&nbsp;<a href="index.php?action=view_index_xml&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '&amp;select=original&amp;table=' . $tableparam . '&amp;index=' . $indexparam . '">[' . $this->str['vieworiginal'] . ']</a>';

admin/xmldb/actions/edit_key/edit_key.class.php

@@ -140,7 +140,7 @@ class edit_key extends XMLDBAction {
         $o.= '    </table>';
         $o.= '</div></form>';
     /// Calculate the buttons
-        $b = ' <p class="buttons">';
+        $b = ' <p class="centerpara buttons">';
     /// The view original XML button
         if ($table->getKey($keyparam)) {
             $b .= '&nbsp;<a href="index.php?action=view_key_xml&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '&amp;select=original&amp;table=' . $tableparam . '&amp;key=' . $keyparam . '">[' . $this->str['vieworiginal'] . ']</a>';

admin/xmldb/actions/edit_sentence/edit_sentence.class.php

@@ -133,7 +133,7 @@ class edit_sentence extends XMLDBAction {
             $o.= '    </table>';
             $o.= '</div></form>';
         /// Calculate the buttons
-            $b = ' <p class="buttons">';
+            $b = ' <p class="centerpara buttons">';
         /// The back to edit statement button
             $b .= '&nbsp;<a href="index.php?action=edit_statement&amp;statement=' . urlencode($statementparam) . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '">[' . $this->str['back'] . ']</a>';
             $b .= '</p>';

admin/xmldb/actions/edit_statement/edit_statement.class.php

@@ -115,7 +115,7 @@ class edit_statement extends XMLDBAction {
         $o.= '    </table>';
         $o.= '</div></form>';
     /// Calculate the buttons
-        $b = ' <p class="buttons">';
+        $b = ' <p class="centerpara buttons">';
     /// The view original XML button
         if ($origstructure->getStatement($statementparam)) {
             $b .= '&nbsp;<a href="index.php?action=view_statement_xml&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '&amp;select=original&amp;statement=' . $statementparam . '">[' . $this->str['vieworiginal'] . ']</a>';

admin/xmldb/actions/edit_table_save/edit_table_save.class.php

@@ -107,7 +107,7 @@ class edit_table_save extends XMLDBAction {
                          "<a href=\"../index.php\">" . $this->str['administration'] . "</a> -> <a href=\"index.php\">XMLDB</a>");
             notice ('<p>' .implode(', ', $errors) . '</p>
                      <p>' . $temptable->readableInfo(),
-                     'index.php?action=edit_table&amp;table=' . $tableparam . '&amp;dir=' . str_replace($CFG->dirroot, '', urlencode($dirpath)));
+                     'index.php?action=edit_table&amp;table=' . $tableparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)));
             die; /// re-die :-P
         }
 

admin/xmldb/actions/get_db_directories/get_db_directories.class.php

@@ -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';

admin/xmldb/actions/main_view/main_view.class.php

@@ -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;
@@ -152,7 +155,7 @@ class main_view extends XMLDBAction {
             /// The save button
                 if ($dbdir->path_exists &&
                     file_exists($key . '/install.xml') &&
-                    is_readable($key . '/install.xml') &&
+                    is_writeable($key . '/install.xml') &&
                     is_writeable($key) &&
                     !empty($dbdir->xml_loaded) &&
                     !empty($dbdir->xml_changed)) {

admin/xmldb/actions/new_table/new_table.class.php

@@ -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);

admin/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php

@@ -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;

admin/xmldb/actions/test/test.class.php

@@ -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;

auth/cas/CAS/PGTStorage/pgt-db.php

@@ -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');
+
+
+  @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().
+
+
+   * This method returns the PEAR DB URL to use to connect to the database.
+
+
    *
-   * @hideinitializer
+
+
+   * @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().
+
+
+   * This method returns the handle of the connection to the database where PGT's are 
+
+
+   * stored.
+
+
    *
-   * @hideinitializer
+
+
+   * @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.'@'.$server.':'.$port.'/'.$database;
+
+
+      $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();
+
+
     }
 
+
+
+
+
   /** @} */
+
+
 }
 
+
+
+
+
 ?>

auth/cas/CAS/PGTStorage/pgt-file.php

@@ -1,237 +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
+
+
+ * @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().
+
+
+   * 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();
-      return $this->getPath().$pgt_iou.'.'.$this->getFormat();
-      phpCAS::traceEnd();      
-    }
-  
-  /**
-   * 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.
+
+
+   * This method returns the filename corresponding to a PGT Iou.
+
+
    *
-   * @param $pgt_iou the PGT iou
+
+
+   * @param $pgt_iou the PGT iou.
+
+
    *
-   * @return the corresponding PGT, or FALSE on error
-   *
-   * @public
+
+
+   * @return a filename
+
+
+   * @private
+
+
    */
-  function read($pgt_iou)
+
+
+  function getPGTIouFilename($pgt_iou)
+
+
     {
+
+
       phpCAS::traceBegin();
-      $pgt = FALSE;
+
+
+      $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,"r")) ) {
-	phpCAS::trace('could not open `'.$fname.'\'');
-      } else {
-	if ( ($pgt=fgets($f)) === FALSE ) {
-	  phpCAS::trace('could not read PGT from `'.$fname.'\'');
-	} 
+
+
+      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;
+
+
     }
-  
-  /** @} */
-  
-}
+
 
   
+
+
+  /** @} */
+
+
+  
+
+
+}
+
+
+
+
+
+  
+
+
 ?>

auth/cas/CAS/PGTStorage/pgt-main.php

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

auth/cas/CAS/domxml-php4-php5.php

@@ -1,277 +1,829 @@
 <?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();}
+
+
  }
+
+
 }
+
+
 ?>

auth/cas/CAS/languages/english.php

@@ -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>).'
+
+
 );
 
+
+
+
+
 ?>

auth/cas/CAS/languages/french.php

@@ -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>)'
 
+
+
+
+
 );
 
+
+
+
+
 ?>

auth/cas/CAS/languages/german.php

@@ -0,0 +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>).'
+
+
+);
+
+
+
+
+
+?>

auth/cas/CAS/languages/greek.php

@@ -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>).'
+
+
+);
+
+
+
+
+
 ?>

auth/cas/CAS/languages/japanese.php

@@ -0,0 +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>).'
+
+);
+
+
+
+?>

auth/cas/CAS/languages/languages.php

@@ -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);
+
+
 //@}
 
+
+
+
+
 ?>

auth/cas/README-CAS

@@ -1,7 +1,8 @@
 CAS-module README
 
-Please read comments from lib.php for auth/cas module
-The auth/cas module is using part of the /auth/ldap module. The /auth/ldap directory should exist.
-The auth/cas use the PHPCAS project from http://esup-phpcas.sourceforge.net
+
+
+
+
 
 

auth/cas/cas_form.html

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

auth/cas/config.html

@@ -1,187 +1,828 @@
 <?php
 
+
+
     global $CFG;
+
     require_once 'languages.php';
 
+
+
     $createoptions[0] = get_string("no");
+
     $createoptions[1] = get_string("yes");
 
-    // set to defaults if undefined
-    if (!isset ($config->hostname)) {
+
+
+    // set to defaults if undefined (CAS)
+
+    if (!isset ($config->hostname)) 
+
         $config->hostname = '';
-    }
-    if (!isset ($config->port)) {
+
+    if (!isset ($config->port)) 
+
         $config->port = '';
-    }
-    if (!isset ($config->casversion)) {
+
+    if (!isset ($config->casversion)) 
+
         $config->casversion = '';
-    }
-    if (!isset ($config->baseuri)) {
+
+    if (!isset ($config->baseuri)) 
+
         $config->baseuri = '';
-    }
-    if (!isset ($config->language)) {
+
+    if (!isset ($config->language)) 
+
         $config->language = '';
-    }
-    if (!isset ($config->use_cas)) {
-        $config->use_cas = '';
-    }
-    if (!isset ($config->auth_user_create)) {
-        $config->auth_user_create = '0';
-    }
-    if (!isset ($config->create_user)) {
-        $config->create_user = '0';
-    }
-    if (!isset($config->changepasswordurl)) {
-        $config->changepasswordurl = '';
-    }
+
+    if (!isset ($config->proxycas)) 
+
+        $config->proxycas = '';
+
+    if (!isset ($config->logoutcas)) 
+
+        $config->logoutcas = '';
+
+    if (!isset ($config->multiauth))
+
+        $config->multiauth = '';
+
+  // set to defaults if undefined (LDAP)
+
+    if (!isset($config->host_url))
+
+        { $config->host_url = ''; }
+
+    if (empty($config->ldapencoding))
+
+        { $config->ldapencoding = 'utf-8'; }
+
+    if (!isset($config->contexts))
+
+        { $config->contexts = ''; }
+
+    if (!isset($config->user_type))
+
+        { $config->user_type = 'default'; }
+
+    if (!isset($config->user_attribute))
+
+        { $config->user_attribute = ''; }
+
+    if (!isset($config->search_sub))
+
+        { $config->search_sub = ''; }
+
+    if (!isset($config->opt_deref))
+
+        { $config->opt_deref = LDAP_DEREF_NEVER; }
+
+    if (!isset($config->bind_dn))
+
+        {$config->bind_dn = ''; }
+
+    if (!isset($config->bind_pw))
+
+        {$config->bind_pw = ''; }
+
+    if (!isset($config->version))
+
+        {$config->version = '2'; }
+
+    if (!isset($config->objectclass))
+
+        {$config->objectclass = ''; }
+
+    if (!isset($config->memberattribute))
+
+        {$config->memberattribute = ''; }
+
+    if (!isset($config->memberattribute_isdn))
+
+        {$config->memberattribute_isdn = ''; }
+
+    if (!isset($config->groupecreators))
+
+        {$config->groupecreators = ''; }
+
+    if (!isset($config->attrcreators))
+
+        {$config->attrcreators = ''; }
+
+     if (!isset($config->removeuser))
+
+        {$config->removeuser = 0; }
+
+
+
+    $yesno = array( get_string('no'), get_string('yes') );
+
+
+
+if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
+
+    notify(get_string('auth_ldap_noextension','auth'));
+
+}
+
+
+
+
 
 ?>
+
+
+
 <table cellspacing="0" cellpadding="5" border="0" align="center">
 
+
+
 <tr>
+
    <td colspan="2">
+
         <h4><?php print_string('auth_cas_server_settings', 'auth') ?> </h4>
+
    </td>
-</tr>
 
-<tr valign="top"  class="required">
-    <td align="right"><?php print_string('auth_cas_use_cas', 'auth') ?>:</td>
-    <td>
-        <?php
-
-        unset($options);
-        $options[1] = get_string('yes');
-        choose_from_menu ($options, 'use_cas', $config->use_cas, get_string('no'), '', '');
-
-        ?>
-    </td>
-    <td><?php print_string('auth_cas_enabled', 'auth') ?></td>
 </tr>
 
 <tr valign="top" class="required">
+
     <td align="right"><?php print_string('auth_cas_hostname_key', 'auth') ?>:</td>
+
     <td>
+
         <input name="hostname" type="text" size="30" value="<?php echo $config->hostname ?>" />
+
         <?php
 
+
+
         if (isset($err['hostname'])) {
+
             formerr($err['hostname']);
+
         }
 
+
+
         ?>
+
     </td>
+
     <td><?php print_string('auth_cas_hostname', 'auth') ?></td>
+
 </tr>
 
+
+
 <tr valign="top"  class="required">
+
     <td align="right"><?php print_string('auth_cas_baseuri_key', 'auth') ?>:</td>
+
     <td>
+
         <input name="baseuri" type="text" size="30" value="<?php echo $config->baseuri ?>" />
+
         <?php
 
+
+
         if (isset($err['baseuri'])) {
+
             formerr($err['baseuri']);
+
         }
 
+
+
         ?>
+
     </td>
+
     <td><?php print_string('auth_cas_baseuri', 'auth') ?></td>
+
 </tr>
 
+
+
 <tr valign="top" class="required">
+
     <td align="right"><?php print_string('auth_cas_port_key', 'auth') ?>:</td>
+
     <td>
+
         <input name="port" type="text" size="30" value="<?php echo $config->port ?>" />
+
         <?php
 
+
+
         if (isset($err['port'])) {
+
             formerr($err['port']);
+
         }
 
+
+
         ?>
+
     </td>
+
     <td><?php print_string('auth_cas_port', 'auth') ?></td>
+
 </tr>
 
+
+
 <tr valign="top"  class="required">
+
     <td align="right"><?php print_string('auth_cas_casversion', 'auth') ?>:</td>
+
     <td>
+
         <input name="casversion" type="text" size="30" value="<?php echo $config->casversion ?>" />
+
         <?php
 
+
+
         if (isset($err['casversion'])) {
+
             formerr($err['casversion']);
+
         }
 
+
+
         ?>
+
     </td>
+
     <td><?php print_string('auth_cas_version', 'auth') ?></td>
+
 </tr>
 
+
+
 <tr valign="top"  class="required">
+
     <td align="right"><?php print_string('auth_cas_language_key', 'auth') ?>:</td>
+
     <td>
+
         <?php
 
+
+
         choose_from_menu($CASLANGUAGES, 'language', $config->language, '');
 
+
+
         ?>
+
     </td>
+
     <td><?php print_string('auth_cas_language', 'auth') ?></td>
+
 </tr>
 
-<tr valign="top">
-    <td align="right"><?php print_string('auth_cas_auth_user_create', 'auth') ?>: </td>
-    <td>
-      <?php
 
-        choose_from_menu($createoptions, 'auth_user_create', $config->auth_user_create, '');
-        if (isset($err['auth_user_create'])) {
-            formerr($err['auth_user_create']);
-        }
-
-      ?>
-    </td>
-    <td>
-        <?php print_string("auth_user_creation","auth"); ?>
-    </td>
-</tr>
 
 <tr valign="top"  class="required">
-    <td align="right"><?php print_string('auth_cas_create_user_key', 'auth') ?>:</td>
+
+    <td align="right"><?php print_string('auth_cas_proxycas_key', 'auth') ?>:</td>
+
     <td>
+
         <?php
 
         unset($options);
-        $options[0] = get_string('no');
+
         $options[1] = get_string('yes');
-        choose_from_menu($options, 'create_user', $config->create_user, '');
+
+        choose_from_menu ($options, 'proxycas', $config->proxycas, get_string('no'), '', '');
 
         ?>
+
     </td>
-    <td><?php print_string('auth_cas_create_user', 'auth') ?></td>
+
+    <td><?php print_string('auth_cas_proxycas', 'auth') ?></td>
+
 </tr>
 
-<tr valign="top">
-    <td align="right"><?php print_string('auth_cas_changepasswordurl', 'auth') ?>: </td>
+
+
+<tr valign="top"  class="required">
+
+    <td align="right"><?php print_string('auth_cas_logoutcas_key', 'auth') ?>:</td>
+
     <td>
-        <input name="changepasswordurl" type="text" value="<?php echo $config->changepasswordurl ?>" />
+
         <?php
 
-        if (isset($err['changepasswordurl'])) {
-            formerr($err['changepasswordurl']);
-        }
+        unset($options);
+
+        $options[1] = get_string('yes');
+
+        choose_from_menu ($options, 'logoutcas', $config->logoutcas, get_string('no'), '', '');
 
         ?>
+
     </td>
-    <td><?php print_string('changepasswordhelp', 'auth') ?></td>
+
+    <td><?php print_string('auth_cas_logoutcas', 'auth') ?></td>
+
 </tr>
 
-</table>
+
+
+<tr valign="top"  class="required">
+
+    <td align="right"><?php print_string('auth_cas_multiauth_key', 'auth') ?>:</td>
+
+    <td>
+
+        <?php
+
+        unset($options);
+
+        $options[1] = get_string('yes');
+
+        choose_from_menu ($options, 'multiauth', $config->multiauth, get_string('no'), '', '');
+
+        ?>
+
+    </td>
+
+    <td><?php print_string('auth_cas_multiauth', 'auth') ?></td>
+
+</tr>
+
+
+
+<tr>
+
+   <td colspan="2">
+
+        <h4><?php print_string('auth_ldap_server_settings', 'auth') ?> </h4>
+
+   </td>
+
+</tr>
+
+
+
+<tr valign="top" class="required">
+
+    <td align="right"><label for="host_url"><?php print_string('auth_ldap_host_url_key','auth') ?></label></td>
+
+    <td>
+
+        <input name="host_url" id="host_url" type="text" size="30" value="<?php echo $config->host_url?>" />
+
+    <?php  if (isset($err['host_url'])) formerr($err['host_url']); ?>
+
+    </td>
+
+    <td>
+
+    <?php print_string('auth_ldap_host_url','auth') ?>
+
+    </td>
+
+</tr>
+
+
+
+<tr valign="top" class="required">
+
+    <td align="right"><label for="menuversion"><?php print_string('auth_ldap_version_key','auth') ?></label></td>
+
+    <td>
+
+    <?php
+
+       $versions = array();
+
+       $versions[2] = '2';
+
+       $versions[3] = '3';
+
+       choose_from_menu($versions, 'version', $config->version, '');
+
+       if (isset($err['version'])) formerr($err['version']);
+
+    ?>
+
+    </td>
+
+    <td>
+
+    <?php print_string('auth_ldap_version','auth') ?>
+
+    </td>
+
+</tr>
+
+
+
+<tr valign="top" class="required">
+
+    <td align="right"><label for="ldapencoding"><?php print_string("auth_ldap_ldap_encoding_key", "auth") ?></label></td>
+
+    <td>
+
+        <input id="ldapencoding" name="ldapencoding" type="text" value="<?php echo $config->ldapencoding ?>" />
+
+        <?php
+
+
+
+        if (isset($err['ldapencoding'])) {
+
+            formerr($err['ldapencoding']);
+
+        }
+
+
+
+        ?>
+
+    </td>
+
+    <td><?php print_string('auth_ldap_ldap_encoding', 'auth') ?></td>
+
+</tr>
+
+
+
+<tr>
+
+   <td colspan="2">
+
+        <h4><?php print_string('auth_ldap_bind_settings', 'auth') ?> </h4>
+
+   </td>
+
+</tr>
+
+
+
+<tr valign="top" class="required">
+
+    <td align="right"><label for="bind_dn"><?php print_string('auth_ldap_bind_dn_key','auth') ?></label></td>
+
+    <td>
+
+    <input name="bind_dn" id="bind_dn" type="text" size="30" value="<?php echo $config->bind_dn?>" />
+
+    <?php  if (isset($err['bind_dn'])) formerr($err['bind_dn']); ?>
+
+    </td><td>
+
+    <?php print_string('auth_ldap_bind_dn','auth') ?>
+
+    </td>
+
+</tr>
+
+
+
+<tr valign="top" class="required">
+
+    <td align="right"><label for="bind_pw"><?php print_string('auth_ldap_bind_pw_key','auth') ?></label></td>
+
+    <td>
+
+    <input name="bind_pw" id="bind_pw" type="password" size="30" value="<?php echo $config->bind_pw?>" />
+
+    <?php  if (isset($err['bind_pw'])) formerr($err['bind_pw']); ?>
+
+    </td><td>
+
+    <?php print_string('auth_ldap_bind_pw','auth') ?>
+
+    </td>
+
+</tr>
+
+
+
+<tr>
+
+   <td colspan="2">
+
+        <h4><?php print_string('auth_ldap_user_settings', 'auth') ?> </h4>
+
+   </td>
+
+</tr>
+
+
+
+<tr valign="top" class="required">
+
+    <td align="right"><label for="menuuser_type"><?php print_string('auth_ldap_user_type_key','auth') ?></label></td>
+
+    <td>
+
+    <?php choose_from_menu($this->ldap_suppported_usertypes(), 'user_type', $config->user_type, ''); ?>
+
+    <?php  if (isset($err['user_type'])) formerr($err['user_type']); ?>
+
+    </td>
+
+    <td>
+
+    <?php print_string('auth_ldap_user_type', 'auth') ?>
+
+    </td>
+
+</tr>
+
+
+
+<tr valign="top" class="required">
+
+    <td align="right"><label for="contexts"><?php print_string('auth_ldap_contexts_key','auth') ?></label></td>
+
+    <td>
+
+    <input name="contexts" id="contexts"  type="text" size="30" value="<?php echo $config->contexts?>" />
+
+    <?php  if (isset($err['contexts'])) formerr($err['contexts']); ?>
+
+    </td>
+
+    <td>
+
+    <?php print_string('auth_ldap_contexts', 'auth') ?>
+
+    </td>
+
+</tr>
+
+
+
+<tr valign="top" class="required">
+
+    <td align="right"><label for="menusearch_sub"><?php print_string('auth_ldap_search_sub_key','auth') ?></label></td>
+
+    <td>
+
+        <?php choose_from_menu($yesno, 'search_sub', $config->search_sub, ''); ?>
+
+    </td>
+
+    <td>
+
+    <?php print_string('auth_ldap_search_sub','auth') ?>
+
+    </td>
+
+</tr>
+
+
+
+<tr valign="top" class="required">
+
+    <td align="right"><label for="menuopt_deref"><?php print_string('auth_ldap_opt_deref_key','auth') ?></label></td>
+
+    <td>
+
+    <?php
+
+       $opt_deref = array();
+
+       $opt_deref[LDAP_DEREF_NEVER] = get_string('no');
+
+       $opt_deref[LDAP_DEREF_ALWAYS] = get_string('yes');
+
+       choose_from_menu($opt_deref, 'opt_deref', $config->opt_deref, LDAP_DEREF_NEVER, '');
+
+       if (isset($err['opt_deref'])) formerr($err['opt_deref']);
+
+    ?>
+
+    </td>
+
+    <td>
+
+    <?php print_string('auth_ldap_opt_deref','auth') ?>
+
+    </td>
+
+</tr>
+
+
+
+
+
+
+
+<tr valign="top" class="required">
+
+    <td align="right"><label for="user_attribute"><?php print_string('auth_ldap_user_attribute_key','auth') ?></label></td>
+
+    <td>
+
+    <input name="user_attribute" id="user_attribute" type="text" size="30" value="<?php echo $config->user_attribute?>" />
+
+    <?php  if (isset($err['user_attribute'])) formerr($err['user_attribute']); ?>
+
+    </td>
+
+    <td>
+
+    <?php print_string('auth_ldap_user_attribute','auth') ?>
+
+    </td>
+
+</tr>
+
+
+
+<tr valign="top" class="required">
+
+        <td align="right"><label for="memberattribute"><?php print_string('auth_ldap_memberattribute_key','auth') ?></label></td>
+
+        <td>
+
+    <input name="memberattribute" id="memberattribute" type="text" size="30" value="<?php echo $config->memberattribute?>" />
+
+    <?php  if (isset($err['memberattribute'])) formerr($err['memberattribute']); ?>
+
+    </td><td>
+
+    <?php print_string('auth_ldap_memberattribute','auth') ?>
+
+    </td>
+
+</tr>
+
+
+
+<tr valign="top" class="required">
+
+        <td align="right"><label for="memberattribute_isdn"><?php print_string('auth_ldap_memberattribute_isdn_key','auth') ?></label></td>
+
+        <td>
+
+    <input name="memberattribute_isdn" id="memberattribute_isdn" type="text" size="30" value="<?php echo $config->memberattribute_isdn?>" />
+
+    <?php  if (isset($err['memberattribute_isdn'])) formerr($err['memberattribute_isdn']); ?>
+
+    </td><td>
+
+    <?php print_string('auth_ldap_memberattribute_isdn','auth') ?>
+
+    </td>
+
+</tr>
+
+
+
+<tr valign="top" class="required">
+
+    <td align="right"><label for="objectclass"><?php print_string('auth_ldap_objectclass_key','auth') ?></label></td>
+
+    <td>
+
+    <input name="objectclass" id="objectclass" type="text" size="30" value="<?php echo $config->objectclass?>" />
+
+    <?php  if (isset($err['objectclass'])) formerr($err['objectclass']); ?>
+
+    </td>
+
+    <td>
+
+    <?php print_string('auth_ldap_objectclass','auth') ?>
+
+    </td>
+
+</tr>
+
+
+
+<tr>
+
+   <td colspan="2">
+
+        <h4><?php print_string('coursecreators') ?> </h4>
+
+   </td>
+
+</tr>
+
+
+
+<tr valign="top" class="required">
+
+        <td align="right"><label for="attrcreators_key"><?php print_string('auth_ldap_attrcreators_key','auth') ?></label></td>
+
+        <td>
+
+    <input name="attrcreators" id="attrcreators" type="text" size="30" value="<?php echo $config->attrcreators?>" />
+
+    <?php  if (isset($err['attrcreators'])) formerr($err['attrcreators']); ?>
+
+    </td><td>
+
+    <?php print_string('auth_ldap_attrcreators','auth') ?>
+
+    </td>
+
+</tr>
+
+
+
+<tr valign="top" class="required">
+
+        <td align="right"><label for="groupecreators_key"><?php print_string('auth_ldap_groupecreators_key','auth') ?></label></td>
+
+        <td>
+
+    <input name="groupecreators" id="groupecreators" type="text" size="30" value="<?php echo $config->groupecreators?>" />
+
+    <?php  if (isset($err['groupecreators'])) formerr($err['groupecreators']); ?>
+
+    </td><td>
+
+    <?php print_string('auth_ldap_groupecreators','auth') ?>
+
+    </td>
+
+</tr>
+
+
+
+<tr>
+
+   <td colspan="2">
+
+        <h4><?php print_string('auth_sync_script', 'auth') ?> </h4>
+
+   </td>
+
+</tr>
+
+
+
+<tr valign="top">
+
+    <td align="right"><label for="menuremoveuser"><?php print_string('auth_remove_user_key','auth') ?></label></td>
+
+    <td>
+
+    <?php
+
+       $deleteopt = array();
+
+       $deleteopt['0'] = get_string('auth_remove_keep','auth');
+
+       $deleteopt['1'] = get_string('auth_remove_suspend','auth');
+
+       $deleteopt['2'] = get_string('auth_remove_delete','auth');
+
+       choose_from_menu($deleteopt, 'removeuser', $config->removeuser, '');
+
+    ?>
+
+    </td>
+
+    <td>
+
+    <?php print_string('auth_remove_user','auth') ?>
+
+    </td>
+
+</tr>
 
 <?php
 
-    $ldapplugin = get_auth_plugin('ldap');
-    $ldapplugin->config_form(get_config('auth/ldap'), $err);
+
+
+$help  = get_string('auth_ldapextrafields','auth');
+
+$help .= get_string('auth_updatelocal_expl','auth');
+
+$help .= get_string('auth_fieldlock_expl','auth');
+
+$help .= get_string('auth_updateremote_expl','auth');
+
+$help .= '<hr />';
+
+$help .= get_string('auth_updateremote_ldap','auth');
+
+
+
+print_auth_lock_options('cas', $user_fields, $help, true, true);
+
+
 
 ?>
+</table>

auth/cas/forbidden.html

@@ -1,8 +0,0 @@
-<table width="90%" border="0" cellspacing="10" cellpadding="5" align="center" style="font-size: small">
-  <tr>
-    <td width="50%" class="required" class="headingblock">
-      <p align="center"><b><font size="3"><?php formerr($errormsg) ?></font></b></p>
-    </td>
-  </tr>
-</table>
-

auth/cas/forbidden.php

@@ -1,18 +0,0 @@
-<?php
-// version $Id$
-// Page for forbidden access from CAS
-    require("../../config.php");
-
-    if (!$site = get_site()) {
-        print_error('nosite', '', '', NULL, true);
-    }
-
-    $loginsite = get_string("loginsite");
-    $errormsg = get_string("auth_cas_invalidcaslogin", "auth");
-
-    print_header("$site->fullname: $loginsite", $site->fullname, $loginsite);
-    include("forbidden.html");
-    print_footer();
-    exit;
-?>
-

auth/cas/index_form.html

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

auth/cas/languages.php

@@ -1,10 +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 (
-"greek" => "Modern Greek",
+
 "english" => "English",
+
 "french" => "French");
-?>
+
+?>

auth/cas/login.php

@@ -1,313 +0,0 @@
-<?php
-// $Id$
-// author: romualdLorthioir $
-//CHANGELOG:
-//05.03.2005 replace /login/index.php
-defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
-
-    //Define variables used in page
-    if (!$site = get_site()) {
-        print_error('nosite', '', '', NULL, true);
-    }
-
-    if (empty($CFG->langmenu)) {
-        $langmenu = "";
-    } else {
-        $currlang = current_language();
-        $langs    = get_list_of_languages();
-        if (empty($CFG->loginhttps)) {
-            $wwwroot = $CFG->wwwroot;
-        } else {
-            $wwwroot = str_replace('http:','https:',$CFG->wwwroot);
-        }
-        $langmenu = popup_form ("$wwwroot/login/index.php?lang=", $langs, "chooselang", $currlang, "", "", "", true);
-    }
-
-    $loginsite = get_string("loginsite");
-    $casauth = get_auth_plugin('cas');
-    $ldapauth = get_auth_plugin('ldap');
-
-
-    $frm = false;
-    $user = false;
-    if ((!empty($SESSION->wantsurl) and strstr($SESSION->wantsurl,'username=guest')) or $loginguest) {
-        /// Log in as guest automatically (idea from Zbigniew Fiedorowicz)
-        $frm->username = 'guest';
-        $frm->password = 'guest';
-    } else if (!empty($SESSION->wantsurl) && file_exists($CFG->dirroot.'/login/weblinkauth.php')) {
-        // Handles the case of another Moodle site linking into a page on this site
-        include($CFG->dirroot.'/login/weblinkauth.php');
-        if (function_exists(weblink_auth)) {
-            $user = weblink_auth($SESSION->wantsurl);
-        }
-        if ($user) {
-            $frm->username = $user->username;
-        } else {
-            $frm = data_submitted();
-        }
-    } else {
-        $frm = data_submitted();
-    }
-
-    if ($frm and (get_moodle_cookie() == '')) {    // Login without cookie
-
-        $errormsg = get_string("cookiesnotenabled");
-
-    } else if ($frm) {                             // Login WITH cookies
-
-        $frm->username = trim(moodle_strtolower($frm->username));
-
-        if (($frm->username == 'guest') and empty($CFG->guestloginbutton)) {
-            $user = false;    /// Can't log in as guest if guest button is disabled
-            $frm = false;
-        } else if (!$user) {
-            if ($CFG->auth == "cas" && $frm->username != 'guest') { /// Cas SSO case
-               $user = $casauth->authenticate_user_login($frm->username, $frm->password);
-            }else{
-               $user = authenticate_user_login($frm->username, $frm->password);
-            }
-        }
-        update_login_count();
-
-        if ($user) {
-            if (! $user->confirmed ) {       // they never confirmed via email
-                print_header(get_string("mustconfirm"), get_string("mustconfirm") );
-                print_heading(get_string("mustconfirm"));
-                print_simple_box(get_string("emailconfirmsent", "", $user->email), "center");
-                print_footer();
-                die;
-            }
-
-            $USER = $user;
-            if (!empty($USER->description)) {
-                $USER->description = true;   // No need to cart all of it around
-            }
-            $USER->loggedin = true;
-            $USER->site     = $CFG->wwwroot; // for added security, store the site in the session
-            sesskey();                       // for added security, used to check script parameters
-
-            if ($USER->username == "guest") {
-                $USER->lang       = $CFG->lang;               // Guest language always same as site
-                $USER->firstname  = get_string("guestuser");  // Name always in current language
-                $USER->lastname   = " ";
-            }
-
-            if (!update_user_login_times()) {
-                error("Wierd error: could not update login records");
-            }
-
-            set_moodle_cookie($USER->username);
-
-            unset($SESSION->lang);
-            $SESSION->justloggedin = true;
-
-            // Restore the calendar filters, if saved
-            if (intval(get_user_preferences('calendar_persistflt', 0))) {
-                include_once($CFG->dirroot.'/calendar/lib.php');
-                calendar_set_filters_status(get_user_preferences('calendar_savedflt', 0xff));
-            }
-
-            //Select password change url
-            $userauth = get_auth_plugin($USER->auth);
-            if (method_exists($userauth, 'can_change_password') and $userauth->can_change_password()) {
-                $passwordchangeurl=$CFG->wwwroot.'/login/change_password.php';
-            }
-
-            // check whether the user should be changing password
-            if (get_user_preferences('auth_forcepasswordchange', false)) {
-                if (isset($passwordchangeurl)) {
-                    redirect($passwordchangeurl);
-                } else {
-                    print_error('auth_cas_broken_password','auth');
-                }
-            }
-
-
-            add_to_log(SITEID, "user", "login", "view.php?id=$user->id&course=".SITEID, $user->id, 0, $user->id);
-
-            if (user_not_fully_set_up($USER)) {
-                $urltogo = $CFG->wwwroot.'/user/edit.php?id='.$USER->id.'&amp;course='.SITEID;
-                // We don't delete $SESSION->wantsurl yet, so we get there later
-
-            } else if (isset($SESSION->wantsurl) and (strpos($SESSION->wantsurl, $CFG->wwwroot) === 0)) {
-                $urltogo = $SESSION->wantsurl;    /// Because it's an address in this site
-                unset($SESSION->wantsurl);
-
-            } else {
-                $urltogo = $CFG->wwwroot.'/';      /// Go to the standard home page
-                unset($SESSION->wantsurl);         /// Just in case
-            }
-
-            // check if user password has expired
-            // Currently supported only for ldap-authentication module
-            if ($ldapauth->config->expiration == 1) {
-                    $days2expire = $ldapauth->password_expire($USER->username);
-                    if (intval($days2expire) > 0 && intval($days2expire) < intval($CFG->{$USER->auth.'_expiration_warning'})) {
-                        print_header("$site->fullname: $loginsite", $site->fullname, $loginsite, $focus, "", true, "<div align=\"right\">$langmenu</div>");
-                        notice_yesno(get_string('auth_passwordwillexpire', 'auth', $days2expire), $passwordchangeurl, $urltogo);
-                        print_footer();
-                        exit;
-                    } elseif (intval($days2expire) < 0 ) {
-                        print_header("$site->fullname: $loginsite", $site->fullname, $loginsite, $focus, "", true, "<div align=\"right\">$langmenu</div>");
-                        notice_yesno(get_string('auth_passwordisexpired', 'auth'), $passwordchangeurl, $urltogo);
-                        print_footer();
-                        exit;
-                    }
-            }
-
-            reset_login_count();
-
-            load_all_capabilities();     /// This is what lets the user do anything on the site  :-)
-
-            redirect($urltogo);
-
-            exit;
-
-        } else {
-          if ($CFG->auth == "cas" ) { /// CAS error login
-            $errormsg = get_string("invalidcaslogin");
-            phpCAS::logout("$CFG->wwwroot/auth/cas/forbidden.php");
-          }else{
-            $errormsg = get_string("invalidlogin");
-          }
-        }
-    }
-    $user = $casauth->automatic_authenticate($user);
-    if ($user) {
-        if (! $user->confirmed ) {       // they never confirmed via email
-            print_header(get_string("mustconfirm"), get_string("mustconfirm") );
-            print_heading(get_string("mustconfirm"));
-            print_simple_box(get_string("emailconfirmsent", "", $user->email), "center");
-            print_footer();
-            die;
-        }
-
-        $USER = $user;
-        if (!empty($USER->description)) {
-            $USER->description = true;   // No need to cart all of it around
-        }
-        $USER->loggedin = true;
-        $USER->site     = $CFG->wwwroot; // for added security, store the site in the session
-        sesskey();                       // for added security, used to check script parameters
-
-        if ($USER->username == "guest") {
-            $USER->lang       = $CFG->lang;               // Guest language always same as site
-            $USER->firstname  = get_string("guestuser");  // Name always in current language
-            $USER->lastname   = " ";
-        }
-
-        if (!update_user_login_times()) {
-            error("Wierd error: could not update login records");
-        }
-
-        set_moodle_cookie($USER->username);
-
-        unset($SESSION->lang);
-        $SESSION->justloggedin = true;
-
-        // Restore the calendar filters, if saved
-        if (intval(get_user_preferences('calendar_persistflt', 0))) {
-            include_once($CFG->dirroot.'/calendar/lib.php');
-            calendar_set_filters_status(get_user_preferences('calendar_savedflt', 0xff));
-        }
-
-        //Select password change url
-        $userauth = get_auth_plugin($USER->auth);
-        if (method_exists($userauth, 'can_change_password') and $userauth->can_change_password()) {
-            $passwordchangeurl=$CFG->wwwroot.'/login/change_password.php';
-        }
-
-        // check whether the user should be changing password
-        if (get_user_preferences('auth_forcepasswordchange', false)) {
-            if (isset($passwordchangeurl)) {
-                redirect($passwordchangeurl);
-            } else {
-                print_error('auth_cas_broken_password','auth');
-            }
-        }
-
-
-        add_to_log(SITEID, "user", "login", "view.php?id=$user->id&course=".SITEID, $user->id, 0, $user->id);
-
-        if (user_not_fully_set_up($USER)) {
-            $urltogo = $CFG->wwwroot.'/user/edit.php?id='.$USER->id.'&amp;course='.SITEID;
-            // We don't delete $SESSION->wantsurl yet, so we get there later
-
-        } else if (isset($SESSION->wantsurl) and (strpos($SESSION->wantsurl, $CFG->wwwroot) === 0)) {
-            $urltogo = $SESSION->wantsurl;    /// Because it's an address in this site
-            unset($SESSION->wantsurl);
-
-        } else {
-            $urltogo = $CFG->wwwroot.'/';      /// Go to the standard home page
-            unset($SESSION->wantsurl);         /// Just in case
-        }
-
-        // check if user password has expired
-        // Currently supported only for ldap-authentication module
-        if ($ldapauth->config->expiration == 1) {
-                $days2expire = $ldapauth->password_expire($USER->username);
-                if (intval($days2expire) > 0 && intval($days2expire) < intval($CFG->{$USER->auth.'_expiration_warning'})) {
-                    print_header("$site->fullname: $loginsite", $site->fullname, $loginsite, $focus, "", true, "<div class=\"langmenu\">$langmenu</div>");
-                    notice_yesno(get_string('auth_passwordwillexpire', 'auth', $days2expire), $passwordchangeurl, $urltogo);
-                    print_footer();
-                    exit;
-                } elseif (intval($days2expire) < 0 ) {
-                    print_header("$site->fullname: $loginsite", $site->fullname, $loginsite, $focus, "", true, "<div class=\"langmenu\">$langmenu</div>");
-                    notice_yesno(get_string('auth_passwordisexpired', 'auth'), $passwordchangeurl, $urltogo);
-                    print_footer();
-                    exit;
-                }
-        }
-
-        reset_login_count();
-
-        load_all_capabilities();     /// This is what lets the user do anything on the site  :-)
-
-        redirect($urltogo);
-
-        exit;
-    } else {
-       if (!$CFG->guestloginbutton) {
-           $errormsg = get_string("invalidcaslogin");
-           phpCAS::logout("$CFG->wwwroot/auth/cas/forbidden.php");
-       }
-    }
-
-    if (empty($errormsg)) {
-        $errormsg = "";
-    }
-
-    if (empty($SESSION->wantsurl)) {
-        $SESSION->wantsurl = array_key_exists('HTTP_REFERER',$_SERVER) ? $_SERVER["HTTP_REFERER"] : $CFG->wwwroot.'/';
-    }
-
-    if (get_moodle_cookie() == '') {
-        set_moodle_cookie('nobody');   // To help search for cookies
-    }
-
-    if (empty($frm->username)) {
-        $frm->username = get_moodle_cookie() === 'nobody' ? '' : get_moodle_cookie();
-        $frm->password = "";
-    }
-
-    if (!empty($frm->username)) {
-        $focus = "login.password";
-    } else {
-        $focus = "login.username";
-    }
-
-    if ($CFG->auth == "email" or $CFG->auth == "none" or chop($CFG->auth_instructions) <> "" ) {
-        $show_instructions = true;
-    } else {
-        $show_instructions = false;
-    }
-
-    print_header("$site->fullname: $loginsite", $site->fullname, $loginsite, $focus, "", true, "<div align=\"right\">$langmenu</div>");
-    include($CFG->dirroot.'/auth/cas/index_form.html');
-    print_footer();
-
-    exit;
-
-    // No footer on this page
-
-?>

auth/cas/logout.php

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

auth/db/auth.php

@@ -182,6 +182,7 @@ class auth_plugin_db extends auth_plugin_base {
         }
         $authdb->Close();
         return $result;
+
     }
 
 
@@ -197,7 +198,7 @@ class auth_plugin_db extends auth_plugin_base {
 
         global $CFG;
         if ($this->config->passtype === 'internal') {
-            update_internal_user_password($user, $newpassword);
+            return update_internal_user_password($user, $newpassword);
         } else {
             // we should have never been called!
             return false;
@@ -390,6 +391,9 @@ class auth_plugin_db extends auth_plugin_base {
 
     function user_exists($username) {
 
+    /// Init result value
+        $result = false;
+
         $textlib = textlib_get_instance();
         $extusername = $textlib->convert(stripslashes($username), 'utf-8', $this->config->extencoding);
 
@@ -397,46 +401,40 @@ class auth_plugin_db extends auth_plugin_base {
 
         $rs = $authdb->Execute("SELECT * FROM {$this->config->table}
                                      WHERE {$this->config->fielduser} = '".$this->ext_addslashes($extusername)."' ");
-        $authdb->Close();
 
         if (!$rs) {
             print_error('auth_dbcantconnect','auth');
-            return false;
+        } else if ( $rs->RecordCount() ) {
+            // user exists exterally
+            $result = $rs->RecordCount();
         }
 
-        if ( $rs->RecordCount() ) {
-            // user exists exterally
-            return $rs->RecordCount();
-        } else {
-            // user does not exist externally
-            return false;
-        }
+        $authdb->Close();
+        return $result;
     }
 
 
     function get_userlist() {
 
+    /// Init result value
+        $result = array();
+
         $authdb = $this->db_init();
 
         // fetch userlist
         $rs = $authdb->Execute("SELECT {$this->config->fielduser} AS username
                                 FROM   {$this->config->table} ");
-        $authdb->Close();
 
         if (!$rs) {
             print_error('auth_dbcantconnect','auth');
-            return false;
+        } else if ( $rs->RecordCount() ) {
+            while ($rec = rs_fetch_next_record($rs)) {
+                array_push($result, $rec->username);
+            }
         }
 
-        if ( $rs->RecordCount() ) {
-            $userlist = array();
-            while ($rec = rs_fetch_next_record($rs)) {
-                array_push($userlist, $rec->username);
-            }
-            return $userlist;
-        } else {
-            return array();
-        }
+        $authdb->Close();
+        return $result;
     }
 
     /**
@@ -578,7 +576,7 @@ class auth_plugin_db extends auth_plugin_base {
      * @return bool
      */
     function is_internal() {
-        return false;
+        return ($this->config->passtype == 'internal');
     }
 
     /**
@@ -607,6 +605,15 @@ class auth_plugin_db extends auth_plugin_base {
         }
     }
 
+    /**
+     * Returns true if plugin allows resetting of internal password.
+     *
+     * @return bool
+     */
+    function can_reset_password() {
+        return ($this->config->passtype == 'internal');
+    }
+
     /**
      * Prints a form for configuring this authentication plugin.
      *

auth/db/config.html

@@ -50,7 +50,7 @@
     $yesno = array( get_string('no'), get_string('yes') );
 
 ?>
-<table cellspacing="0" cellpadding="5" border="0" align="center">
+<table cellspacing="0" cellpadding="5" border="0">
 
 <tr valign="top" class="required">
     <td align="right"><label for="host"><?php print_string("auth_dbhost_key", "auth") ?></label></td>

auth/email/config.html

@@ -1,7 +1,7 @@
 <!-- No config needed -->
-<div align="center"><?php print_string('none'); ?></div>
+<div style="text-align: center"><?php print_string('none'); ?></div>
 
-<table cellspacing="0" cellpadding="5" border="0" align="center">
+<table cellspacing="0" cellpadding="5" border="0">
 <?php
 
 print_auth_lock_options('email', $user_fields, get_string('auth_fieldlocks_help', 'auth'), false, false);

auth/fc/auth.php

@@ -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');

auth/fc/config.html

@@ -24,7 +24,7 @@
     }
 
 ?>
-<table cellspacing="0" cellpadding="5" border="0" align="center">
+<table cellspacing="0" cellpadding="5" border="0">
 
 <tr valign="top" class="required">
 	<td align="right"><?php  print_string("auth_fchost_key", "auth") ?>:</td>

auth/fc/fcFPP.php

@@ -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;
     }
 

auth/imap/config.html

@@ -15,7 +15,7 @@ if (!isset($config->changepasswordurl)) {
 }
 
 ?>
-<table cellspacing="0" cellpadding="5" border="0" align="center">
+<table cellspacing="0" cellpadding="5" border="0">
 
 <tr valign="top" class="required">
     <td align="right"><?php print_string('auth_imaphost_key', 'auth') ?>: </td>

auth/ldap/auth.php

@@ -48,7 +48,7 @@ class auth_plugin_ldap extends auth_plugin_base {
         //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) {
+        } else if (stripos($this->config->objectclass, 'objectClass=') !== 0) {
             $this->config->objectclass = 'objectClass='.$this->config->objectclass;
         }
 
@@ -97,7 +97,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,14 +273,18 @@ 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 = $this->ldap_add($ldapconnection, $this->config->user_attribute.'="'.$this->ldap_addslashes($userobject->username).','.$this->config->create_context.'"', $newuser);
+        $uadd = ldap_add($ldapconnection, $this->config->user_attribute.'="'.$this->ldap_addslashes($userobject->username).','.$this->config->create_context.'"', $newuser);
         ldap_close($ldapconnection);
         return $uadd;
 
     }
 
+    function can_reset_password() {
+        return !empty($this->config->stdchangepassword);
+    }
+
     /**
      * return number of days to user password expires
      *
@@ -291,7 +295,7 @@ class auth_plugin_ldap extends auth_plugin_base {
      * @return integer
      */
     function password_expire($username) {
-        $result = false;
+        $result = 0;
 
         $textlib = textlib_get_instance();
         $extusername = $textlib->convert(stripslashes($username), 'utf-8', $this->config->ldapencoding);
@@ -302,19 +306,16 @@ class auth_plugin_ldap extends auth_plugin_base {
         $sr = ldap_read($ldapconnection, $user_dn, 'objectclass=*', $search_attribs);
         if ($sr)  {
             $info = $this->ldap_get_entries($ldapconnection, $sr);
-            if (empty ($info) or empty($info[0][$this->config->expireattr][0])) {
-                //error_log("ldap: no expiration value".$info[0][$this->config->expireattr]);
-                // no expiration attribute, password does not expire
-                $result = 0;
-            }
-            else {
-                $now = time();
-                $expiretime = $this->ldap_expirationtime2unix($info[0][$this->config->expireattr][0]);
-                if ($expiretime > $now) {
-                    $result = ceil(($expiretime - $now) / DAYSECS);
-                }
-                else {
-                    $result = floor(($expiretime - $now) / DAYSECS);
+            if (!empty ($info) and !empty($info[0][$this->config->expireattr][0])) {
+                $expiretime = $this->ldap_expirationtime2unix($info[0][$this->config->expireattr][0], $ldapconnection, $user_dn);
+                if ($expiretime != 0) {
+                    $now = time();
+                    if ($expiretime > $now) {
+                        $result = ceil(($expiretime - $now) / DAYSECS);
+                    }
+                    else {
+                        $result = floor(($expiretime - $now) / DAYSECS);
+                    }
                 }
             }
         } else {
@@ -430,7 +431,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();
@@ -693,7 +695,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;
         }
 
@@ -833,6 +835,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);
 
@@ -840,7 +857,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);
@@ -861,9 +877,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];
@@ -889,6 +912,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) {
@@ -1051,6 +1075,23 @@ class auth_plugin_ldap extends auth_plugin_base {
                 }
                 break;
 
+            case 'ad':
+                // Passwords in Active Directory must be encoded as Unicode
+                // strings (UCS-2 Little Endian format) and surrounded with
+                // double quotes. See http://support.microsoft.com/?kbid=269190
+                if (!function_exists('mb_convert_encoding')) {
+                    error_log ('You need the mbstring extension to change passwords in Active Directory');
+                    return false;
+                }
+                $extpassword = mb_convert_encoding('"'.$extpassword.'"', "UCS-2LE", $this->config->ldapencoding);
+                $result = ldap_modify($ldapconnection, $user_dn, array('unicodePwd' => $extpassword));
+                if (!$result) {
+                    error_log('LDAP Error in user_update_password(). Error code: ' 
+                              . ldap_errno($ldapconnection) . '; Error string : '
+                              . ldap_err2str(ldap_errno($ldapconnection)));
+                }
+                break;
+
             default:
                 $usedconnection = &$ldapconnection;
                 // send ldap the password in cleartext, it will md5 it itself
@@ -1138,7 +1179,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;
@@ -1182,9 +1223,11 @@ class auth_plugin_ldap extends auth_plugin_base {
      * depends on $this->config->user_type variable
      *
      * @param mixed time   Time stamp readed from ldap as it is.
+     * @param string $ldapconnection Just needed for Active Directory.
+     * @param string $user_dn User distinguished name for the user we are checking password expiration (just needed for Active Directory).
      * @return timestamp
      */
-    function ldap_expirationtime2unix ($time) {
+    function ldap_expirationtime2unix ($time, $ldapconnection, $user_dn) {
         $result = false;
         switch ($this->config->user_type) {
             case 'edir':
@@ -1196,9 +1239,13 @@ 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':
+                $result = $this->ldap_get_ad_pwdexpire($time, $ldapconnection, $user_dn);
+                break;
             default:
                 print_error('auth_ldap_usertypeundefined', 'auth');
         }
@@ -1216,7 +1263,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:
@@ -1315,6 +1363,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;
@@ -1337,7 +1390,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;
     }
 
@@ -1684,6 +1737,145 @@ class auth_plugin_ldap extends auth_plugin_base {
                             array('\\"', '\\00'), $text);
         return $text;
     }
+
+    /**
+     * Get password expiration time for a given user from Active Directory
+     *
+     * @param string $pwdlastset The time last time we changed the password.
+     * @param resource $lcapconn The open LDAP connection.
+     * @param string $user_dn The distinguished name of the user we are checking.
+     *
+     * @return string $unixtime
+     */
+    function ldap_get_ad_pwdexpire($pwdlastset, $ldapconn, $user_dn){
+        define ('ROOTDSE', '');
+        // UF_DONT_EXPIRE_PASSWD value taken from MSDN directly
+        define ('UF_DONT_EXPIRE_PASSWD', 0x00010000);
+    
+        global $CFG;
+
+        if (!function_exists('bcsub')) {
+            error_log ('You need the BCMath extension to use grace logins with Active Directory');
+            return 0;
+        }
+
+        // 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=*',
+                        array('userAccountControl'));
+        if (!$sr) {
+            error_log("ldap: error getting userAccountControl for $user_dn");
+            // don't expire password, as we are not sure it has to be
+            // expired or not.
+            return 0;
+        }
+            
+        $info = $this->ldap_get_entries($ldapconn, $sr);
+        $useraccountcontrol = $info[0]['userAccountControl'][0];
+        if ($useraccountcontrol & UF_DONT_EXPIRE_PASSWD) {
+            // password doesn't expire.
+            return 0;
+        }
+    
+        // If pwdLastSet is zero, the user must change his/her password now
+        // (unless UF_DONT_EXPIRE_PASSWD flag is set, but we already
+        // tested this above)
+        if ($pwdlastset === '0') {
+            // password has expired
+            return -1;
+        }
+    
+        // ----------------------------------------------------------------
+        // Password expiration time in Active Directory is the composition of
+        // two values:
+        //
+        //   - User's pwdLastSet attribute, that stores the last time
+        //     the password was changed.
+        //
+        //   - Domain's maxPwdAge attribute, that sets how long
+        //     passwords last in this domain.
+        //
+        // We already have the first value (passed in as a parameter). We
+        // need to get the second one. As we don't know the domain DN, we
+        // have to query rootDSE's defaultNamingContext attribute to get
+        // it. Then we have to query that DN's maxPwdAge attribute to get
+        // the real value.
+        //
+        // Once we have both values, we just need to combine them. But MS
+        // chose to use a different base and unit for time measurements.
+        // So we need to convert the values to Unix timestamps (see
+        // details below).
+        // ----------------------------------------------------------------
+    
+        $sr = ldap_read($ldapconn, ROOTDSE, 'objectclass=*',
+                        array('defaultNamingContext'));
+        if (!$sr) {
+            error_log("ldap: error querying rootDSE for Active Directory");
+            return 0;
+        }
+    
+        $info = $this->ldap_get_entries($ldapconn, $sr);
+        $domaindn = $info[0]['defaultNamingContext'][0];
+    
+        $sr = ldap_read ($ldapconn, $domaindn, 'objectclass=*',
+                         array('maxPwdAge'));
+        $info = $this->ldap_get_entries($ldapconn, $sr);
+        $maxpwdage = $info[0]['maxPwdAge'][0];
+
+        // ----------------------------------------------------------------
+        // MSDN says that "pwdLastSet contains the number of 100 nanosecond
+        // intervals since January 1, 1601 (UTC), stored in a 64 bit integer".
+        //
+        // According to Perl's Date::Manip, the number of seconds between
+        // this date and Unix epoch is 11644473600. So we have to
+        // substract this value to calculate a Unix time, once we have
+        // scaled pwdLastSet to seconds. This is the script used to
+        // calculate the value shown above:
+        //
+        //    #!/usr/bin/perl -w
+        //
+        //    use Date::Manip;
+        //
+        //    $date1 = ParseDate ("160101010000 UTC");
+        //    $date2 = ParseDate ("197001010000 UTC");
+        //    $delta = DateCalc($date1, $date2, \$err);
+        //    $secs = Delta_Format($delta, 0, "%st");
+        //    print "$secs \n";
+        //
+        // MSDN also says that "maxPwdAge is stored as a large integer that
+        // represents the number of 100 nanosecond intervals from the time
+        // the password was set before the password expires." We also need
+        // to scale this to seconds. Bear in mind that this value is stored
+        // as a _negative_ quantity (at least in my AD domain).
+        //
+        // As a last remark, if the low 32 bits of maxPwdAge are equal to 0,
+        // the maximum password age in the domain is set to 0, which means
+        // passwords do not expire (see 
+        // http://msdn2.microsoft.com/en-us/library/ms974598.aspx)
+        //
+        // As the quantities involved are too big for PHP integers, we
+        // need to use BCMath functions to work with arbitrary precision
+        // numbers.
+        // ----------------------------------------------------------------
+    
+
+        // If the low order 32 bits are 0, then passwords do not expire in
+        // the domain. Just do '$maxpwdage mod 2^32' and check the result
+        // (2^32 = 4294967296)
+        if (bcmod ($maxpwdage, 4294967296) === '0') {
+            return 0;
+        }
+
+        // Add up pwdLastSet and maxPwdAge to get password expiration
+        // time, in MS time units. Remember maxPwdAge is stored as a
+        // _negative_ quantity, so we need to substract it in fact.
+        $pwdexpire = bcsub ($pwdlastset, $maxpwdage);
+    
+        // Scale the result to convert it to Unix time units and return
+        // that value.
+        return bcsub( bcdiv($pwdexpire, '10000000'), '11644473600');
+    }
+
 }
 
 ?>

auth/ldap/config.html

@@ -63,7 +63,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 }
 
 ?>
-<table cellspacing="0" cellpadding="5" border="0" align="center">
+<table cellspacing="0" cellpadding="5" border="0">
 
 <tr>
    <td colspan="2">
@@ -228,7 +228,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 <tr valign="top" class="required">
         <td align="right"><label for="memberattribute_isdn"><?php print_string('auth_ldap_memberattribute_isdn_key','auth') ?></label></td>
         <td>
-    <input name="memberattribute" id="memberattribute_isdn" type="text" size="30" value="<?php echo $config->memberattribute_isdn?>" />
+    <input name="memberattribute_isdn" id="memberattribute_isdn" type="text" size="30" value="<?php echo $config->memberattribute_isdn?>" />
     <?php  if (isset($err['memberattribute_isdn'])) formerr($err['memberattribute_isdn']); ?>
     </td><td>
     <?php print_string('auth_ldap_memberattribute_isdn','auth') ?>

auth/manual/config.html

@@ -1,7 +1,7 @@
 <!-- No config needed -->
-<div align="center"><?php print_string('none'); ?></div>
+<div style="text-align:center"><?php print_string('none'); ?></div>
 
-<table cellspacing="0" cellpadding="5" border="0" align="center">
+<table cellspacing="0" cellpadding="5" border="0">
 <?php
 
 print_auth_lock_options('manual', $user_fields, get_string('auth_fieldlocks_help', 'auth'), false, false);

auth/mnet/auth.php

@@ -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));
             }
@@ -208,7 +208,7 @@ class auth_plugin_mnet extends auth_plugin_base {
             $mnet_session->confirm_timeout = time() + $this->config->rpc_negotiation_timeout;
             $mnet_session->expires = time() + (integer)ini_get('session.gc_maxlifetime');
             $mnet_session->session_id = session_id();
-            if (! $mnet_session->id = insert_record('mnet_session', $mnet_session)) {
+            if (! $mnet_session->id = insert_record('mnet_session', addslashes_object($mnet_session))) {
                 error(get_string('databaseerror', 'mnet'));
             }
         } else {
@@ -217,7 +217,7 @@ class auth_plugin_mnet extends auth_plugin_base {
             $mnet_session->confirm_timeout = time() + $this->config->rpc_negotiation_timeout;
             $mnet_session->expires = time() + (integer)ini_get('session.gc_maxlifetime');
             $mnet_session->session_id = session_id();
-            if (false == update_record('mnet_session', $mnet_session)) {
+            if (false == update_record('mnet_session', addslashes_object($mnet_session))) {
                 error(get_string('databaseerror', 'mnet'));
             }
         }
@@ -285,20 +285,20 @@ 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'));
             }
             $remoteuser->mnethostid = $remotehost->id;
-            if (! insert_record('user', $remoteuser)) {
+            if (! insert_record('user', addslashes_object($remoteuser))) {
                 error(get_string('databaseerror', 'mnet'));
             }
             $firsttime = true;
-            if (! $localuser = get_record('user', 'username', $remoteuser->username, 'mnethostid', $remotehost->id)) {
+            if (! $localuser = get_record('user', 'username', addslashes($remoteuser->username), 'mnethostid', $remotehost->id)) {
                 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 = '';
@@ -367,7 +367,7 @@ class auth_plugin_mnet extends auth_plugin_base {
 
         $localuser->mnethostid = $remotepeer->id;
 
-        $bool = update_record('user', $localuser);
+        $bool = update_record('user', addslashes_object($localuser));
         if (!$bool) {
             // TODO: Jonathan to clean up mess
             // Actually, this should never happen (modulo race conditions) - ML
@@ -390,12 +390,12 @@ class auth_plugin_mnet extends auth_plugin_base {
             $mnet_session->confirm_timeout = time();
             $mnet_session->expires = time() + (integer)$session_gc_maxlifetime;
             $mnet_session->session_id = session_id();
-            if (! $mnet_session->id = insert_record('mnet_session', $mnet_session)) {
+            if (! $mnet_session->id = insert_record('mnet_session', addslashes_object($mnet_session))) {
                 error(get_string('databaseerror', 'mnet'));
             }
         } else {
             $mnet_session->expires = time() + (integer)$session_gc_maxlifetime;
-            update_record('mnet_session', $mnet_session);
+            update_record('mnet_session', addslashes_object($mnet_session));
         }
 
         if (!$firsttime) {
@@ -539,7 +539,7 @@ class auth_plugin_mnet extends auth_plugin_base {
             // First up - do we have a record for this course?
             if (!array_key_exists($course['remoteid'], $currentcourses)) {
                 // No record - we must create it
-                $course['id']  =  insert_record('mnet_enrol_course', (object)$course);
+                $course['id']  =  insert_record('mnet_enrol_course', addslashes_object((object)$course));
                 $currentcourse = (object)$course;
             } else {
                 // Pointer to current course:
@@ -557,7 +557,7 @@ class auth_plugin_mnet extends auth_plugin_base {
                 }
 
                 if ($saveflag) {
-                    update_record('mnet_enrol_course', $currentcourse);
+                    update_record('mnet_enrol_course', addslashes_object($currentcourse));
                 }
 
                 if (isset($currentcourse->assignmentid) && is_numeric($currentcourse->assignmentid)) {
@@ -580,7 +580,7 @@ class auth_plugin_mnet extends auth_plugin_base {
                 $assignObj->hostid    = (int)$MNET_REMOTE_CLIENT->id;
                 $assignObj->courseid  = $course['id'];
                 $assignObj->rolename  = $course['defaultrolename'];
-                $assignObj->id = insert_record('mnet_enrol_assignments', $assignObj);
+                $assignObj->id = insert_record('mnet_enrol_assignments', addslashes_object($assignObj));
             }
         }
 
@@ -673,15 +673,16 @@ class auth_plugin_mnet extends auth_plugin_base {
             ORDER BY
                 h.name ASC";
 
-        $resultset = get_records_sql($query);
         $id_providers       = array();
         $service_providers  = array();
-        foreach($resultset as $hostservice) {
-            if(!empty($hostservice->idppublish) && !empty($hostservice->spsubscribe)) {
-                $service_providers[]= array('id' => $hostservice->id, 'name' => $hostservice->hostname, 'wwwroot' => $hostservice->wwwroot);
-            }
-            if(!empty($hostservice->idpsubscribe) && !empty($hostservice->sppublish)) {
-                $id_providers[]= array('id' => $hostservice->id, 'name' => $hostservice->hostname, 'wwwroot' => $hostservice->wwwroot);
+        if ($resultset = get_records_sql($query)) {
+            foreach($resultset as $hostservice) {
+                if(!empty($hostservice->idppublish) && !empty($hostservice->spsubscribe)) {
+                    $service_providers[]= array('id' => $hostservice->id, 'name' => $hostservice->hostname, 'wwwroot' => $hostservice->wwwroot);
+                }
+                if(!empty($hostservice->idpsubscribe) && !empty($hostservice->sppublish)) {
+                    $id_providers[]= array('id' => $hostservice->id, 'name' => $hostservice->hostname, 'wwwroot' => $hostservice->wwwroot);
+                }
             }
         }
 
@@ -694,7 +695,7 @@ class auth_plugin_mnet extends auth_plugin_base {
     function process_config($config) {
         // set to defaults if undefined
         if (!isset ($config->rpc_negotiation_timeout)) {
-            $config->host = '30';
+            $config->rpc_negotiation_timeout = '30';
         }
         if (!isset ($config->auto_add_remote_users)) {
             $config->auto_add_remote_users = '0';
@@ -884,7 +885,7 @@ class auth_plugin_mnet extends auth_plugin_base {
 
             unset($logEntryObj->username);
 
-            $insertok = insert_record('mnet_log', $logEntryObj, false);
+            $insertok = insert_record('mnet_log', addslashes_object($logEntryObj), false);
 
             if ($insertok) {
                 $MNET_REMOTE_CLIENT->last_log_id = $logEntryObj->remoteid;
@@ -991,8 +992,8 @@ class auth_plugin_mnet extends auth_plugin_base {
         $random100 = rand(0,100);
         if ($random100 < 10) {     // Approximately 10% of the time.
             // nuke olden sessions
-            $longtime = $timenow - (1 * 3600 * 24);
-            delete_records_select('mnet_session', "expires < $timenow");
+            $longtime = time() - (1 * 3600 * 24);
+            delete_records_select('mnet_session', "expires < $longtime");
         }
     }
 
@@ -1005,7 +1006,7 @@ class auth_plugin_mnet extends auth_plugin_base {
      */
     function prelogout_hook() {
         global $MNET, $CFG, $USER;
-        if ($USER->auth != 'mnet') {
+        if (!is_enabled_auth('mnet')) {
             return;
         }
 
@@ -1038,14 +1039,14 @@ class auth_plugin_mnet extends auth_plugin_base {
             from
                 {$CFG->prefix}mnet_session s
             where
-                s.username   = '$username' AND
+                s.username   = '".addslashes($username)."' AND
                 s.useragent  = '$useragent' AND
                 s.mnethostid = '{$USER->mnethostid}'";
 
         $mnetsessions = get_records_sql($sql);
 
         $ignore = delete_records('mnet_session',
-                                 'username', $username,
+                                 'username', addslashes($username),
                                  'useragent', $useragent,
                                  'mnethostid', $USER->mnethostid);
 
@@ -1080,7 +1081,7 @@ class auth_plugin_mnet extends auth_plugin_base {
         global $CFG, $USER, $MNET_REMOTE_CLIENT;
         require_once $CFG->dirroot.'/mnet/xmlrpc/client.php';
 
-        $userid = get_field('user', 'id', 'mnethostid', $CFG->mnet_localhost_id, 'username', $username);
+        $userid = get_field('user', 'id', 'mnethostid', $CFG->mnet_localhost_id, 'username', addslashes($username));
 
         $returnstring = '';
         $sql = "
@@ -1176,7 +1177,7 @@ class auth_plugin_mnet extends auth_plugin_base {
      */
     function kill_child($username, $useragent) {
         global $CFG, $MNET_REMOTE_CLIENT;
-        $session = get_record('mnet_session', 'username', $username, 'mnethostid', $MNET_REMOTE_CLIENT->id, 'useragent', $useragent);
+        $session = get_record('mnet_session', 'username', addslashes($username), 'mnethostid', $MNET_REMOTE_CLIENT->id, 'useragent', $useragent);
         if (false != $session) {
             $start = ob_start();
 
@@ -1260,9 +1261,9 @@ class auth_plugin_mnet extends auth_plugin_base {
     function fetch_user_image($username) {
         global $CFG;
 
-        if ($user = get_record('user', 'username', $username, 'mnethostid', $CFG->mnet_localhost_id)) {
-            $filename1 = "{$CFG->dataroot}/users/{$user->id}/f1.jpg";
-            $filename2 = "{$CFG->dataroot}/users/{$user->id}/f2.jpg";
+        if ($user = get_record('user', 'username', addslashes($username), 'mnethostid', $CFG->mnet_localhost_id)) {
+            $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));
@@ -1331,7 +1332,7 @@ class auth_plugin_mnet extends auth_plugin_base {
      */
     function can_login_remotely($username, $mnethostid) {
         $accessctrl = 'allow';
-        $aclrecord = get_record('mnet_sso_access_control', 'username', $username, 'mnet_host_id', $mnethostid);
+        $aclrecord = get_record('mnet_sso_access_control', 'username', addslashes($username), 'mnet_host_id', $mnethostid);
         if (!empty($aclrecord)) {
             $accessctrl = $aclrecord->accessctrl;
         }

auth/mnet/config.html

@@ -2,7 +2,7 @@
 
 // set to defaults if undefined
 if (!isset($config->rpc_negotiation_timeout)) {
-    $config->host = '30';
+    $config->rpc_negotiation_timeout = '30';
 }
 if (!isset ($config->auto_add_remote_users)) {
     $config->auto_add_remote_users = '0';
@@ -15,7 +15,8 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict'
 }
 
 ?>
-<table cellspacing="0" cellpadding="5" border="0" align="center">
+<div id="mnetconfig">
+<table cellspacing="0" cellpadding="5">
 
 <tr valign="top" class="required">
     <td align="right"><?php print_string('rpc_negotiation_timeout', 'auth'); ?>: </td>
@@ -59,29 +60,30 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict'
     <td colspan="3"><?php print_string('auth_mnet_roamin', 'auth'); ?>: </td>
 </tr>
 <?php
-foreach($id_providers as $host):
+foreach($id_providers as $host) {
 ?>
 <tr valign="top" class="required">
     <td align="right"><?php echo $host['name']; ?>: </td>
     <td colspan="2"><?php echo $host['wwwroot']; ?> </td>
 </tr>
 <?php
-endforeach;
+}
 ?>
 <tr valign="top" class="required">
     <td colspan="3"><?php print_string('auth_mnet_roamout', 'auth'); ?>: </td>
 </tr>
 <?php
-foreach($service_providers as $host):
+foreach($service_providers as $host) {
 ?>
 <tr valign="top" class="required">
     <td align="right"><?php echo $host['name']; ?>: </td>
     <td colspan="2"><?php echo $host['wwwroot']; ?> </td>
 </tr>
 <?php
-endforeach;
+}
 
 // print_auth_lock_options('mnet', $user_fields, get_string('auth_fieldlocks_help', 'auth'), false, false);
 
 ?>
 </table>
+</div>

auth/nntp/config.html

@@ -12,7 +12,7 @@ if (!isset($config->changepasswordurl)) {
 }
 
 ?>
-<table cellspacing="0" cellpadding="5" border="0" align="center">
+<table cellspacing="0" cellpadding="5" border="0">
 
 <tr valign="top" class="required">
     <td align="right"><?php print_string('auth_nntphost_key', 'auth') ?>: </td>