Permalink
Browse files

mnet: xhtml strrrrrrrrrrickt mein herr

  • Loading branch information...
martinlanghoff
martinlanghoff committed Jan 4, 2007
1 parent 786dcea commit b763d139b4251020acd314a507d11c719c8c382a
Showing with 29 additions and 28 deletions.
  1. +1 −1 admin/mnet/index.html
  2. +4 −4 admin/mnet/index.php
  3. +4 −4 admin/mnet/peers.html
  4. +4 −4 admin/mnet/peers.php
  5. +1 −0 admin/mnet/trustedhosts.html
  6. +15 −15 lang/en_utf8/mnet.php
View
@@ -39,7 +39,7 @@
<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'); ?>" />
View
@@ -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>
@@ -111,13 +111,13 @@
<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'); ?>" />
View
@@ -40,9 +40,9 @@
?>
<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 @@
</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>
View
@@ -78,15 +78,15 @@
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;
$mnet_peer->public_key = $form->public_key;
$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 @@
// 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 @@
} 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');
}
@@ -56,6 +56,7 @@
</td>
</tr>
</table>
+</center>
<?php
admin_externalpage_print_footer($adminroot);
?>
View
@@ -9,17 +9,17 @@
$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['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['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['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['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';

0 comments on commit b763d13

Please sign in to comment.