Thu Mar 6 22:00:13 UTC 2008

Author: rmeggins

Update of /cvs/dirsec/dsgw/config
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16950/dsgw/config

Modified Files:
	authPassword.html.in authSearch.html.in csearch.html.in 
	csearchAttr.html.in csearchBase.html.in csearchMatch.html.in 
	csearchString.html.in csearchType.html.in 
	display-country.html.in display-dc.html.in 
	display-dnedit.html.in display-dneditpeople.html.in 
	display-group.html.in display-groupun.html.in 
	display-ntgroup.html.in display-ntperson.html.in 
	display-org.html.in display-orgperson.html.in 
	display-orgunit.html.in display-person.html.in dsgw.tmpl.in 
	edit-passwd.html list-Anything.html.in list-Auth.html.in 
	list-Domaincomponent.html.in list-Groups.html.in 
	list-NT-Groups.html.in list-NT-People.html.in 
	list-Org-Units.html.in list-Organizations.html.in 
	list-People.html.in list-fa-Groups.html.in 
	list-fa-People.html.in list-urlsearch.html.in newentry.html.in 
	newentryName.html.in newentryType.html.in search.html.in 
	searchString.html.in 
Log Message:
Resolves: bug 435230
Description: Clean up all HTML pages (Gateway, Org Tool, Phonebook, etc)
Fix Description: This is just the first pass.  I focused mainly on the
phonebook pages, but the C code fixes will apply to dsgw too.
The goal is to make the pages clean with HTML Tidy running in Firefox 2.
Most of the template pages had to change because they had comments like
this:
<!-- ----- comment -----
HTML 4.01 does not like this - no sequence of -- or more dashes in a comment.
The other major change was the use of & instead of just a single & in
URLs for href and img src links.  However, javascript does not like the
encoded entities, so I had to add some code to make sure we use the
unencoded form in javascript, so I added another option called "entities"
to the html template code, and added a function that will convert
encoded entities to their raw form in place.
I'm also adding some debugging shell scripts that can be used to debug
CGI programs.
Platforms tested: RHEL5 x86_64
Flag day: Yes - autotool file changes.
Doc: none yet



Index: authPassword.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/authPassword.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- authPassword.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ authPassword.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,13 +34,15 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <!-- HEAD -->
 <!--authPassword.html-->
 <TITLE>Authenticate...</TITLE>
 <!-- DS_AUTH_PASSWORD_SCRIPT -->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 </HEAD>
 
 <!-- DS_AUTH_PASSWORD_BODY -->


Index: authSearch.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/authSearch.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- authSearch.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ authSearch.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,13 +34,15 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <!-- HEAD -->
 <!--authSearch.html-->
 <TITLE>Authenticate...</TITLE>
 <!-- DS_AUTH_SEARCH_SCRIPT -->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 </HEAD>
 <!-- DS_AUTH_SEARCH_BODY -->
 <!-- DS_AUTH_SEARCH_INFO -->


Index: csearch.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/csearch.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- csearch.html.in	29 Feb 2008 20:38:11 -0000	1.2
+++ csearch.html.in	6 Mar 2008 22:00:10 -0000	1.3
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,7 +34,9 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
+    "http://www.w3.org/TR/html4/frameset.dtd">
 <HTML>
 <!-- HEAD -->
 <!--csearch.html-->
@@ -42,17 +44,17 @@
 <!-- DS_CSEARCH_SCRIPT -->
 </HEAD>
 <FRAMESET ROWS=130,40,55,* BORDER=0 onLoad="init()">
-    <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=csearchtitle.html" SCROLLING="NO" NORESIZE>
+    <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=csearchtitle.html" SCROLLING="NO" NORESIZE>
     <FRAMESET COLS="25%,75%" BORDER=0>
-	<FRAME SRC="@cgiuri@/csearch?<!-- GCONTEXT -->&file=type" NAME="searchTypeFrame" NORESIZE SCROLLING="NO">
-        <FRAME SRC="@cgiuri@/csearch?<!-- GCONTEXT -->&file=base" NAME="searchBaseFrame" NORESIZE SCROLLING="NO">
+	<FRAME SRC="@cgiuri@/csearch?<!-- GCONTEXT -->&file=type" NAME="searchTypeFrame" NORESIZE SCROLLING="NO">
+        <FRAME SRC="@cgiuri@/csearch?<!-- GCONTEXT -->&file=base" NAME="searchBaseFrame" NORESIZE SCROLLING="NO">
      </FRAMESET>
      <FRAMESET COLS="25%, 15%, 60%" BORDER=0>
