]> git.mjollnir.org Git - moodle.git/commitdiff
mnet: xhtml strrrrrrrrrrickt mein herr
authormartinlanghoff <martinlanghoff>
Thu, 4 Jan 2007 06:13:20 +0000 (06:13 +0000)
committermartinlanghoff <martinlanghoff>
Thu, 4 Jan 2007 06:13:20 +0000 (06:13 +0000)
admin/mnet/index.html
admin/mnet/index.php
admin/mnet/peers.html
admin/mnet/peers.php
admin/mnet/trustedhosts.html
lang/en_utf8/mnet.php

index 6a058961b1b349119154530856fe339b286925b4..d9b939b125b8b835d64a1b4ec63e0e3aa737e154 100644 (file)
@@ -39,7 +39,7 @@ admin_externalpage_print_header($adminroot);
                     <td colspan="2" cellpadding="0"><span><?php print_string('expireyourkeyexplain', 'mnet'); ?></span></td>
                 </tr>
                 <tr valign="top">
-                    <td align="left" width="10" nowrap><?php print_string('expireyourkey', 'mnet'); ?></td>
+                    <td align="left" width="10" nowrap="nowrap"><?php print_string('expireyourkey', 'mnet'); ?></td>
                     <td align="left"><input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
                         <input type="hidden" name="deleteKey" value="" />
                         <input type="submit" name="submit" value="<?php print_string('delete'); ?>" />
index 3b5479e25dcebd42e551b9e1c29f0d75dc15a425..560c529a661ae4932f67f280b58dd16608581e6c 100644 (file)
@@ -86,7 +86,7 @@
             <td  class="generalboxcontent">
             <table cellpadding="9" cellspacing="0" >
                 <tr valign="top">
-                    <td colspan="2" class="header" cellpadding="0"><span><?php print_string('aboutyourhost', 'mnet'); ?></span></td>
+                    <td colspan="2" class="header" cellpadding="0"><?php print_string('aboutyourhost', 'mnet'); ?></td>
                 </tr>
                 <tr valign="top">
                     <td align="right">Public Key:</td>
             <td  class="generalboxcontent">
             <table cellpadding="9" cellspacing="0" >
                 <tr valign="top">
-                    <td colspan="2" class="header" cellpadding="0"><span><?php print_string('expireyourkey', 'mnet'); ?></span></td>
+                    <td colspan="2" class="header" cellpadding="0"><?php print_string('expireyourkey', 'mnet'); ?></td>
                 </tr>
                 <tr valign="top">
-                    <td colspan="2" cellpadding="0"><span><?php print_string('expireyourkeyexplain', 'mnet'); ?></span></td>
+                    <td colspan="2" cellpadding="0"><?php print_string('expireyourkeyexplain', 'mnet'); ?></td>
                 </tr>
                 <tr valign="top">
-                    <td align="left" width="10" nowrap><?php print_string('expireyourkey', 'mnet'); ?></td>
+                    <td align="left" width="10" nowrap="nowrap"><?php print_string('expireyourkey', 'mnet'); ?></td>
                     <td align="left"><input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
                         <input type="hidden" name="deleteKey" value="" />
                         <input type="submit" name="submit" value="<?php print_string('delete'); ?>" />
index 90c40443e64944622ac7892068c5eeec85bc983c..bba20a5e4d444244518f7ecb8fb6c542d0359809 100644 (file)
@@ -40,9 +40,9 @@ admin_externalpage_print_header($adminroot);
 
 ?>
     <tr>
-        <td class="cell c0"><a href="peers.php?step=update&hostid=<?php echo $host->id; ?>"><?php echo $host->name; ?></a></td>
-        <td class="cell c1"><a href="peers.php?step=update&hostid=<?php echo $host->id; ?>"><?php echo $host->wwwroot; ?></a></td>
-        <td class="cell c2" nowrap><?php if ($host->id != $CFG->mnet_all_hosts_id) echo $last_connect; ?></td>
+        <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 c3">
 <?php   if ($host->id != $CFG->mnet_all_hosts_id): ?>
             <form method="POST" action="delete.php">
