From: donal72 Date: Mon, 8 Jan 2007 07:16:29 +0000 (+0000) Subject: mnet: XHTML strict fixes: MDL-7861 X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=1bbb43eb93aec352429162bcf4450f3e382b274c;p=moodle.git mnet: XHTML strict fixes: MDL-7861 --- diff --git a/admin/mnet/mnet_review.html b/admin/mnet/mnet_review.html index d6da1beb18..4ec6f8af29 100644 --- a/admin/mnet/mnet_review.html +++ b/admin/mnet/mnet_review.html @@ -1,15 +1,15 @@ wwwroot. - '/course/report/log/index.php?chooselog=1&showusers=1&showcourses=1&host_course='.$mnet_peer->id. - '%2F1&user='.'0'. - '&date=0'. - '&modid=&modaction=0&logformat=showashtml'; + '/course/report/log/index.php?chooselog=1&showusers=1&showcourses=1&host_course='.$mnet_peer->id. + '%2F1&user='.'0'. + '&date=0'. + '&modid=&modaction=0&logformat=showashtml'; admin_externalpage_print_header($adminroot); if (isset($mnet_peer->id) && $mnet_peer->id > 0) { - $tabs[] = new tabobject('mnetdetails', 'peers.php?step=update&hostid='.$mnet_peer->id, $strmnetedithost, $strmnetedithost, false); - $tabs[] = new tabobject('mnetservices', 'mnet_services.php?step=list&hostid='.$mnet_peer->id, $strmnetservices, $strmnetservices, false); + $tabs[] = new tabobject('mnetdetails', 'peers.php?step=update&hostid='.$mnet_peer->id, $strmnetedithost, $strmnetedithost, false); + $tabs[] = new tabobject('mnetservices', 'mnet_services.php?step=list&hostid='.$mnet_peer->id, $strmnetservices, $strmnetservices, false); $tabs[] = new tabobject('mnetlog', $logurl, $strmnetlog, $strmnetlog, false); } else { $tabs[] = new tabobject('mnetdetails', '#', $strmnetedithost, $strmnetedithost, false); @@ -26,18 +26,18 @@ print_simple_box_start("center", ""); - + - + public_key)) $mnet_peer->public_key = ''; ?> - @@ -65,11 +65,11 @@ if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0) { if(!empty($currentkey)): ?> - + - + id) && $mnet_peer->id > 0): ?> - + deleted) && $mnet_peer->deleted > 0): ?> - + - @@ -114,6 +114,7 @@ endif;
::
::
'; helpbutton("publickey", get_string('publickey', 'mnet'), "mnet", true, true); @@ -56,7 +56,7 @@ if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0) { if (empty($mnet_peer->public_key)) { print_string('nopubkey', 'mnet'); } - ?>
+ ?>
::
:: last_connect_time == 0)? get_string('never','mnet') : date('H:i:s d/m/Y',$mnet_peer->last_connect_time);?>
::