-        <FRAME SRC="@cgiuri@/csearch?<!-- GCONTEXT -->&file=attr" NAME="searchAttrFrame" NORESIZE SCROLLING="NO">
-	<FRAME SRC="@cgiuri@/csearch?<!-- GCONTEXT -->&file=match" NAME="searchMatchFrame" NORESIZE SCROLLING="NO">
-        <FRAME SRC="@cgiuri@/csearch?<!-- GCONTEXT -->&file=string" NAME="searchStringFrame" SCROLLING="NO">
+        <FRAME SRC="@cgiuri@/csearch?<!-- GCONTEXT -->&file=attr" NAME="searchAttrFrame" NORESIZE SCROLLING="NO">
+	<FRAME SRC="@cgiuri@/csearch?<!-- GCONTEXT -->&file=match" NAME="searchMatchFrame" NORESIZE SCROLLING="NO">
+        <FRAME SRC="@cgiuri@/csearch?<!-- GCONTEXT -->&file=string" NAME="searchStringFrame" SCROLLING="NO">
      </FRAMESET>
-     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=emptyFrame.html" NAME="outputFrame">
+     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=emptyFrame.html" NAME="outputFrame">
 </FRAMESET>
 </HTML>
 


Index: csearchAttr.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/csearchAttr.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- csearchAttr.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ csearchAttr.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,11 +34,13 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <!-- HEAD -->
 <!--csearchAttr.html-->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 </HEAD>
 <!-- DS_CSEARCH_ATTR_BODY -->
 <!-- DS_CSEARCH_ATTR_FORM -->


Index: csearchBase.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/csearchBase.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- csearchBase.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ csearchBase.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,11 +34,13 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <!-- HEAD -->
 <!--csearchBase.html-->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 </HEAD>
 <!-- DS_CSEARCH_BASE_BODY -->
 <TABLE> <TR VALIGN="middle">


Index: csearchMatch.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/csearchMatch.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- csearchMatch.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ csearchMatch.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,11 +34,13 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <!-- HEAD -->
 <!--csearchMatch.html-->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 </HEAD>
 <!-- DS_CSEARCH_MATCH_BODY -->
 <!-- DS_CSEARCH_MATCH_FORM -->


Index: csearchString.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/csearchString.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- csearchString.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ csearchString.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,11 +34,13 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <!-- HEAD -->
 <!--csearchString.html-->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 </HEAD>
 <!-- DS_CSEARCH_STRING_BODY -->
 <!-- DS_CSEARCH_STRING_FORM "target=outputFrame" -->


Index: csearchType.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/csearchType.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- csearchType.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ csearchType.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,11 +34,13 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <!-- HEAD -->
 <!--csearchType.html-->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 </HEAD>
 <!-- DS_CSEARCH_TYPE_BODY -->
 <!-- DS_CSEARCH_TYPE_FORM -->


Index: display-country.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/display-country.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- display-country.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ display-country.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,7 +34,9 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <!-- HEAD -->
 <!-- DS_OBJECTCLASS "value=country" -->
@@ -43,14 +45,14 @@
 <TITLE>Country -
 <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
 </TITLE>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 </HEAD>
 <BODY BGCOLOR="#FFFFFF">
 
 
 <TABLE>
 <TR><TD NOWRAP>
-<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=country.gif" ALT="Country" HSPACE=5>
+<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=country.gif" ALT="Country" HSPACE=5>
 </TD><TD class="boldbig">
 <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
 </TD></TR></TABLE>


Index: display-dc.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/display-dc.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- display-dc.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ display-dc.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,10 +34,12 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <!-- HEAD -->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 </head>
 <!-- DS_OBJECTCLASS "value=domain" -->
 
@@ -54,13 +56,13 @@
 <body bgcolor="#FFFFFF" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0">
 <table width="100%" class="bgColor1" cellspacing="0" cellpadding="0" border="0">
 <tr width="100%" class="bgColor1">
-<TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="10" height="45" border="0"></TD>
+<TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="10" height="45" border="0"></TD>
 <TD valign="middle" align="left" class="text15" width="100%">Domaincomponent Entry</td>
 </tr>
 </table>
 <table cellspacing="0" cellpadding="0">
 <tr>
-<td><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="1" height="10" border="0"></td>
+<td><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="1" height="10" border="0"></td>
 </tr>
 </table>
 <!-- ELSE -->
@@ -76,7 +78,7 @@
 <TABLE>
 <TR>
 <TD>
-<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=dc.gif" ALT="Domaincomponent" HSPACE=5>
+<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=dc.gif" ALT="Domaincomponent" HSPACE=5>
 <TD class="boldbig">
 <!-- IF "Adding" -->
 New Domaincomponent -


Index: display-dnedit.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/display-dnedit.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- display-dnedit.html.in	19 Feb 2008 15:20:21 -0000	1.2
+++ display-dnedit.html.in	6 Mar 2008 22:00:10 -0000	1.3
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,7 +34,9 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <!-- HEAD -->
 <!-- DS_ENTRYBEGIN -->
@@ -43,12 +45,12 @@
 Edit
 <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
 </TITLE>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 </HEAD>
 <body bgcolor="#FFFFFF" "onLoad='document.searchForm.searchstring.focus();'" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0">
 <table width="100%" class="bgColor1" cellspacing="0" cellpadding="0" border="0">
 <tr width="100%" class="bgColor1">
-<TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="10" height="45" border="0"></TD>
+<TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="10" height="45" border="0"></TD>
 <TD valign="middle" align="left" class="text15" width="100%">
 Edit
 <!-- DS_DNDESC -->


