Added two configuration variables to the config page.

   configextendedusernamechars

   forceloginforprofiles

These were already in the config-dist.php

diff --git a/admin/config.html b/admin/config.html
index 2e24fb8040ae213f102610330ae0cbcb9fea43d0..906ef1d409521bcd1ee8ec7b46036591f0eeba8e 100644 (file)
--- a/admin/config.html
+++ b/admin/config.html
@@ -404,6 +404,21 @@
     <?php print_string("configfullnamedisplay") ?>
     </td>
 </tr>
+<tr valign=top>
+       <td align=right><p>extendedusernamechars:</td>
+       <td>
+    <?php 
+       unset($options);
+       $options[0] = get_string("no");
+       $options[1] = get_string("yes");
+
+       choose_from_menu ($options, "extendedusernamechars", $config->extendedusernamechars, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configextendedusernamechars") ?>
+    </td>
+</tr>
 <tr valign=top>
        <td align=right><p>forcelogin:</td>
        <td>
@@ -419,6 +434,21 @@
     <?php print_string("configforcelogin") ?>
     </td>
 </tr>
+<tr valign=top>
+       <td align=right><p>forceloginforprofiles:</td>
+       <td>
+    <?php 
+       unset($options);
+       $options[0]  = get_string('no');
+       $options[1]  = get_string('yes');
+
+       choose_from_menu ($options, "forceloginforprofiles", $config->forceloginforprofiles, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configforceloginforprofiles") ?>
+    </td>
+</tr>
 <tr valign=top>
        <td align=right><p>opentogoogle:</td>
        <td>

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index bdf4a0c41a07c3715c0f370b63430ac8efc43118..5e1f229b26229c7e37cc6cee1e8a0a3f577115bc 100644 (file)
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -145,8 +145,10 @@ $string['configdeleteunconfirmed'] = 'If you are using email authentication, thi
 $string['configenablerssfeeds'] = 'This switch will enable RSS feeds from across the site.  To actually see any change you will need to enable RSS feeds in the individual modules too - go to the Modules settings under Admin Configuration.';
 $string['configenablerssfeedsdisabled'] = ' It is not available because RSS feeds are disabled in all the Site. To enable them, go to the Variables settings under Admin Configuration.';
 $string['configerrorlevel'] = 'Choose the amount of PHP warnings that you want to be displayed.  Normal is usually the best choice.';
+$string['configextendedusernamechars'] = 'Enable this setting to allow students to use any characters in their usernames (note this does not affect their actual names).  The default is \"false\" which restricts usernames to be alphanumeric characters only';
 $string['configfilteruploadedfiles'] = 'Enabling this setting will cause Moodle to process all uploaded HTML and text files with the filters before displaying them.';
 $string['configforcelogin'] = 'Normally, the front page of the site and the course listings (but not courses) can be read by people without logging in to the site.  If you want to force people to log in before they do ANYTHING on the site, then you should enable this setting.';
+$string['configforceloginforprofiles'] = 'Enable this setting to force people to login as a real (non-guest) account before being allowed to see the user profile pages.  By default this is disabled (\"false\") so that prospective students can read about the teachers of each course, but this also means that web search engines can see them.';
 $string['configframename'] = 'If you are embedding Moodle within a web frame, then put the name of this frame here.  Otherwise this value should remain as \'_top\'';
 $string['configfullnamedisplay'] = 'This defines how names are shown when they are displayed in full. For most mono-lingual sites the most efficient setting is the default \"Given names + Surname\", but you may choose to hide surnames altogether, or to leave it up to the current language pack to decide (some languages have different conventions).';
 $string['configgdversion'] = 'Indicate the version of GD that is installed.  The version shown by default is the one that has been auto-detected.  Don\'t change this unless you really know what you\'re doing.';

diff --git a/lib/defaults.php b/lib/defaults.php
index b2dc9f9adb6dcdfefda381540078c4db01563025..9cf1c8903f08fc0203b0dc35c250fcb952ce93d6 100644 (file)
--- a/lib/defaults.php
+++ b/lib/defaults.php
@@ -12,8 +12,10 @@
        "debug"            =>  7,
        "deleteunconfirmed" => 168,
        "enablerssfeeds"   => 0,
+       "extendedusernamechars"   => false,
        "filteruploadedfiles"  =>  true,
        "forcelogin"       =>  false,
+       "forceloginforprofiles"  =>  false,
        "fullnamedisplay"  => "firstname lastname",
        "framename"        => "_top",
        "frontpage"        =>  0,