MERGED in some changes from the defunct resource branch

diff --git a/admin/config.html b/admin/config.html
index 6bee63eaaf81e338e127f3e8c3d46239c4ea1dc6..d94fdd128df1eeaed833543f2c6e1ffcbfed2708 100644 (file)
--- a/admin/config.html
+++ b/admin/config.html
@@ -232,6 +232,52 @@
     <?php print_string("configloglifetime") ?>
     </td>
 </tr>
+<tr valign="top">
+    <td align="right"><p>displayloginfailures:</p></td>
+    <td>
+    <?php
+       unset($options);
+       $options[''] = get_string('nobody');
+       $options['admin'] = get_string('administrators');
+       $options['teacher'] = get_string('administratorsandteachers');
+       $options['everybody'] = get_string('everybody');
+       choose_from_menu($options, "displayloginfailures",$config->displayloginfailures,"","","");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configdisplayloginfailures") ?>
+    </td>
+</tr>
+<tr valign="top">
+    <td align="right"><p>notifyloginfailures:</p></td>
+    <td>
+    <?php
+       unset($options);
+       $options[''] = get_string('nobody');
+       $options['mainadmin'] = get_string('administrator');
+       $options['alladmins'] = get_string('administratorsall');
+       choose_from_menu($options,"notifyloginfailures",$config->notifyloginfailures,"","","");
+    ?>
+    </td>
+    <td>
+    <?php print_string('confignotifyloginfailures') ?>
+    </td>
+</tr>
+<tr valign="top">
+    <td align="right"><p>notifythreshold:</p></td>
+    <td>
+    <?php
+       unset($options);
+       for ($i=1; $i<=100; $i++) {
+           $options[$i] = "$i";
+       }
+       choose_from_menu($options,"notifythreshold",$config->notifythreshold,"","","");
+    ?>
+    </td>
+    <td>
+    <?php print_string('confignotifythreshold') ?>
+    </td>
+</tr>
 <tr valign=top>
     <td align=right><p>sessiontimeout:</td>
     <td>

diff --git a/admin/cron.php b/admin/cron.php
index ee8ff93797fbb1cf8f5ff42893f97a7c87a57997..9fc5fecf0aeba7c90d4109d6709321551ecb1a0e 100644 (file)
--- a/admin/cron.php
+++ b/admin/cron.php
@@ -117,7 +117,12 @@
             $cachelifetime = time() - $CFG->cachetext;
             delete_records_select("cache_text", "timemodified < '$cachelifetime'");
         }
-    }
+
+        if (!empty($CFG->notifyloginfailures)) {
+            notify_login_failures();
+        }
+
+    } // End of occasional clean-up tasks
 
     if (file_exists("$CFG->dataroot/cronextra.php")) {
         include("$CFG->dataroot/cronextra.php");

diff --git a/admin/index.php b/admin/index.php
index 5d9b0bc594d7b93c0cf60fe40f92bc1969dcbb1e..2303c24699fc2d62f4839c5463658f4adf0c7fae 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -394,7 +394,8 @@
 
     $userdata = "<font size=+1>&nbsp;</font><a href=\"auth.php\">".get_string("authentication")."</a> - <font size=1>".
                  get_string("adminhelpauthentication")."</font><br />";
-
+    $userdata .= "<font size=+1>&nbsp;</font><a href=\"user.php\">".get_string("edituser")."</a> - <font size=1>".
+                 get_string("adminhelpedituser")."</font><br />";
     if (is_internal_auth()) {
         $userdata .= "<font size=+1>&nbsp;</font><a href=\"$CFG->wwwroot/$CFG->admin/user.php?newuser=true\">".
                       get_string("addnewuser")."</a> - <font size=1>".
@@ -403,17 +404,19 @@
                       get_string("uploadusers")."</a> - <font size=1>".
                       get_string("adminhelpuploadusers")."</font><br />";
     }
-    $userdata .= "<font size=+1>&nbsp;</font><a href=\"user.php\">".get_string("edituser")."</a> - <font size=1>".
-                 get_string("adminhelpedituser")."</font><br />";
-    $userdata .= "<font size=+1>&nbsp;</font><a href=\"admin.php\">".get_string("assignadmins")."</a> - <font size=1>".
-                 get_string("adminhelpassignadmins")."</font><br />";
-    $userdata .= "<font size=+1>&nbsp;</font><a href=\"creators.php\">".get_string("assigncreators")."</a> - <font size=1>".
-                 get_string("adminhelpassigncreators")."</font><br />";
+
+    $userdata .= "<hr><font size=+1>&nbsp;</font><a href=\"enrol.php\">".get_string("enrolments")."</a> - <font size=1>".
+                 get_string("adminhelpenrolments")."</font><br />";
+    $userdata .= "<font size=+1>&nbsp;</font><a href=\"../course/index.php?edit=off\">".get_string("assignstudents")."</a> - <font size=1>".
+                 get_string("adminhelpassignstudents")."</font><br />";
+
     $userdata .= "<font size=+1>&nbsp;</font><a href=\"../course/index.php?edit=on\">".get_string("assignteachers")."</a> - <font size=1>".
                  get_string("adminhelpassignteachers").
                  " <img src=\"../pix/t/user.gif\" height=11 width=11></font><br />";
-    $userdata .= "<font size=+1>&nbsp;</font><a href=\"../course/index.php?edit=off\">".get_string("assignstudents")."</a> - <font size=1>".
-                 get_string("adminhelpassignstudents")."</font>";
+    $userdata .= "<font size=+1>&nbsp;</font><a href=\"creators.php\">".get_string("assigncreators")."</a> - <font size=1>".
+                 get_string("adminhelpassigncreators")."</font><br />";
+    $userdata .= "<font size=+1>&nbsp;</font><a href=\"admin.php\">".get_string("assignadmins")."</a> - <font size=1>".
+                 get_string("adminhelpassignadmins")."</font><br />";
 
     $table->data[] = array("<font size=+1><b><a href=\"users.php\">".get_string("users")."</a></b>", $userdata);
 
@@ -459,5 +462,3 @@
     print_footer($site);
 
 ?>
-
-