Index: display-dneditpeople.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/display-dneditpeople.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- display-dneditpeople.html.in	19 Feb 2008 15:20:21 -0000	1.2
+++ display-dneditpeople.html.in	6 Mar 2008 22:00:10 -0000	1.3
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,7 +34,9 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <!-- HEAD -->
 <!-- DS_ENTRYBEGIN -->
@@ -43,13 +45,13 @@
 Edit
 <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
 </TITLE>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 </HEAD>
 
 <body bgcolor="#FFFFFF" "onLoad='document.searchForm.searchstring.focus();'" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0">
 <table width="100%" class="bgColor1" cellspacing="0" cellpadding="0" border="0">
 <tr width="100%" class="bgColor1">
-<TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="10" height="45" border="0"></TD>
+<TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="10" height="45" border="0"></TD>
 <TD valign="middle" align="left" class="text15" width="100%">
 Edit
 <!-- DS_DNDESC -->


Index: display-group.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/display-group.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- display-group.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ display-group.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,7 +34,9 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <!-- HEAD -->
 <!-- DS_OBJECTCLASS "value=groupOfNames" -->
@@ -47,20 +49,20 @@
 Group Entry -
 <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
 </TITLE>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 </HEAD>
 
 <!-- IF "!Displaying" -->
 <body bgcolor="#FFFFFF" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0">
 <table width="100%" class="bgColor1" cellspacing="0" cellpadding="0" border="0">
 <tr width="100%" class="bgColor1">
-<TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="10" height="45" border="0"></TD>
+<TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="10" height="45" border="0"></TD>
 <TD valign="middle" align="left" class="text15" width="100%">Group Entry</td>
 </tr>
 </table>
 <table cellspacing="0" cellpadding="0">
 <tr>
-<td><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="1" height="10" border="0"></td>
+<td><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="1" height="10" border="0"></td>
 </tr>
 </table>
 <!-- ELSE -->
@@ -75,7 +77,7 @@
 <TABLE>
 <TR>
 <TD class="boldbig">
-<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=group.gif" ALT="Group" HSPACE=5 >
+<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=group.gif" ALT="Group" HSPACE=5 >
 <!-- IF "Adding" -->
 New Group -
 <!-- ENDIF // Adding -->


Index: display-groupun.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/display-groupun.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- display-groupun.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ display-groupun.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,7 +34,9 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <!-- HEAD -->
 <!-- DS_OBJECTCLASS "value=groupOfUniqueNames" -->
@@ -47,20 +49,20 @@
 Group Entry -
 <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
 </TITLE>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 </HEAD>
 
 <!-- IF "!Displaying" -->
 <body bgcolor="#FFFFFF" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0">
 <table width="100%" class="bgColor1" cellspacing="0" cellpadding="0" border="0">
 <tr width="100%" class="bgColor1">
-<TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="10" height="45" border="0"></TD>
+<TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="10" height="45" border="0"></TD>
 <TD valign="middle" align="left" class="text15" width="100%">Group Entry</td>
 </tr>
 </table>
 <table cellspacing="0" cellpadding="0">
 <tr>
-<td><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="1" height="10" border="0"></td>
+<td><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="1" height="10" border="0"></td>
 </tr>
 </table>
 <!-- ELSE -->
@@ -75,7 +77,7 @@
 <TABLE>
 <TR>
 <TD class="boldbig">
-<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=group.gif" ALT="Group" HSPACE=5 >
+<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=group.gif" ALT="Group" HSPACE=5 >
 <!-- IF "Adding" -->
 New Group -
 <!-- ENDIF // Adding -->


Index: display-ntgroup.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/display-ntgroup.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- display-ntgroup.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ display-ntgroup.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,7 +34,9 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <!-- HEAD -->
 <!-- DS_OBJECTCLASS "value=ntGroup" -->
@@ -47,20 +49,20 @@
 NT Group Entry -
 <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
 </TITLE>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 </HEAD>
 
 <!-- IF "!Displaying" -->
 <body bgcolor="#FFFFFF" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0">
 <table width="100%" class="bgColor1" cellspacing="0" cellpadding="0" border="0">
 <tr width="100%" class="bgColor1">
-<TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="10" height="45" border="0"></TD>
+<TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="10" height="45" border="0"></TD>
 <TD valign="middle" align="left" class="text15" width="100%">NT Group Entry</td>
 </tr>
 </table>
 <table cellspacing="0" cellpadding="0">
 <tr>
-<td><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="1" height="10" border="0"></td>
+<td><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="1" height="10" border="0"></td>
 </tr>
 </table>
 <!-- ELSE -->
@@ -75,7 +77,7 @@
 <TABLE>
 <TR>
 <TD class="boldbig">
-<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=group.gif" ALT="Group" HSPACE=5 >
+<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=group.gif" ALT="Group" HSPACE=5 >
 <!-- IF "Adding" -->
 New NT Group -
 <!-- ENDIF // Adding -->


