From d9e12f5a06ef902e761e1c0c6a06336e90d43de4 Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Mon, 30 Aug 2004 13:23:09 +0000
Subject: [PATCH] Merged new config variable from stable

---
 admin/config.html  | 29 +++++++++++++++--------------
 lang/en/moodle.php |  3 ++-
 lib/defaults.php   |  3 ++-
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/admin/config.html b/admin/config.html
index dbe4db4aac..c2d99b3c21 100644
--- a/admin/config.html
+++ b/admin/config.html
@@ -130,20 +130,6 @@
     <?php print_string("configgdversion") ?>
     </td>
 </tr>
-<tr valign=top>
-    <td align=right><p>htmleditor:</td>
-    <td>
-    <?php
-       unset($options);
-       $options[0] = get_string("allownot");
-       $options[1] = get_string("allow");
-       choose_from_menu ($options, "htmleditor", $config->htmleditor, "", "", "");
-    ?>
-    </td>
-    <td>
-    <?php print_string("confightmleditor") ?>
-    </td>
-</tr>
 <tr valign=top>
     <td align=right><p>maxeditingtime:</td>
     <td>
@@ -416,6 +402,21 @@
     <?php print_string("configteacherassignteachers") ?>
     </td>
 </tr>
+<tr valign=top>
+    <td align=right><p>allusersaresitestudents:</td>
+    <td>
+    <?php
+       unset($options);
+       $options[0]  = get_string("no");
+       $options[1]  = get_string("yes");
+
+       choose_from_menu ($options, "allusersaresitestudents", $config->allusersaresitestudents, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configallusersaresitestudents") ?>
+    </td>
+</tr>
 <tr valign=top>
     <td align=right><p>allowunenroll:</td>
     <td>
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 4ac96e208d..5b78a00d37 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -143,11 +143,12 @@ $string['choosetheme'] = 'Choose theme';
 $string['chooseuser'] = 'Choose a user';
 $string['city'] = 'City/town';
 $string['cleaningtempdata'] = 'Cleaning temp data';
-$string['clicktochange'] = 'click to change';
+$string['clicktochange'] = 'Click to change';
 $string['closewindow'] = 'Close this window';
 $string['comparelanguage'] = 'Compare and edit current language';
 $string['complete'] = 'Complete';
 $string['configallowunenroll'] = 'If this is set \'Yes\', then students are allowed to unenroll themselves from courses whenever they like. Otherwise they are not allowed, and this process will be solely controlled by the teachers and administrators.';
+$string['configallusersaresitestudents'] = 'For activities on the front page of the site, should ALL users be considered as students?  If you answer \"Yes\", then any confirmed user account will be allowed to participate as a student in those activities.  If you answer \"No\", then only users who are already a participant in at least one course will be able to take part in those front page activities.';
 $string['configautologinguests'] = 'Should visitors be logged in as guests automatically when entering courses with guest access?';
 $string['configcachetext'] = 'For larger sites or sites that use text filters, this setting can really speed things up.  Copies of texts will be retained in their processed form for the time specified here.  Setting this too small may actually slow things down slightly,  but setting it too large may mean texts take too long to refresh (with new links, for example).';
 $string['configcountry'] = 'If you set a country here, then this country will be selected by default on new user accounts.  To force users to choose a country, just leave this unset.';
diff --git a/lib/defaults.php b/lib/defaults.php
index 3a170e02e6..d902c4799c 100644
--- a/lib/defaults.php
+++ b/lib/defaults.php
@@ -4,10 +4,11 @@
 // It defines default values for any important configuration variables
 
    $defaults = array (
+       "allowunenroll"            =>  true,
+       "allusersaresitestudents"  =>  true,
        "auth"                     => 'email',
        "auth_pop3mailbox"         => 'INBOX',
        "autologinguests"          => 0,
-       "allowunenroll"            =>  true,
        "cachetext"                =>  60,
        "changepassword"           =>  true,
        "country"                  => "",
-- 
2.39.5