From 4dac201e7c447a1f7e09d7972a14f517bbbf3edc Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Tue, 21 Jan 2003 22:57:43 +0000
Subject: - Patch by Ulf: XHTML-ified the code.

---
 includes/database.pear.inc |  2 +-
 includes/pager.inc         |  4 ++--
 includes/theme.inc         |  2 +-
 includes/xmlrpc.inc        | 24 ++++++++++++------------
 4 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'includes')

diff --git a/includes/database.pear.inc b/includes/database.pear.inc
index 3446e3d69..4a5faef9b 100644
--- a/includes/database.pear.inc
+++ b/includes/database.pear.inc
@@ -58,7 +58,7 @@ function _db_query($query, $debug = 0) {
   $result = $db_handle->query($query);
 
   if ($debug) {
-    print "<p>query: $query<br />";
+    print "<p>query: $query</p>";
   }
 
   if (DB::isError($result)) {
diff --git a/includes/pager.inc b/includes/pager.inc
index 2bce78de8..4f6fe8877 100644
--- a/includes/pager.inc
+++ b/includes/pager.inc
@@ -29,13 +29,13 @@ function pager_display($tags = "", $limit = 10, $element = 0, $type = "default",
  * @see pager_display
  */
 function pager_display_default($tags = "", $limit = 10, $element = 0, $attributes = array()) {
-  $output .= "<center><table cellpadding=\"10\"><tbody><tr>";
+  $output .= "<div align=\"center\"><table cellpadding=\"10\"><tbody><tr>";
   $output .= "<td align=\"center\">". pager_first(($tags[0] ? $tags[0] : t("first page")), $limit, $element, $attributes) ."</td>";
   $output .= "<td align=\"center\">". pager_previous(($tags[1] ? $tags[1] : t("previous page")), $limit, $element, 1, $attributes) ."</td>";
   $output .= "<td align=\"center\">". pager_list($limit, $element, ($tags[2] ? $tags[2] : 9 ), "", $attributes) ."</td>";
   $output .= "<td align=\"center\">". pager_next(($tags[3] ? $tags[3] : t("next page")), $limit, $element, 1, $attributes) ."</td>";
   $output .= "<td align=\"center\">". pager_last(($tags[4] ? $tags[4] : t("last page")), $limit, $element, $attributes) ."</td>";
-  $output .= "</tr></tbody></table></center>";
+  $output .= "</tr></tbody></table></div>";
 
   return "$output";
 }
diff --git a/includes/theme.inc b/includes/theme.inc
index fbdb16531..7a023991a 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -65,7 +65,7 @@ class BaseTheme {
   }
 
   function box($subject, $content, $region = "main") {
-    $output = "<b>$subject</b><br />$content<p />";
+    $output = "<p><b>$subject</b><br />$content</p>";
     print $output;
   }
 
diff --git a/includes/xmlrpc.inc b/includes/xmlrpc.inc
index db6d68b36..d9f53bc38 100644
--- a/includes/xmlrpc.inc
+++ b/includes/xmlrpc.inc
@@ -644,8 +644,8 @@ class xmlrpcmsg {
   $xmlrpc_value=new xmlrpcval;
 
   if ($this->debug)
-    print "<PRE>---GOT---\n" . htmlspecialchars($data) .
-    "\n---END---\n</PRE>";
+    print "<pre>---GOT---\n" . htmlspecialchars($data) .
+    "\n---END---\n</pre>";
   if ($data=="") {
     error_log("No response received from server.");
     $r=new xmlrpcresp(0, $xmlrpcerr["no_data"],
@@ -701,9 +701,9 @@ class xmlrpcmsg {
   }
   xml_parser_free($parser);
   if ($this->debug) {
-    print "<PRE>---EVALING---[" .
+    print "<pre>---EVALING---[" .
     strlen($_xh[$parser]['st']) . " chars]---\n" .
-    htmlspecialchars($_xh[$parser]['st']) . ";\n---END---</PRE>";
+    htmlspecialchars($_xh[$parser]['st']) . ";\n---END---</pre>";
   }
   if (strlen($_xh[$parser]['st'])==0) {
     // then something odd has happened
@@ -752,12 +752,12 @@ class xmlrpcval {
     global $xmlrpcTypes, $xmlrpcBoolean;
 
     if ($this->mytype==1) {
-      echo "<B>xmlrpcval</B>: scalar can have only one value<BR>";
+      echo "<b>xmlrpcval</b>: scalar can have only one value<br />";
       return 0;
     }
     $typeof=$xmlrpcTypes[$type];
     if ($typeof!=1) {
-      echo "<B>xmlrpcval</B>: not a scalar type (${typeof})<BR>";
+      echo "<b>xmlrpcval</b>: not a scalar type (${typeof})<br />";
       return 0;
     }
 
@@ -787,8 +787,8 @@ class xmlrpcval {
   function addArray($vals) {
     global $xmlrpcTypes;
     if ($this->mytype!=0) {
-      echo "<B>xmlrpcval</B>: already initialized as a [" .
-        $this->kindOf() . "]<BR>";
+      echo "<b>xmlrpcval</b>: already initialized as a [" .
+        $this->kindOf() . "]<br />";
       return 0;
     }
 
@@ -800,8 +800,8 @@ class xmlrpcval {
   function addStruct($vals) {
   global $xmlrpcTypes;
   if ($this->mytype!=0) {
-    echo "<B>xmlrpcval</B>: already initialized as a [" .
-    $this->kindOf() . "]<BR>";
+    echo "<b>xmlrpcval</b>: already initialized as a [" .
+    $this->kindOf() . "]<br />";
     return 0;
   }
   $this->mytype=$xmlrpcTypes["struct"];
@@ -812,10 +812,10 @@ class xmlrpcval {
   function dump($ar) {
   reset($ar);
   while ( list( $key, $val ) = each( $ar ) ) {
-    echo "$key => $val<br>";
+    echo "$key => $val<br />";
     if ($key == 'array')
     while ( list( $key2, $val2 ) = each( $val ) ) {
-      echo "-- $key2 => $val2<br>";
+      echo "-- $key2 => $val2<br />";
     }
   }
   }
-- 
cgit v1.2.3