Index: display-ntperson.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/display-ntperson.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- display-ntperson.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ display-ntperson.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,7 +34,9 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <!-- HEAD -->
 <!-- NT User person directory entry -->
@@ -49,7 +51,7 @@
 <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
 </TITLE>
 
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/javascript">
 <!-- Hide from non-JavaScript-capable browsers
 function showVCard()
 {
@@ -77,24 +79,24 @@
   return;
 }
 
-document.write('<a href=\"aim:goim?Screenname=' + aimID.replace(/ /,"+") + '\"><IMG SRC=\"@cgiuri@/lang?<!-- GCONTEXT -->&file=aim-online.gif\" ALT=\"Click to send an AIM to this person\" BORDER=0 HSPACE=5></a>');
+document.write('<a href=\"aim:goim?Screenname=' + aimID.replace(/ /,"+") + '\"><IMG SRC=\"@cgiuri@/lang?<!-- GCONTEXT -->&file=aim-online.gif\" ALT=\"Click to send an AIM to this person\" BORDER=0 HSPACE=5><\/a>');
 }
 // End hiding -->
 </SCRIPT>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 </HEAD>
 
 <!-- IF "!Displaying" -->
 <body bgcolor="#FFFFFF" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0">
 <table width="100%" class="bgColor1" cellspacing="0" cellpadding="0" border="0">
 <tr width="100%" class="bgColor1">
-<TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="10" height="45" border="0"></TD>
+<TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="10" height="45" border="0"></TD>
 <TD valign="middle" align="left" class="text15" width="100%">NT Person Entry</td>
 </tr>
 </table>
 <table cellspacing="0" cellpadding="0">
 <tr>
-<td><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="1" height="10" border="0"></td>
+<td><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="1" height="10" border="0"></td>
 </tr>
 </table>
 <!-- ELSE -->
@@ -116,7 +118,7 @@
 <TD>
 <!-- ENDIF -->
 <A HREF="javascript:showVCard()">
-<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=person.gif" ALT="NT Person (click to show card)"
+<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=person.gif" ALT="NT Person (click to show card)"
     BORDER=0 HSPACE=5></A>
 </TD>
 <!-- IF "DisplayOrgChart" -->
@@ -124,7 +126,7 @@
 <A HREF=
 <!-- DS_ORGCHARTLINK -->
  >
-<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=orgicon.gif" BORDER=0 ALT="Click to display organization chart" HSPACE=5></a>
+<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=orgicon.gif" BORDER=0 ALT="Click to display organization chart" HSPACE=5></a>
 
 </TD>
 <!-- ENDIF -->
@@ -279,7 +281,7 @@
 <TD VALIGN="TOP" NOWRAP>
 <!-- DS_ATTRIBUTE "attr=nsaimid" "cols=>16" -->
 <!-- IF "DisplayAimPresence" -->
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/javascript">
 <!-- Hide from non-JavaScript-capable browsers
 showAimIcon();
 // End hiding -->


Index: display-org.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/display-org.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- display-org.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ display-org.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,7 +34,9 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <!-- HEAD -->
 <!-- DS_OBJECTCLASS "value=organization" -->
@@ -47,20 +49,20 @@
 Organization -
 <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
 </TITLE>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 </HEAD>
 
 <!-- IF "!Displaying" -->
 <body bgcolor="#FFFFFF" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0">
 <table width="100%" class="bgColor1" cellspacing="0" cellpadding="0" border="0">
 <tr width="100%" class="bgColor1">
-<TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="10" height="45" border="0"></TD>
+<TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="10" height="45" border="0"></TD>
 <TD valign="middle" align="left" class="text15" width="100%">Organization Entry</td>
 </tr>
 </table>
 <table cellspacing="0" cellpadding="0">
 <tr>
-<td><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="1" height="10" border="0"></td>
+<td><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="1" height="10" border="0"></td>
 </tr>
 </table>
 <!-- ELSE -->
@@ -75,7 +77,7 @@
 <TABLE>
 <TR>
 <TD>
-<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=organization.gif" ALT="Organization" HSPACE=5>
+<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=organization.gif" ALT="Organization" HSPACE=5>
 <TD class="boldbig">
 
 <!-- IF "Adding" -->


Index: display-orgperson.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/display-orgperson.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- display-orgperson.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ display-orgperson.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,7 +34,9 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <!-- HEAD -->
 <!-- inet. organizational person directory entry -->
@@ -49,7 +51,7 @@
 <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
 </TITLE>
 
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/javascript">
 <!-- Hide from non-JavaScript-capable browsers
 function showVCard()
 {
@@ -77,26 +79,26 @@
   return;
 }
 
-document.write('<a href=\"aim:goim?Screenname=' + aimID.replace(/ /,"+") + '\"><IMG SRC=\"@cgiuri@/lang?<!-- GCONTEXT -->&file=aim-online.gif\" ALT=\"Click to send an AIM to this person\" BORDER=0 HSPACE=5></a>');
+document.write('<a href=\"aim:goim?Screenname=' + aimID.replace(/ /,"+") + '\"><IMG SRC=\"@cgiuri@/lang?<!-- GCONTEXT -->&file=aim-online.gif\" ALT=\"Click to send an AIM to this person\" BORDER=0 HSPACE=5><\/a>');
 }
 
 // End hiding -->
 </SCRIPT>
 
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 </HEAD>
 
 <!-- IF "!Displaying" -->
 <body bgcolor="#FFFFFF" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0">
 <table width="100%" class="bgColor1" cellspacing="0" cellpadding="0" border="0">
 <tr width="100%" class="bgColor1">