@@ -69,7 +69,7 @@ admin_externalpage_print_header($adminroot);
     </tr>
     <tr>
         <td class="cell c0"></td>
-        <td class="cell c1"><input type="text" name="wwwroot" value=""></td>
+        <td class="cell c1"><input type="text" name="wwwroot" value="" /></td>
         <td class="cell c2"></td>
         <td class="cell c3"></td>
     </tr>
index 05fb81d65f2f543746e722248d6bc445833154f2..d028f4e8d42cc2dc67fd2626e5d5a06e7dee4890 100644 (file)
@@ -78,7 +78,7 @@ if (($form = data_submitted()) && confirm_sesskey()) {
         if (isset($form->public_key)) {
             $form->public_key = clean_param($form->public_key, PARAM_PEM);
             if (empty($form->public_key)) {
-                error(get_string("invalidpubkey", 'mnet'),'peers.php?step=update&hostid='.$mnet_peer->id);
+                error(get_string("invalidpubkey", 'mnet'),'peers.php?step=update&amp;hostid='.$mnet_peer->id);
                 exit;
             } else {
                 $oldkey = $mnet_peer->public_key;
@@ -86,7 +86,7 @@ if (($form = data_submitted()) && confirm_sesskey()) {
                 $mnet_peer->public_key_expires   = $mnet_peer->check_common_name($form->public_key);
                 if ($mnet_peer->public_key_expires == false) {
                     $mnet_peer->public_key == $oldkey;
-                    error(get_string("invalidpubkey", 'mnet'),'peers.php?step=update&hostid='.$mnet_peer->id);
+                    error(get_string("invalidpubkey", 'mnet'),'peers.php?step=update&amp;hostid='.$mnet_peer->id);
                     exit;
                 }
             }
@@ -95,7 +95,7 @@ if (($form = data_submitted()) && confirm_sesskey()) {
         // PREVENT DUPLICATE RECORDS ///////////////////////////////////////////
         if ('input' == $form->step) {
             if ( isset($mnet_peer->id) && $mnet_peer->id > 0 ) {
-                error(get_string("hostexists", 'mnet', $mnet_peer->id),'peers.php?step=update&hostid='.$mnet_peer->id);
+                error(get_string("hostexists", 'mnet', $mnet_peer->id),'peers.php?step=update&amp;hostid='.$mnet_peer->id);
             }
         }
 
@@ -104,7 +104,7 @@ if (($form = data_submitted()) && confirm_sesskey()) {
         } elseif ('commit' == $form->step) {
             $bool = $mnet_peer->commit();
             if ($bool) {
-                redirect('peers.php?step=update&hostid='.$mnet_peer->id, get_string('changessaved'));
+                redirect('peers.php?step=update&amp;hostid='.$mnet_peer->id, get_string('changessaved'));
             } else {
                 error('Invalid action parameter.', 'index.php');
             }
index 34dc636d46dc771b6a0c0f3c63eeb45b1a4819c8..37e3b3bc48e419dace51e225bd14326c6a8aca5f 100644 (file)
@@ -56,6 +56,7 @@ admin_externalpage_print_header($adminroot);
         </td>
     </tr>
 </table>
+</center>
 <?php
 admin_externalpage_print_footer($adminroot);
 ?>
\ No newline at end of file
index d344c4492c4db8cc4fb24cadbb9a1aa4c742c078..60bcd5e575d0a8e762e2346b00d5b9d6e313c1ca 100644 (file)
@@ -9,17 +9,17 @@ $string['hostsettings']                 = 'Host Settings';
 $string['mnetpeers']                    = 'Moodle Network Peers';
 $string['mnetservices']                 = 'Moodle Network Services';
 $string['trustedhosts']                 = 'Trusted Hosts';
-$string['trustedhostsexplain']          = 'Please enter a list of IP addresses or networks, one on each line. Some examples:<br>'.
-                                          'Your local host:<br>'.
-                                          '127.0.0.1<br>'.
-                                          'Your local host (with a network block):<br>'.
-                                          '127.0.0.1/32<br>'.
-                                          'Only the host with IP address 192.168.0.7:<br>'.
-                                          '192.168.0.7/32<br>'.
-                                          'Any host with an IP address between 192.168.0.1 and 192.168.0.255:<br>'.
-                                          '192.168.0.0/24<br>'.
-                                          'Any host whatsoever:<br>'.
-                                          '192.168.0.0/0<br>'.
+$string['trustedhostsexplain']          = 'Please enter a list of IP addresses or networks, one on each line. Some examples:<br />'.
+                                          'Your local host:<br />'.
+                                          '127.0.0.1<br />'.
+                                          'Your local host (with a network block):<br />'.
+                                          '127.0.0.1/32<br />'.
+                                          'Only the host with IP address 192.168.0.7:<br />'.
+                                          '192.168.0.7/32<br />'.
+                                          'Any host with an IP address between 192.168.0.1 and 192.168.0.255:<br />'.
+                                          '192.168.0.0/24<br />'.
+                                          'Any host whatsoever:<br />'.
+                                          '192.168.0.0/0<br />'.
                                           'Obviously the last example is not a recommended configuration.';
 
 $string['currentkey']                   = 'Current Public Key';
@@ -29,7 +29,7 @@ $string['expireyourkey']                = 'Delete This Key';
 $string['deletekeycheck']               = 'Are you absolutely sure you want to delete this key?';
 $string['expireyourkeyexplain']         = 'Moodle automatically rotates your keys every 28 days (by default) but you have the option to '.
                                           '<em>manually</em> expire this key at any time. This will only be useful if you believe this '.
-                                          'key has been compromised. A replacement will be immediately automatically generated.<br>'.
+                                          'key has been compromised. A replacement will be immediately automatically generated.<br />'.
                                           'Deleting this key will make it impossible for other Moodles to communicate with you, until you '.
                                           'manually contact each administrator and provide them with your new key.';
 $string['deleteoutoftime']              = 'Your 60-second window for deleting this key has expired. Please start again.'; 
@@ -50,7 +50,7 @@ $string['forbidden-transport']          = 'The transport method you are trying t
 
 $string['registerallhosts']             = 'Register all hosts';
 $string['registerallhostsexplain']      = 'You can choose to register all hosts that try to connect to you. This means that a record will appear in your hosts list for any '.
-                                          'Moodle site that connects to you and requests your public key.<br>'.
+                                          'Moodle site that connects to you and requests your public key.<br />'.
                                           'You have the option below to configure services for \'All Hosts\' and by enabling some services there, you are able to provide '.
                                           'services to any Moodle server indiscriminately.';
 
@@ -112,7 +112,7 @@ $string['moodle_home_help']             = 'The path to the homepage of Moodle on
 $string['hostnamehelp']                 = 'The fully-qualified domain name of the remote host, e.g. www.example.com';
 $string['idhelp']                       = 'This value is automatically assigned and cannot be changed';
 $string['invalidpubkey']                = 'The key is not a valid SSL key.';
-$string['nopubkey']                     = 'There was a problem retrieving the public key.<br>Maybe the host does not allow Moodle Networking or the key is invalid.';
+$string['nopubkey']                     = 'There was a problem retrieving the public key.<br />Maybe the host does not allow Moodle Networking or the key is invalid.';
 $string['last_connect_time_help']       = 'The time that you last connected to this host.';
 $string['last_transport_help']          = 'The transport that you used for the last connection to this host.';
 $string['transport_help']               = 'These options are reciprocal, so you can only force a remote host to use a signed SSL cert if your server also has a signed SSL cert.';
@@ -141,7 +141,7 @@ $string['notPEM']                       = 'This key is not in PEM format. It wil
 $string['notBASE64']                    = 'This string is not in Base64 Encoded format. It cannot be a valid key.';
 
 $string['usercannotchangepassword'] = 'You cannot change your password here since you are a remote user.';
-$string['userchangepasswordlink'] = '<br> You may be able to change your password at your <a href=\"$a->wwwroot/login/change_password.php\">$a->description</a> provider.';
+$string['userchangepasswordlink'] = '<br /> You may be able to change your password at your <a href=\"$a->wwwroot/login/change_password.php\">$a->description</a> provider.';
 
 $string['remotehost'] = 'Remote Hub';
 $string['allow'] = 'Allow';