usability: show terms and conditions directly on registration page

Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

htdocs/auth/internal/lang/en.utf8/auth.internal.php

@@ -64,6 +64,3 @@ $string['registrationunsuccessful'] = 'Sorry, your registration attempt was unsu
 $string['usernamealreadytaken'] = 'Sorry, this username is already taken';
 $string['usernameinvalidform'] = 'Usernames may contain letters, numbers and most common symbols, and must be from 3 to 30 characters in length.  Spaces are not allowed.';
 $string['youmaynotregisterwithouttandc'] = 'You may not register unless you agree to abide by the <a href="terms.php">Terms and Conditions</a>';
-$string['youmustagreetothetermsandconditions'] = 'You must agree to the <a href="terms.php">Terms and Conditions</a>';
-
-?>

htdocs/register.php

@@ -241,11 +241,17 @@ else {
     die_info(get_string('registeringdisallowed'));
 }
 
+$elements['tandctext'] = array(
+    'type' => 'textarea',
+    'rows' => 15,
+    'cols' => 60,
+    'readonly' => 'yes',
+    'value' => preg_replace('#([^\n])(\n)([^\n])#', '$1 $3', html2text(get_site_page_content('termsandconditions'))),
+);
 $elements['tandc'] = array(
     'type' => 'radio',
     'name' => $hashed_fields['tandc'],
     'title' => get_string('iagreetothetermsandconditions', 'auth.internal'),
-    'description' => get_string('youmustagreetothetermsandconditions', 'auth.internal'),
     'options' => array(
         'yes' => get_string('yes'),
         'no'  => get_string('no')