-<TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="10" height="45" border="0"></TD>
+<TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="10" height="45" border="0"></TD>
 <TD valign="middle" align="left" class="text15" width="100%">Person Entry</td>
 </tr>
 </table>
 <table cellspacing="0" cellpadding="0">
 <tr>
-<td><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="1" height="10" border="0"></td>
+<td><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="1" height="10" border="0"></td>
 </tr>
 </table>
 <!-- ELSE -->
@@ -118,7 +120,7 @@
 <TD>
 <!-- ENDIF -->
 <A HREF="javascript:showVCard()">
-<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=person.gif" ALT="Person (click to show card)"
+<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=person.gif" ALT="Person (click to show card)"
     BORDER=0 HSPACE=5></A>
 </TD>
 <!-- IF "DisplayOrgChart" -->
@@ -126,7 +128,7 @@
 <A HREF=
 <!-- DS_ORGCHARTLINK -->
  >
-<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=orgicon.gif" BORDER=0 ALT="Click to display organization chart" HSPACE=5></a>
+<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=orgicon.gif" BORDER=0 ALT="Click to display organization chart" HSPACE=5></a>
 
 </TD>
 <!-- ENDIF -->
@@ -281,7 +283,7 @@
 <TD VALIGN="TOP" NOWRAP>
 <!-- DS_ATTRIBUTE "attr=nsaimid" "cols=>16" -->
 <!-- IF "DisplayAimPresence" -->
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/javascript">
 <!-- Hide from non-JavaScript-capable browsers
 showAimIcon();
 // End hiding -->


Index: display-orgunit.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/display-orgunit.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- display-orgunit.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ display-orgunit.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,7 +34,9 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <!-- HEAD -->
 <!-- DS_OBJECTCLASS "value=organizationalUnit" -->
@@ -47,20 +49,20 @@
 Organizational Unit -
 <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
 </TITLE>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 </HEAD>
 
 <!-- IF "!Displaying" -->
 <body bgcolor="#FFFFFF" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0">
 <table width="100%" class="bgColor1" cellspacing="0" cellpadding="0" border="0">
 <tr width="100%" class="bgColor1">
-<TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="10" height="45" border="0"></TD>
+<TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="10" height="45" border="0"></TD>
 <TD valign="middle" align="left" class="text15" width="100%">Organizational Unit Entry</td>
 </tr>
 </table>
 <table cellspacing="0" cellpadding="0">
 <tr>
-<td><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="1" height="10" border="0"></td>
+<td><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="1" height="10" border="0"></td>
 </tr>
 </table>
 <!-- ELSE -->
@@ -76,7 +78,7 @@
 <TABLE>
 <TR>
 <TD>
-<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=orgunit.gif" ALT="Org Unit" HSPACE=5>
+<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=orgunit.gif" ALT="Org Unit" HSPACE=5>
 <TD class="boldbig">
 
 <!-- IF "Adding" -->


Index: display-person.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/display-person.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- display-person.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ display-person.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,7 +34,9 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <!-- HEAD -->
 <!-- person directory entry -->
@@ -49,7 +51,7 @@
 <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
 </TITLE>
 
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/javascript">
 <!-- Hide from non-JavaScript-capable browsers
 function showVCard()
 {
@@ -78,25 +80,25 @@
   return;
 }
 
-document.write('<a href=\"aim:goim?Screenname=' + aimID.replace(/ /,"+") + '\"><IMG SRC=\"@cgiuri@/lang?<!-- GCONTEXT -->&file=aim-online.gif\" ALT=\"Click to send an AIM to this person\" BORDER=0 HSPACE=5></a>');
+document.write('<a href=\"aim:goim?Screenname=' + aimID.replace(/ /,"+") + '\"><IMG SRC=\"@cgiuri@/lang?<!-- GCONTEXT -->&file=aim-online.gif\" ALT=\"Click to send an AIM to this person\" BORDER=0 HSPACE=5><\/a>');
 }
 
 // End hiding -->
 </SCRIPT>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 </HEAD>
 
 <!-- IF "!Displaying" -->
 <body bgcolor="#FFFFFF" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0">
 <table width="100%" class="bgColor1" cellspacing="0" cellpadding="0" border="0">
 <tr width="100%" class="bgColor1">
-<TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="10" height="45" border="0"></TD>
+<TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="10" height="45" border="0"></TD>
 <TD valign="middle" align="left" class="text15" width="100%">Person Entry</td>
 </tr>
 </table>
 <table cellspacing="0" cellpadding="0">
 <tr>
-<td><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="1" height="10" border="0"></td>
+<td><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="1" height="10" border="0"></td>
 </tr>
 </table>
 <!-- ELSE -->
