From: martinlanghoff Date: Thu, 4 Jan 2007 06:13:20 +0000 (+0000) Subject: mnet: xhtml strrrrrrrrrrickt mein herr X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b763d139b4251020acd314a507d11c719c8c382a;p=moodle.git mnet: xhtml strrrrrrrrrrickt mein herr --- diff --git a/admin/mnet/index.html b/admin/mnet/index.html index 6a058961b1..d9b939b125 100644 --- a/admin/mnet/index.html +++ b/admin/mnet/index.html @@ -39,7 +39,7 @@ admin_externalpage_print_header($adminroot); - + diff --git a/admin/mnet/index.php b/admin/mnet/index.php index 3b5479e25d..560c529a66 100644 --- a/admin/mnet/index.php +++ b/admin/mnet/index.php @@ -86,7 +86,7 @@ - + @@ -111,13 +111,13 @@
Public Key: - + - + - + - - - + + + - + diff --git a/admin/mnet/peers.php b/admin/mnet/peers.php index 05fb81d65f..d028f4e8d4 100644 --- a/admin/mnet/peers.php +++ b/admin/mnet/peers.php @@ -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&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&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&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&hostid='.$mnet_peer->id, get_string('changessaved')); } else { error('Invalid action parameter.', 'index.php'); } diff --git a/admin/mnet/trustedhosts.html b/admin/mnet/trustedhosts.html index 34dc636d46..37e3b3bc48 100644 --- a/admin/mnet/trustedhosts.html +++ b/admin/mnet/trustedhosts.html @@ -56,6 +56,7 @@ admin_externalpage_print_header($adminroot);
diff --git a/admin/mnet/peers.html b/admin/mnet/peers.html index 90c40443e6..bba20a5e4d 100644 --- a/admin/mnet/peers.html +++ b/admin/mnet/peers.html @@ -40,9 +40,9 @@ admin_externalpage_print_header($adminroot); ?>
name; ?>wwwroot; ?>id != $CFG->mnet_all_hosts_id) echo $last_connect; ?>name; ?>wwwroot; ?>id != $CFG->mnet_all_hosts_id) echo $last_connect; ?> id != $CFG->mnet_all_hosts_id): ?>
@@ -69,7 +69,7 @@ admin_externalpage_print_header($adminroot);
+ \ No newline at end of file diff --git a/lang/en_utf8/mnet.php b/lang/en_utf8/mnet.php index d344c4492c..60bcd5e575 100644 --- a/lang/en_utf8/mnet.php +++ b/lang/en_utf8/mnet.php @@ -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:
'. - 'Your local host:
'. - '127.0.0.1
'. - 'Your local host (with a network block):
'. - '127.0.0.1/32
'. - 'Only the host with IP address 192.168.0.7:
'. - '192.168.0.7/32
'. - 'Any host with an IP address between 192.168.0.1 and 192.168.0.255:
'. - '192.168.0.0/24
'. - 'Any host whatsoever:
'. - '192.168.0.0/0
'. +$string['trustedhostsexplain'] = 'Please enter a list of IP addresses or networks, one on each line. Some examples:
'. + 'Your local host:
'. + '127.0.0.1
'. + 'Your local host (with a network block):
'. + '127.0.0.1/32
'. + 'Only the host with IP address 192.168.0.7:
'. + '192.168.0.7/32
'. + 'Any host with an IP address between 192.168.0.1 and 192.168.0.255:
'. + '192.168.0.0/24
'. + 'Any host whatsoever:
'. + '192.168.0.0/0
'. '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 '. 'manually 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.
'. + 'key has been compromised. A replacement will be immediately automatically generated.
'. '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.
'. + 'Moodle site that connects to you and requests your public key.
'. '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.
Maybe the host does not allow Moodle Networking or the key is invalid.'; +$string['nopubkey'] = 'There was a problem retrieving the public key.
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'] = '
You may be able to change your password at your wwwroot/login/change_password.php\">$a->description provider.'; +$string['userchangepasswordlink'] = '
You may be able to change your password at your wwwroot/login/change_password.php\">$a->description provider.'; $string['remotehost'] = 'Remote Hub'; $string['allow'] = 'Allow';