@@ -99,7 +99,7 @@ endif; if (isset($mnet_peer->ip_address) && '' != $mnet_peer->ip_address): ?>
'; helpbutton("ipaddress", get_string('ipaddress', 'mnet'), "mnet", true, true); ?>:" />
+ wwwroot. - '/course/report/log/index.php?chooselog=1&showusers=1&showcourses=1&host_course='.$mnet_peer->id. - '%2F1&user='.'0'. - '&date=0'. - '&modid=&modaction=0&logformat=showashtml'; + '/course/report/log/index.php?chooselog=1&showusers=1&showcourses=1&host_course='.$mnet_peer->id. + '%2F1&user='.'0'. + '&date=0'. + '&modid=&modaction=0&logformat=showashtml'; -$tabs[] = new tabobject('mnetdetails', 'peers.php?step=update&hostid='.$mnet_peer->id, $strmnetedithost, $strmnetedithost, false); -$tabs[] = new tabobject('mnetservices', 'mnet_services.php?step=list&hostid='.$mnet_peer->id, $strmnetservices, $strmnetservices, false); +$tabs[] = new tabobject('mnetdetails', 'peers.php?step=update&hostid='.$mnet_peer->id, $strmnetedithost, $strmnetedithost, false); +$tabs[] = new tabobject('mnetservices', 'mnet_services.php?step=list&hostid='.$mnet_peer->id, $strmnetservices, $strmnetservices, false); if ($mnet_peer->id != $CFG->mnet_all_hosts_id) $tabs[] = new tabobject('mnetlog', $logurl, $strmnetlog, $strmnetlog, false); print_tabs(array($tabs), 'mnetservices'); print_simple_box_start("center", ""); @@ -40,8 +40,8 @@ print_simple_box_start("center", ""); echo $breakstring; ?> - />name).'">√ '; if (!empty($version['allhosts_publish'])) print_string("enabled_for_all",'mnet',!empty($version['I_publish'])); ?>
- />name).'">√ '; if (!empty($version['allhosts_subscribe'])) print_string("enabled_for_all",'mnet',!empty($version['I_subscribe'])); ?>
+ />name).'">√ '; if (!empty($version['allhosts_publish'])) print_string("enabled_for_all",'mnet',!empty($version['I_publish'])); ?>
+ />name).'">√ '; if (!empty($version['allhosts_subscribe'])) print_string("enabled_for_all",'mnet',!empty($version['I_subscribe'])); ?>
'; endforeach; @@ -69,16 +69,9 @@ print_simple_box_start("center", "");
+ + -'; -print_simple_box_end(); print_simple_box_end(); - -echo ' - -'; admin_externalpage_print_footer($adminroot); ?> diff --git a/admin/mnet/peers.html b/admin/mnet/peers.html index e5e8b2a5b8..5578f8b416 100644 --- a/admin/mnet/peers.html +++ b/admin/mnet/peers.html @@ -13,7 +13,7 @@ admin_externalpage_print_header($adminroot); - mnet_register_allhosts)) echo 'checked '; ?>/> + mnet_register_allhosts)) echo 'checked="checked" '; ?>/> diff --git a/lib/weblib.php b/lib/weblib.php index 8f2841f5c8..1b39c38a95 100644 --- a/lib/weblib.php +++ b/lib/weblib.php @@ -2898,13 +2898,13 @@ function print_continue($link, $return=false) { * Replaces print_simple_box (see deprecatedlib.php) * * @param string $message, the content of the box - * @param string $classes, space-separated class names. - * @param string $ids, space-separated id names. + * @param string $class, space-separated class names. + * @param string $id, space-separated id names. * @param boolean $return, return as string or just print it */ -function print_box($message, $classes='generalbox', $ids='', $return=false) { +function print_box($message, $class='generalbox', $id='', $return=false) { - $output = print_box_start($classes, $ids, true); + $output = print_box_start($class, $id, true); $output .= stripslashes_safe($message); $output .= print_box_end(true); @@ -2919,18 +2919,20 @@ function print_box($message, $classes='generalbox', $ids='', $return=false) { * Starts a box using divs * Replaces print_simple_box_start (see deprecatedlib.php) * - * @param string $classes, space-separated class names. - * @param string $ids, space-separated id names. + * @param string $class, space-separated class names. + * @param string $id, space-separated id names. * @param boolean $return, return as string or just print it */ -function print_box_start($classes='generalbox', $ids='', $return=false) { +function print_box_start($class='generalbox', $id='', $return=false) { $output = ''; - if ($ids) { - $ids = ' id="'.$ids.'"'; + $divclasses = $class.' '.$class.'content'; + + if ($id) { + $id = ' id="'.$id.'"'; } - $output .= ''; + $output .= ''; if ($return) { return $output; @@ -4933,9 +4935,7 @@ function redirect($url, $message='', $delay=-1) { //]]> '; - echo ''; - echo ''; + print_footer(); die; }