@@ -110,13 +112,13 @@
 
 <TABLE><TR>
 <TD>
-<A HREF="javascript:showVCard()"><IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=person.gif" ALT="Person (click to show card)"
+<A HREF="javascript:showVCard()"><IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=person.gif" ALT="Person (click to show card)"
     BORDER=0 HSPACE=5></A></TD>
 <!-- IF "DisplayOrgChart" -->
 <TD>
 <A HREF=
 <!-- DS_ORGCHARTLINK -->
- ><IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=orgicon.gif" BORDER=0 ALT="Click to display organization chart" HSPACE=5></a></TD>
+ ><IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=orgicon.gif" BORDER=0 ALT="Click to display organization chart" HSPACE=5></a></TD>
 <!-- ENDIF -->
 <TD class="boldbig">
 <!-- IF "Adding" -->
@@ -240,7 +242,7 @@
 <TD VALIGN="TOP" NOWRAP>
 <!-- DS_ATTRIBUTE "attr=nsaimid" "cols=>16" -->
 <!-- IF "DisplayAimPresence" -->
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/javascript">
 <!-- Hide from non-JavaScript-capable browsers
 showAimIcon();
 // End hiding -->


Index: dsgw.tmpl.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/dsgw.tmpl.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dsgw.tmpl.in	30 Jan 2008 02:22:46 -0000	1.3
+++ dsgw.tmpl.in	6 Mar 2008 22:00:10 -0000	1.4
@@ -44,7 +44,7 @@
 
 securitypath  "@securitydir@"
 
-url-orgchart-base     @httpurl@@cgiuri@/org?context=dsgw&data=
+url-orgchart-base     @httpurl@@cgiuri@/org?context=dsgw&data=
 
 # The attribute the orgchart uses to search for entries.
 # This value should correspond to the value of attrib-farleft-rdn


Index: edit-passwd.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/edit-passwd.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- edit-passwd.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ edit-passwd.html	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,7 +34,9 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML><HEAD>
 <!-- change a directory entry's password -->
 


Index: list-Anything.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/list-Anything.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- list-Anything.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ list-Anything.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,10 +34,10 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
 <!-- HEAD -->
 <TITLE>Search for Anything</TITLE>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 </head>
 <BODY BGCOLOR="white">
 
@@ -115,7 +115,7 @@
         <TABLE width=320 border=0 height=168 cellpadding=0 cellspacing=0 class="bgColor4">
                     <TR valign=top>
             <TD width=32>
-              <IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=message.gif" height=32 width=32 border=0>
+              <IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=message.gif" height=32 width=32 border=0>
             </TD>
             <TD width=9>
                


Index: list-Auth.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/list-Auth.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- list-Auth.html.in	27 Feb 2008 03:36:50 -0000	1.2
+++ list-Auth.html.in	6 Mar 2008 22:00:10 -0000	1.3
@@ -1,5 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <html>
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -35,7 +37,7 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
 <!--
     The "authForm" form and the authSubmit() JavaScript function are
     used to avoid the need for a separate form for each entry listed.
@@ -45,7 +47,7 @@
 
 <!-- HEAD -->
 <TITLE>Authenticate as...</TITLE>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 </head>
 <BODY BGCOLOR="white">
 
@@ -60,7 +62,7 @@
 <!-- PCONTEXT -->
 </FORM>
 
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/javascript">
 <!-- Hide from non-JavaScript-capable browsers
 function authSubmit(encodeddn)
 {


Index: list-Domaincomponent.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/list-Domaincomponent.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- list-Domaincomponent.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ list-Domaincomponent.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,5 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <html>
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -35,9 +37,9 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
 <!-- HEAD -->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 <TITLE>Search for Domaincomponents</TITLE>
 </head>
 <BODY BGCOLOR="white">
@@ -110,7 +112,7 @@
         <TABLE width=320 border=0 height=168 cellpadding=0 cellspacing=0 bgcolor=#CCCCCC>
                     <TR valign=top>
             <TD width=32>
-              <IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=message.gif" height=32 width=32 border=0>
+              <IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=message.gif" height=32 width=32 border=0>
             </TD>
             <TD width=9>
                


Index: list-Groups.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/list-Groups.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- list-Groups.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ list-Groups.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,5 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <html>
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -35,9 +37,9 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
 <!-- HEAD -->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 <TITLE>Search for Groups</TITLE>
 </head>
 
@@ -105,7 +107,7 @@
         <TABLE width=320 border=0 height=168 cellpadding=0 cellspacing=0 bgcolor=#CCCCCC>
                     <TR valign=top>
             <TD width=32>
-              <IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=message.gif" height=32 width=32 border=0>
+              <IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=message.gif" height=32 width=32 border=0>
             </TD>
             <TD width=9>
                


Index: list-NT-Groups.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/list-NT-Groups.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- list-NT-Groups.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ list-NT-Groups.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,5 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <html>
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -35,9 +37,9 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
 <!-- HEAD -->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 <TITLE>Search for NT Groups</TITLE>
 </head>
 
@@ -108,7 +110,7 @@
         <TABLE width=320 border=0 height=168 cellpadding=0 cellspacing=0 bgcolor=#CCCCCC>
                     <TR valign=top>
             <TD width=32>
-              <IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=message.gif" height=32 width=32 border=0>
+              <IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=message.gif" height=32 width=32 border=0>
             </TD>
             <TD width=9>
                


Index: list-NT-People.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/list-NT-People.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- list-NT-People.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ list-NT-People.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,5 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <html>
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -35,12 +37,12 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
 <!-- HEAD -->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 <TITLE>Search for NT-People"</TITLE>
 
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/JavaScript">
 <!-- Hide from non-JavaScript-capable browsers
 
 function showAimIcon(aimID, aimStatusText)
@@ -49,7 +51,7 @@
   return;
 }
 
-document.write('<a href=\"aim:goim?Screenname=' + aimID.replace(/ /,"+") + '\"><IMG SRC=\"@cgiuri@/lang?<!-- GCONTEXT -->&file=aim-online.gif\" ALT=\"Click to send an AIM to this person\" BORDER=0 HSPACE=5></a>');
+document.write('<a href=\"aim:goim?Screenname=' + aimID.replace(/ /,"+") + '\"><IMG SRC=\"@cgiuri@/lang?<!-- GCONTEXT -->&file=aim-online.gif\" ALT=\"Click to send an AIM to this person\" BORDER=0 HSPACE=5><\/a>');
 }
 // End hiding -->
 </SCRIPT>
@@ -98,7 +100,7 @@
     </td>
     <td>
 <!-- DS_ATTRIBUTE "attr=nsaimid" -->
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/javascript">
 <!-- Hide from non-JavaScript-capable browsers
 showAimIcon(
 <!-- DS_ATTRIBUTE "attr=nsaimid" "options=quoted" -->
@@ -144,7 +146,7 @@
         <TABLE width=320 border=0 height=168 cellpadding=0 cellspacing=0 bgcolor=#CCCCCC>
                     <TR valign=top>
             <TD width=32>
-              <IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=message.gif" height=32 width=32 border=0>
+              <IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=message.gif" height=32 width=32 border=0>
             </TD>
             <TD width=9>
                


Index: list-Org-Units.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/list-Org-Units.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- list-Org-Units.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ list-Org-Units.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,5 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <html>
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -35,9 +37,9 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
 <!-- HEAD -->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 <TITLE>Search for Organizational Units</TITLE>
 </head>
 <BODY BGCOLOR="white">
@@ -109,7 +111,7 @@
         <TABLE width=320 border=0 height=168 cellpadding=0 cellspacing=0 bgcolor=#CCCCCC>
                     <TR valign=top>
             <TD width=32>
-              <IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=message.gif" height=32 width=32 border=0>
+              <IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=message.gif" height=32 width=32 border=0>
             </TD>
             <TD width=9>
                


Index: list-Organizations.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/list-Organizations.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- list-Organizations.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ list-Organizations.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,5 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <html>
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -35,9 +37,9 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
 <!-- HEAD -->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 <TITLE>Search for Organizations</TITLE>
 </head>
 <BODY BGCOLOR="white">
@@ -118,7 +120,7 @@
         <TABLE width=320 border=0 height=168 cellpadding=0 cellspacing=0 bgcolor=#CCCCCC>
                     <TR valign=top>
             <TD width=32>
-              <IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=message.gif" height=32 width=32 border=0>
+              <IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=message.gif" height=32 width=32 border=0>
             </TD>
             <TD width=9>
                


Index: list-People.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/list-People.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- list-People.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ list-People.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,5 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <html>
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -35,12 +37,12 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
 <!-- HEAD -->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 <TITLE>Search for People</TITLE>
 
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/javascript">
 <!-- Hide from non-JavaScript-capable browsers
 
 function showAimIcon(aimID, aimStatusText)
@@ -50,7 +52,7 @@
 }
 
 
-document.write('<a href=\"aim:goim?Screenname=' + aimID.replace(/ /,"+") + '\"><IMG SRC=\"@cgiuri@/lang?<!-- GCONTEXT -->&file=aim-online.gif\" ALT=\"Click to send an AIM to this person\" BORDER=0 HSPACE=5></a>');
+document.write('<a href=\"aim:goim?Screenname=' + aimID.replace(/ /,"+") + '\"><IMG SRC=\"@cgiuri@/lang?<!-- GCONTEXT -->&file=aim-online.gif\" ALT=\"Click to send an AIM to this person\" BORDER=0 HSPACE=5><\/a>');
 }
 // End hiding -->
 </SCRIPT>
@@ -116,7 +118,7 @@
     </td>
     <td>
 <!-- DS_ATTRIBUTE "attr=nsaimid" -->
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/javascript">
 <!-- Hide from non-JavaScript-capable browsers
 showAimIcon(
 <!-- DS_ATTRIBUTE "attr=nsaimid" "options=quoted" -->
@@ -167,7 +169,7 @@
         <TABLE width=320 border=0 height=168 cellpadding=0 cellspacing=0 bgcolor=#CCCCCC>
                     <TR valign=top>
             <TD width=32>
-              <IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=message.gif" height=32 width=32 border=0>
+              <IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=message.gif" height=32 width=32 border=0>
             </TD>
             <TD width=9>
                


Index: list-fa-Groups.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/list-fa-Groups.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- list-fa-Groups.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ list-fa-Groups.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,5 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <html>
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -35,8 +37,8 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+  END COPYRIGHT BLOCK -->
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 <TITLE>Search for People</TITLE>
 </head>
 </body>


Index: list-fa-People.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/list-fa-People.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- list-fa-People.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ list-fa-People.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,5 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <html>
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -35,8 +37,8 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+  END COPYRIGHT BLOCK -->
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 <TITLE>Search for People</TITLE>
 </head>
 </body>


Index: list-urlsearch.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/list-urlsearch.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- list-urlsearch.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ list-urlsearch.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,5 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <html>
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -35,9 +37,9 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
 <!-- HEAD -->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 <TITLE>URL-based Search</TITLE>
 </head>
 <BODY BGCOLOR="white">
@@ -121,7 +123,7 @@
         <TABLE width=320 border=0 height=168 cellpadding=0 cellspacing=0 bgcolor=#CCCCCC>
           <TR valign=top>
             <TD width=32>
-              <IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=message.gif" height=32 width=32 border=0>
+              <IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=message.gif" height=32 width=32 border=0>
             </TD>
             <TD width=9>
                


Index: newentry.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/newentry.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- newentry.html.in	29 Feb 2008 20:38:11 -0000	1.2
+++ newentry.html.in	6 Mar 2008 22:00:10 -0000	1.3
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,7 +34,9 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
+    "http://www.w3.org/TR/html4/frameset.dtd">
 <HTML>
 <!-- HEAD -->
 <!--newentry.html-->
@@ -42,10 +44,10 @@
 <!-- DS_NEWENTRY_SCRIPT -->
 </HEAD>
 <FRAMESET ROWS=130,70,* BORDER=0 onLoad="init()">
-    <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=newentrytitle.html" NORESIZE SCROLLING="NO">
-    <FRAME SRC="@cgiuri@/newentry?<!-- GCONTEXT -->&file=type"
+    <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=newentrytitle.html" NORESIZE SCROLLING="NO">
+    <FRAME SRC="@cgiuri@/newentry?<!-- GCONTEXT -->&file=type"
          NAME="newentryTypeFrame" SCROLLING="NO"> 
-    <FRAME SRC="@cgiuri@/newentry?<!-- GCONTEXT -->&file=name"
+    <FRAME SRC="@cgiuri@/newentry?<!-- GCONTEXT -->&file=name"
          NAME="newentryNameFrame">
 </FRAMESET>
 


Index: newentryName.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/newentryName.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- newentryName.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ newentryName.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,11 +34,13 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <!-- HEAD -->
 <!--newentryName.html-->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 </HEAD>
 <!-- DS_NEWENTRY_NAME_BODY -->
 <p>


Index: newentryType.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/newentryType.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- newentryType.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ newentryType.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
+<!-- BEGIN COPYRIGHT BLOCK
  This Program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; version 2 of the License.
@@ -34,10 +34,12 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
+  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <!-- HEAD -->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 <!--newentryType.html-->
 </head>
 <!-- DS_NEWENTRY_TYPE_BODY -->


Index: search.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/search.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- search.html.in	29 Feb 2008 20:38:11 -0000	1.2
+++ search.html.in	6 Mar 2008 22:00:10 -0000	1.3
@@ -35,6 +35,8 @@
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
   END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
+    "http://www.w3.org/TR/html4/frameset.dtd">
 <HTML>
 <!-- HEAD -->
 <!-- search.html -->
@@ -42,8 +44,8 @@
 <!-- DS_SEARCH_SCRIPT -->
 </HEAD>
 <FRAMESET ROWS=130,100,* BORDER=0 onLoad="init()">
-    <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=searchtitle.html" SCROLLING="NO">
-    <FRAME SRC="@cgiuri@/search?<!-- GCONTEXT -->&file=string" NAME=searchFrame NORESIZE SCROLLING="NO">
-    <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=greeting.html" NAME=outputFrame>
+    <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=searchtitle.html" SCROLLING="NO">
+    <FRAME SRC="@cgiuri@/search?<!-- GCONTEXT -->&file=string" NAME=searchFrame NORESIZE SCROLLING="NO">
+    <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=greeting.html" NAME=outputFrame>
 </FRAMESET>
 </HTML>


Index: searchString.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/searchString.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- searchString.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ searchString.html.in	6 Mar 2008 22:00:10 -0000	1.2
@@ -35,10 +35,12 @@
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
  END COPYRIGHT BLOCK -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <!-- HEAD -->
 <!-- searchString.html -->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
 </HEAD>
 <!-- DS_SEARCH_BODY -->
 <!-- DS_SEARCH_FORM "target=outputFrame" -->


