From fedora-directory-commits at redhat.com  Mon Mar  3 17:59:47 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon,  3 Mar 2008 12:59:47 -0500
Subject: [Fedora-directory-commits] adminutil/lib/libadminutil form_post.c,
	1.8, 1.9
Message-ID: <200803031759.m23Hxl3E002515@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/adminutil/lib/libadminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2494/adminutil/lib/libadminutil

Modified Files:
	form_post.c 
Log Message:
Resolves: bug 245248
Description: dsgw doesn't escape filename in error message
Reviewed by: nhosoi (Thanks!)
Fix Description: Do 2 passes on the input form data.  In the first pass,
convert hex escapes (%xx) to the actual char.  In the second pass, if the
char is one of the characters we must escape, convert to the html escape
form (e.g. '&' to "&amp;") then write to output string.  This way we can
catch cases where "%xx" evaluates to '&' for example.
Platforms tested: RHEL5 x86_64
Flag day: no
Doc: no



Index: form_post.c
===================================================================
RCS file: /cvs/dirsec/adminutil/lib/libadminutil/form_post.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- form_post.c	21 Jun 2007 22:32:24 -0000	1.8
+++ form_post.c	3 Mar 2008 17:59:45 -0000	1.9
@@ -140,6 +140,10 @@
     }
 
     for (x = 0, y = 0; x < l; x++, y++) {
+        /* first, do the url unescaping, if needed -
+           digit holds the candidate char to write
+           to the output string
+        */
         if (('%' == str[x]) && (x < (l - 2))) {
             ++x;
             digit = (str[x] >= 'A' ? 
@@ -149,27 +153,31 @@
             ++x;
             digit += (str[x] >= 'A' ? 
                          ((str[x] & 0xdf) - 'A') + 10 : (str[x] - '0'));
-
-            rstr[y] = digit;
         } else if (str[x] == '+')  {
-            rstr[y] = ' ';
-        } else if ('<' == str[x]) {
+            digit = ' ';
+        } else {
+            digit = str[x];
+        }
+
+        /* next, see if digit (the original or the unescaped char)
+           needs to be html encoded */
+        if ('<' == digit) {
             memcpy(&rstr[y], "&lt;", 4);
             y += 3;
-        } else if ('>' == str[x]) {
+        } else if ('>' == digit) {
             memcpy(&rstr[y], "&gt;", 4);
             y += 3;
-        } else if ('&' == str[x]) {
+        } else if ('&' == digit) {
             memcpy(&rstr[y], "&amp;", 5);
             y += 4;
-        } else if ('"' == str[x]) {
+        } else if ('"' == digit) {
             memcpy(&rstr[y], "&quot;", 6);
             y += 5;
-        } else if ('\'' == str[x]) {
+        } else if ('\'' == digit) {
             memcpy(&rstr[y], "&#39;", 5);
             y += 4;
-        } else {
-            rstr[y] = str[x];
+        } else { /* just write the char to the output string */
+            rstr[y] = digit;
         }
     }
     rstr[y] = '\0';
@@ -327,7 +335,7 @@
     char *ans = NULL;
     char buf[BUFSIZ];
    
-    while(input[x])  {
+    while(input && input[x])  {
     /*  We want to get rid of the =, so len, len+1 */
         if((!strncmp(input[x], varname, len)) && (*(input[x]+len) == '='))  {
             if (!(ans = PL_strdup(input[x] + len + 1))) {



From fedora-directory-commits at redhat.com  Mon Mar  3 18:07:09 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon,  3 Mar 2008 13:07:09 -0500
Subject: [Fedora-directory-commits] adminutil configure.ac, 1.10,
	1.11 aclocal.m4, 1.13, 1.14 configure, 1.13, 1.14 missing,
	1.12, 1.13 install-sh, 1.12, 1.13 Makefile.in, 1.13,
	1.14 depcomp, 1.12, 1.13 config.sub, 1.12, 1.13 config.guess,
	1.12, 1.13 compile, 1.12, 1.13
Message-ID: <200803031807.m23I798h010170@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10139

Modified Files:
	configure.ac aclocal.m4 configure missing install-sh 
	Makefile.in depcomp config.sub config.guess compile 
Log Message:
bump version to 1.1.6


Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminutil/configure.ac,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- configure.ac	11 Oct 2007 02:56:30 -0000	1.10
+++ configure.ac	3 Mar 2008 18:07:06 -0000	1.11
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59)
-AC_INIT([adminutil], [1.1.5], [http://bugzilla.redhat.com/])
+AC_INIT([adminutil], [1.1.6], [http://bugzilla.redhat.com/])
 AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
 AM_MAINTAINER_MODE
 AC_CANONICAL_HOST




Index: configure
===================================================================
RCS file: /cvs/dirsec/adminutil/configure,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- configure	11 Oct 2007 02:56:30 -0000	1.13
+++ configure	3 Mar 2008 18:07:06 -0000	1.14
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for adminutil 1.1.5.
+# Generated by GNU Autoconf 2.59 for adminutil 1.1.6.
 #
 # Report bugs to <http://bugzilla.redhat.com/>.
 #
@@ -423,8 +423,8 @@
 # Identity of this package.
 PACKAGE_NAME='adminutil'
 PACKAGE_TARNAME='adminutil'
-PACKAGE_VERSION='1.1.5'
-PACKAGE_STRING='adminutil 1.1.5'
+PACKAGE_VERSION='1.1.6'
+PACKAGE_STRING='adminutil 1.1.6'
 PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
 
 # Factoring default headers for most tests.
@@ -954,7 +954,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures adminutil 1.1.5 to adapt to many kinds of systems.
+\`configure' configures adminutil 1.1.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1020,7 +1020,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of adminutil 1.1.5:";;
+     short | recursive ) echo "Configuration of adminutil 1.1.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1182,7 +1182,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-adminutil configure 1.1.5
+adminutil configure 1.1.6
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1196,7 +1196,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by adminutil $as_me 1.1.5, which was
+It was created by adminutil $as_me 1.1.6, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1839,7 +1839,7 @@
 
 # Define the identity of the package.
  PACKAGE='adminutil'
- VERSION='1.1.5'
+ VERSION='1.1.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -24401,7 +24401,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by adminutil $as_me 1.1.5, which was
+This file was extended by adminutil $as_me 1.1.6, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24459,7 +24459,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-adminutil config.status 1.1.5
+adminutil config.status 1.1.6
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

















From fedora-directory-commits at redhat.com  Mon Mar  3 18:30:06 2008
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Mon,  3 Mar 2008 13:30:06 -0500
Subject: [Fedora-directory-commits] 
	ldapserver/ldap/servers/plugins/replication
	repl5_protocol_util.c, 1.11, 1.11.2.1
Message-ID: <200803031830.m23IU61t011013@cvs-int.fedora.redhat.com>

Author: nkinder

Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10991/ldap/servers/plugins/replication

Modified Files:
      Tag: Directory_Server_8_0_Branch
	repl5_protocol_util.c 
Log Message:
Resolves: 435730
Summary: Allow fractional replication between masters.



Index: repl5_protocol_util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_protocol_util.c,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- repl5_protocol_util.c	3 Oct 2007 00:55:34 -0000	1.11
+++ repl5_protocol_util.c	3 Mar 2008 18:30:04 -0000	1.11.2.1
@@ -378,27 +378,6 @@
 							default:
 								return_value = ACQUIRE_FATAL_ERROR;
 							}
-							/* Now check for fractional compatibility with the replica 
-							 * We need to do the check now because prior to acquiring the
-							 * replica we do not have sufficient access rights to read the replica id 
-							 */
-							/* Check if this is a fractional agreement, we need to
-							 * verify that the consumer is read-only */
-							if ((return_value == ACQUIRE_SUCCESS) &&
-								agmt_is_fractional(prp->agmt)) {
-								crc = conn_replica_is_readonly(conn);
-								if (CONN_IS_NOT_READONLY == crc) {
-									/* This is a fatal error */
-									slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
-													"%s: Unable to acquire replica: "
-													"the agreement is fractional but the replica is not read-only. Fractional agreements must specify a read-only replica "
-													"Replication is aborting.\n",
-													agmt_get_long_name(prp->agmt));
-									prp->last_acquire_response_code = NSDS50_REPL_INTERNAL_ERROR;
-									return_value = ACQUIRE_FATAL_ERROR;
-									goto error;
-								}
-							}
 						}
 						else
 						{



From fedora-directory-commits at redhat.com  Mon Mar  3 18:35:14 2008
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Mon,  3 Mar 2008 13:35:14 -0500
Subject: [Fedora-directory-commits] 
	ldapserver/ldap/servers/plugins/replication
	repl5_protocol_util.c, 1.11, 1.12
Message-ID: <200803031835.m23IZEwG011159@cvs-int.fedora.redhat.com>

Author: nkinder

Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11136/ldap/servers/plugins/replication

Modified Files:
	repl5_protocol_util.c 
Log Message:
Resolves: 435730
Summary: Allow fractional replication between masters.



Index: repl5_protocol_util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_protocol_util.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- repl5_protocol_util.c	3 Oct 2007 00:55:34 -0000	1.11
+++ repl5_protocol_util.c	3 Mar 2008 18:35:11 -0000	1.12
@@ -378,27 +378,6 @@
 							default:
 								return_value = ACQUIRE_FATAL_ERROR;
 							}
-							/* Now check for fractional compatibility with the replica 
-							 * We need to do the check now because prior to acquiring the
-							 * replica we do not have sufficient access rights to read the replica id 
-							 */
-							/* Check if this is a fractional agreement, we need to
-							 * verify that the consumer is read-only */
-							if ((return_value == ACQUIRE_SUCCESS) &&
-								agmt_is_fractional(prp->agmt)) {
-								crc = conn_replica_is_readonly(conn);
-								if (CONN_IS_NOT_READONLY == crc) {
-									/* This is a fatal error */
-									slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
-													"%s: Unable to acquire replica: "
-													"the agreement is fractional but the replica is not read-only. Fractional agreements must specify a read-only replica "
-													"Replication is aborting.\n",
-													agmt_get_long_name(prp->agmt));
-									prp->last_acquire_response_code = NSDS50_REPL_INTERNAL_ERROR;
-									return_value = ACQUIRE_FATAL_ERROR;
-									goto error;
-								}
-							}
 						}
 						else
 						{



From fedora-directory-commits at redhat.com  Tue Mar  4 23:39:56 2008
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Tue,  4 Mar 2008 18:39:56 -0500
Subject: [Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc
	ESC.js, 1.15, 1.16
Message-ID: <200803042339.m24NduXM002834@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2790

Modified Files:
	ESC.js 
Log Message:
Add aol special phone home feature, and pass CUID token ID along with the phone home request. Bugs #352991, #418391.



Index: ESC.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ESC.js	7 Jun 2007 21:17:58 -0000	1.15
+++ ESC.js	4 Mar 2008 23:39:54 -0000	1.16
@@ -51,6 +51,8 @@
 const  ESC_FACE_TO_FACE_MODE = "esc.face.to.face.mode";
 const  ESC_SECURITY_URL="esc.security.url";
 const  ESC_SECURE_URL="esc.secure.url";
+const  ESC_GLOBAL_PHONE_HOME_URL= "esc.global.phone.home.url";
+const  SPECIAL_ATR="3B76940000FF6276010000";
 
 const  CLEAN_TOKEN = "cleanToken";
 const  UNINITIALIZED        = 1;
@@ -288,6 +290,11 @@
       return true;
   }
 
+  //Check for special key since we have no phone home info.
+
+  if(!home)   {
+      home = GetGlobalPhoneHomeUrl(keyType,keyID);
+  }
 
   var homeRes = false;
 
@@ -309,6 +316,44 @@
 
   return homeRes;
 }
+
+//Get global phone home url only for a special key
+
+function GetGlobalPhoneHomeUrl(keyType,keyID)
+{
+
+   var globalIssuerURL=null;
+   var specialATR=SPECIAL_ATR;
+   var phonHomeURL= DoCoolKeyGetATR(keyType,keyID);
+
+   var specialAppletVerMaj=1;
+   var specialAppletVerMin=1;
+
+
+   var appletVerMaj = DoGetCoolKeyGetAppletVer(keyType, keyID , true);
+   var appletVerMin = DoGetCoolKeyGetAppletVer(keyType, keyID, false);
+
+
+   if( (appletVerMaj != specialAppletVerMaj) ||
+        ( appletVerMin > specialAppletVerMin))  {
+
+       return null;
+   }
+
+   var keyATR =  DoCoolKeyGetATR(keyType,keyID);
+
+
+   if( keyATR != specialATR)  {
+       return null;
+   }
+
+   globalIssuerURL = DoCoolKeyGetConfigValue(ESC_GLOBAL_PHONE_HOME_URL);
+
+
+   return globalIssuerURL;
+
+}
+
 //Test Phone Home url in config UI
 
 function DoPhoneHomeTest()
@@ -3561,12 +3606,18 @@
 function DoCoolKeyGetIssuerUrl(keyType,keyID)
 {
     var url = null;
+    var isMac = 0;
 
+    var agent = navigator.userAgent.toLowerCase();
     //Back door for testing, ignore the value if so configured
 
+    if(agent && agent.indexOf("mac") != -1)  {
+        isMac = 1;
+    }
+
     var ignoreIssuer =  DoCoolKeyGetConfigValue(ESC_IGNORE_KEY_ISSUER_INFO);
 
-    recordMessage("DoCoolKeyGetIssuerUrl ignoreIssuer: " + ignoreIssuer);
+    recordMessage("DoCoolKeyGetIssuerUrl agent " + agent);
 
     if(ignoreIssuer == "yes")
     {
@@ -3576,17 +3627,21 @@
 
     try {
       netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-      
+
       var tries = 0;
-      while(tries < 3)
+      while(tries < 3 )  
       { 
           url =  netkey.GetCoolKeyIssuerInfo(keyType, keyID);
 
-          if(url.length < 10)   // Check for bogus junk
+          if(!isMac)  {  
+              break;
+          }
+
+          if(!url ||  url.length < 10)   // Check for bogus junk
           {
               recordMessage("Bogus url found ....");
               url = null;
-              Sleep(150);
+              Sleep(250);
               recordMessage("Going to try again... ");
           }
           else
@@ -3609,11 +3664,14 @@
       {
           url =  netkey.GetCoolKeyIssuerInfo(keyType, keyID);
 
-          if(url.length < 10)   // Check for bogus junk
+          if(!isMac)  {  
+              break;
+          }
+          if(!url || url.length < 10)   // Check for bogus junk
           {
               recordMessage("Bogus url found from exception....");
               url = null;
-              sleep(150);
+              sleep(250);
               recordMessage("From exception.  Going to try again... ");
           }
           else
@@ -3621,12 +3679,18 @@
 
           tries ++;
       }
+      if(url)
+      {
+          var issuer_config_value_exp = ConfigValueWithKeyID(keyID,KEY_ISSUER_URL);
+          var result_exp = DoCoolKeySetConfigValue(issuer_config_value_exp,url);
+      }
       recordMessage("From exception returning " + url);
       return url;
   }
 
   return url;
 }
+
 //Get ATR value of card
 function DoCoolKeyGetATR(keyType,keyID)
 {
@@ -4111,8 +4175,9 @@
    if(!theUrl || !aKeyID)
        return false;
 
-    if(theUrl != null)
-        url = theUrl;
+    if(theUrl != null) {
+        url = theUrl + "?cuid=" + aKeyID;
+    }
 
     var req = new XMLHttpRequest();
     req.overrideMimeType('text/xml');



From fedora-directory-commits at redhat.com  Tue Mar  4 23:57:26 2008
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Tue,  4 Mar 2008 18:57:26 -0500
Subject: [Fedora-directory-commits] esc/mac mac-build.sh,1.2,1.3
Message-ID: <200803042357.m24NvQTL003314@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/mac
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3297

Modified Files:
	mac-build.sh 
Log Message:
Bump versions.



Index: mac-build.sh
===================================================================
RCS file: /cvs/dirsec/esc/mac/mac-build.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mac-build.sh	11 Oct 2007 20:34:26 -0000	1.2
+++ mac-build.sh	4 Mar 2008 23:57:23 -0000	1.3
@@ -42,12 +42,12 @@
 IFD_EGATE_NAME=ifd-egate-0.05
 IFD_EGATE_REL=15
 
-COOLKEY_PKG_NAME=SmartCardManager1.15.pkg
+COOLKEY_PKG_NAME=SmartCardManager1.16.pkg
 COOLKEY_VOL_NAME=SMARTCARDMANAGER
 COOLKEY_TAG=HEAD
 
 
-ESC_VERSION=1.1.0-0
+ESC_VERSION=1.1.0-1
 
 COOLKEY_DMG_NAME=SmartCardManager-$ESC_VERSION.OSX4.darwin.dmg
 



From fedora-directory-commits at redhat.com  Wed Mar  5 00:06:57 2008
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Tue,  4 Mar 2008 19:06:57 -0500
Subject: [Fedora-directory-commits] esc/win32 build.sh, 1.3, 1.4 setup.iss,
	1.1, 1.2
Message-ID: <200803050006.m2506vRK010756@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/win32
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10737

Modified Files:
	build.sh setup.iss 
Log Message:
Bump versions.



Index: build.sh
===================================================================
RCS file: /cvs/dirsec/esc/win32/build.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.sh	12 Oct 2007 00:10:32 -0000	1.3
+++ build.sh	5 Mar 2008 00:06:55 -0000	1.4
@@ -76,7 +76,7 @@
 #ESC values
 
 ESC_NAME=esc
-ESC_VERSION_NO=1.1.0-0
+ESC_VERSION_NO=1.1.0-1
 
 
 #Cygwin values


Index: setup.iss
===================================================================
RCS file: /cvs/dirsec/esc/win32/setup.iss,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- setup.iss	25 Jul 2007 20:13:02 -0000	1.1
+++ setup.iss	5 Mar 2008 00:06:55 -0000	1.2
@@ -21,7 +21,7 @@
 [Setup]
 AppName=Smart Card Manager
 AppMutex=ESCMutex
-AppVerName=Smart Card Manager 1.0.1-6
+AppVerName=Smart Card Manager 1.1.0-1
 AppPublisher=Fedora
 CreateAppDir=true
 Compression=lzma
@@ -42,7 +42,7 @@
 InfoBeforeFile=info-before.txt
 InfoAfterFile=info-after.txt
 PrivilegesRequired=admin
-VersionInfoVersion=1.0.1.4
+VersionInfoVersion=1.1.0.1
 
 
 [Files]



From fedora-directory-commits at redhat.com  Wed Mar  5 19:57:06 2008
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Wed,  5 Mar 2008 14:57:06 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd sasl_io.c,
	1.13, 1.14
Message-ID: <200803051957.m25Jv65Y016517@cvs-int.fedora.redhat.com>

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16341

Modified Files:
	sasl_io.c 
Log Message:
Resolves: #428163
Summary: SASL IO functions set/get: argument mismatch
Fix description: When setting the IO functions in sasl_io_setup, use the local
memory to pass the IO functions.  Plus, allocate the memory for backing up the 
existing IO functions (real_iofns in the code), which is set in sasl_io_setup 
and the area is released after setting it back in sasl_io_cleanup.



Index: sasl_io.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/sasl_io.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sasl_io.c	18 Oct 2007 00:08:34 -0000	1.13
+++ sasl_io.c	5 Mar 2008 19:57:03 -0000	1.14
@@ -103,15 +103,16 @@
 sasl_io_setup(Connection *c)
 {
     int ret = 0;
-    struct lber_x_ext_io_fns *func_pointers = NULL;
+    struct lber_x_ext_io_fns func_pointers = {0};
+    struct lber_x_ext_io_fns *real_iofns = (struct lber_x_ext_io_fns *) slapi_ch_malloc(LBER_X_EXTIO_FNS_SIZE);
     sasl_io_private *sp = (sasl_io_private*) slapi_ch_calloc(1, sizeof(sasl_io_private));
 
     LDAPDebug( LDAP_DEBUG_CONNS,
                 "sasl_io_setup for connection %d\n", c->c_connid, 0, 0 );
     /* Get the current functions and store them for later */
-    ber_sockbuf_get_option( c->c_sb, LBER_SOCKBUF_OPT_EXT_IO_FNS, &func_pointers);
-    sp->real_iofns = func_pointers;
-    func_pointers = NULL;
+    real_iofns->lbextiofn_size = LBER_X_EXTIO_FNS_SIZE;
+    ber_sockbuf_get_option( c->c_sb, LBER_SOCKBUF_OPT_EXT_IO_FNS, real_iofns );
+    sp->real_iofns = real_iofns; /* released in sasl_io_cleanup */
 
     /* Set up the private structure */
     sp->real_handle = (struct lextiof_socket_private*) c->c_prfd;
@@ -119,13 +120,12 @@
     /* Store the private structure in the connection */
     c->c_sasl_io_private = sp;
     /* Insert the sasl i/o functions into the ber layer */
-    func_pointers = (struct lber_x_ext_io_fns *) slapi_ch_malloc(LBER_X_EXTIO_FNS_SIZE);
-    func_pointers->lbextiofn_size = LBER_X_EXTIO_FNS_SIZE;
-    func_pointers->lbextiofn_read = sasl_read_function;
-    func_pointers->lbextiofn_write = sasl_write_function;
-    func_pointers->lbextiofn_writev = NULL;
-    func_pointers->lbextiofn_socket_arg = (struct lextiof_socket_private *) sp;
-    ber_sockbuf_set_option( c->c_sb, LBER_SOCKBUF_OPT_EXT_IO_FNS, func_pointers);
+    func_pointers.lbextiofn_size = LBER_X_EXTIO_FNS_SIZE;
+    func_pointers.lbextiofn_read = sasl_read_function;
+    func_pointers.lbextiofn_write = sasl_write_function;
+    func_pointers.lbextiofn_writev = NULL;
+    func_pointers.lbextiofn_socket_arg = (struct lextiof_socket_private *) sp;
+    ret = ber_sockbuf_set_option( c->c_sb, LBER_SOCKBUF_OPT_EXT_IO_FNS, &func_pointers);
     /* Setup the data buffers for the fast read path */
     sasl_io_init_buffers(sp);
     /* Reset the enable flag, so we don't process it again */
@@ -139,7 +139,6 @@
 sasl_io_cleanup(Connection *c)
 {
     int ret = 0;
-    struct lber_x_ext_io_fns *func_pointers = NULL;
     sasl_io_private *sp = c->c_sasl_io_private;
     if (sp) {
         LDAPDebug( LDAP_DEBUG_CONNS,
@@ -148,9 +147,10 @@
         slapi_ch_free((void**)&(sp->encrypted_buffer));
         slapi_ch_free((void**)&(sp->decrypted_buffer));
         /* Put the I/O functions back how they were */
-        ber_sockbuf_get_option( c->c_sb, LBER_SOCKBUF_OPT_EXT_IO_FNS, &func_pointers);
-        slapi_ch_free((void**)&func_pointers);
-        ber_sockbuf_set_option( c->c_sb, LBER_SOCKBUF_OPT_EXT_IO_FNS, sp->real_iofns);
+        if (NULL != sp->real_iofns) {
+            ber_sockbuf_set_option( c->c_sb, LBER_SOCKBUF_OPT_EXT_IO_FNS, sp->real_iofns );
+            slapi_ch_free((void**)&(sp->real_iofns));
+        }
         slapi_ch_free((void**)&sp);
         c->c_sasl_io_private = NULL;
         c->c_enable_sasl_io = 0;



From fedora-directory-commits at redhat.com  Thu Mar  6 00:09:46 2008
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Wed,  5 Mar 2008 19:09:46 -0500
Subject: [Fedora-directory-commits] esc/mac mac-build.sh,1.3,1.4
Message-ID: <200803060009.m2609k5p010069@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/mac
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10042

Modified Files:
	mac-build.sh 
Log Message:
Bump version.



Index: mac-build.sh
===================================================================
RCS file: /cvs/dirsec/esc/mac/mac-build.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mac-build.sh	4 Mar 2008 23:57:23 -0000	1.3
+++ mac-build.sh	6 Mar 2008 00:09:43 -0000	1.4
@@ -47,7 +47,7 @@
 COOLKEY_TAG=HEAD
 
 
-ESC_VERSION=1.1.0-1
+ESC_VERSION=1.0.1-6
 
 COOLKEY_DMG_NAME=SmartCardManager-$ESC_VERSION.OSX4.darwin.dmg
 



From fedora-directory-commits at redhat.com  Thu Mar  6 00:10:16 2008
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Wed,  5 Mar 2008 19:10:16 -0500
Subject: [Fedora-directory-commits] esc/win32 build.sh,1.4,1.5
Message-ID: <200803060010.m260AGTY010099@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/win32
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10082

Modified Files:
	build.sh 
Log Message:
Bump version.



Index: build.sh
===================================================================
RCS file: /cvs/dirsec/esc/win32/build.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.sh	5 Mar 2008 00:06:55 -0000	1.4
+++ build.sh	6 Mar 2008 00:10:14 -0000	1.5
@@ -76,7 +76,7 @@
 #ESC values
 
 ESC_NAME=esc
-ESC_VERSION_NO=1.1.0-1
+ESC_VERSION_NO=1.0.1-6
 
 
 #Cygwin values



From fedora-directory-commits at redhat.com  Thu Mar  6 00:11:09 2008
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Wed,  5 Mar 2008 19:11:09 -0500
Subject: [Fedora-directory-commits] esc/win32 setup.iss,1.2,1.3
Message-ID: <200803060011.m260B9El010122@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/win32
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10105

Modified Files:
	setup.iss 
Log Message:
Bump versions.



Index: setup.iss
===================================================================
RCS file: /cvs/dirsec/esc/win32/setup.iss,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- setup.iss	5 Mar 2008 00:06:55 -0000	1.2
+++ setup.iss	6 Mar 2008 00:11:07 -0000	1.3
@@ -21,7 +21,7 @@
 [Setup]
 AppName=Smart Card Manager
 AppMutex=ESCMutex
-AppVerName=Smart Card Manager 1.1.0-1
+AppVerName=Smart Card Manager 1.0.1-6
 AppPublisher=Fedora
 CreateAppDir=true
 Compression=lzma
@@ -42,7 +42,7 @@
 InfoBeforeFile=info-before.txt
 InfoAfterFile=info-after.txt
 PrivilegesRequired=admin
-VersionInfoVersion=1.1.0.1
+VersionInfoVersion=1.0.1.6
 
 
 [Files]



From fedora-directory-commits at redhat.com  Thu Mar  6 22:00:41 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu,  6 Mar 2008 17:00:41 -0500
Subject: [Fedora-directory-commits] dsgw/orgbin myorg.in, 1.2, 1.3 org.in,
	1.5, 1.6
Message-ID: <200803062200.m26M0gHt017618@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	myorg.in org.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 &amp; 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: myorg.in
===================================================================
RCS file: /cvs/dirsec/dsgw/orgbin/myorg.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- myorg.in	28 Jan 2008 21:22:48 -0000	1.2
+++ myorg.in	6 Mar 2008 22:00:39 -0000	1.3
@@ -423,7 +423,7 @@
 
 print "
 
-<SCRIPT language=\"javascript\">
+<SCRIPT type=\"text/javascript\">
 
 var today = new Date();
 var expires = new Date();


Index: org.in
===================================================================
RCS file: /cvs/dirsec/dsgw/orgbin/org.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- org.in	29 Feb 2008 21:41:12 -0000	1.5
+++ org.in	6 Mar 2008 22:00:39 -0000	1.6
@@ -114,8 +114,8 @@
 if (  defined  $cg->param("context")   )
 {
     $context = $cg->param("context");
-    $contextParamString = "context=${context}&";
-    $config_tokens{"url-phonebook-base"} =~ s/context=.*?&/$contextParamString/g;
+    $contextParamString = "context=${context}&amp;";
+    $config_tokens{"url-phonebook-base"} =~ s/context=.*?&amp;/$contextParamString/g;
 }
 
 #



From fedora-directory-commits at redhat.com  Thu Mar  6 22:00:42 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu,  6 Mar 2008 17:00:42 -0500
Subject: [Fedora-directory-commits] dsgw/orghtml index.html, 1.1,
	1.2 orgchart.tmpl.in, 1.3, 1.4 topframe.html.in, 1.2, 1.3
Message-ID: <200803062200.m26M0g5M017629@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	index.html orgchart.tmpl.in topframe.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 &amp; 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: index.html
===================================================================
RCS file: /cvs/dirsec/dsgw/orghtml/index.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.html	11 Jan 2008 21:58:10 -0000	1.1
+++ index.html	6 Mar 2008 22:00:39 -0000	1.2
@@ -34,6 +34,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>
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
@@ -41,7 +43,7 @@
         <TITLE>Directory Server Org Chart</TITLE>
 
 
-<SCRIPT LANGUAGE="javascript">
+<SCRIPT type="text/javascript">
 
 
         var agt = navigator.userAgent.toLowerCase();


Index: orgchart.tmpl.in
===================================================================
RCS file: /cvs/dirsec/dsgw/orghtml/orgchart.tmpl.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- orgchart.tmpl.in	1 Feb 2008 17:04:22 -0000	1.3
+++ orgchart.tmpl.in	6 Mar 2008 22:00:39 -0000	1.4
@@ -74,7 +74,7 @@
 # the way this works now is that it will just use the LDAP server configured for the
 # phonebook to use in the pb.conf file
 
-url-phonebook-base	@httpurl@@cgiuri@/dosearch?context=pb&dn=
+url-phonebook-base	@httpurl@@cgiuri@/dosearch?context=pb&amp;dn=
 
 #
 #   A name that has no value after it equates to "" for the value, 


Index: topframe.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/orghtml/topframe.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- topframe.html.in	28 Jan 2008 21:22:48 -0000	1.2
+++ topframe.html.in	6 Mar 2008 22:00:39 -0000	1.3
@@ -34,11 +34,13 @@
  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>
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
 <META HTTP-EQUIV="Expires" CONTENT="Thu, 01 Feb 1996 00:00:00 GMT">
-<SCRIPT LANGUAGE="javascript">
+<SCRIPT type="text/javascript">
 
 // Do the Search
 
@@ -90,16 +92,16 @@
 <TABLE BORDER="0" width="100%" cellpadding=0 cellspacing=0>
 
 <TR>
-<TD ALIGN=LEFT VALIGN=CENTER class="appName" nowrap>&nbsp;Directory Server Org Chart</TD>
-<TD ALIGN=LEFT VALIGN=CENTER width="75%">
+<TD align="left" valign="middle" class="appName" nowrap>&nbsp;Directory Server Org Chart</TD>
+<TD align="left" valign="middle" width="75%">
 		<TABLE BORDER=0>
-		<TR><TD nowrap VALIGN=CENTER ALIGN=CENTER>
+		<TR><TD nowrap valign="middle" align="center">
 		<span class="apptext">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Search for:</span>
 		</TD>
-		<TD nowrap VALIGN=CENTER>
+		<TD nowrap valign="middle">
 		<span class="apptext">
 		<FORM name="form2" Method=POST action="@cgiuri@/org" target="output_window" onsubmit="return doSearch(document.form2.data.value)">
-			<font face=\"verdana, Arial, Helvetica, sans-serif\" style=\"font-size: 12px\">
+			<font face="verdana, Arial, Helvetica, sans-serif" style="font-size: 12px">
 				<INPUT TYPE="TEXT" NAME="data" SIZE=20 MAXLENGTH=20>
 				<input type="submit" name="Submit" value="Go">
 			</font>



From fedora-directory-commits at redhat.com  Thu Mar  6 22:00:41 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu,  6 Mar 2008 17:00:41 -0500
Subject: [Fedora-directory-commits] dsgw/html/manual add.htm, 1.1,
	1.2 attribut.htm, 1.2, 1.3 auth.htm, 1.1, 1.2 contents.html,
	1.1, 1.2 dn.htm, 1.2, 1.3 filters.htm, 1.2, 1.3 index.html,
	1.1, 1.2 intro.htm, 1.2, 1.3 mod.htm, 1.1, 1.2 objclass.htm,
	1.2, 1.3 search.htm, 1.1, 1.2
Message-ID: <200803062200.m26M0fac017603@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	add.htm attribut.htm auth.htm contents.html dn.htm filters.htm 
	index.html intro.htm mod.htm objclass.htm search.htm 
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 &amp; 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: add.htm
===================================================================
RCS file: /cvs/dirsec/dsgw/html/manual/add.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- add.htm	16 Jan 2008 22:56:03 -0000	1.1
+++ add.htm	6 Mar 2008 22:00:38 -0000	1.2
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<!-- --- 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.
@@ -37,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 -->
   <title>Adding Directory Entries</title>
 </head>
 <body>


Index: attribut.htm
===================================================================
RCS file: /cvs/dirsec/dsgw/html/manual/attribut.htm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- attribut.htm	29 Feb 2008 20:38:14 -0000	1.2
+++ attribut.htm	6 Mar 2008 22:00:38 -0000	1.3
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<!-- --- 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.
@@ -37,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 -->
 </head>
 <body>
 <a name="996822"></a>


Index: auth.htm
===================================================================
RCS file: /cvs/dirsec/dsgw/html/manual/auth.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- auth.htm	16 Jan 2008 22:56:03 -0000	1.1
+++ auth.htm	6 Mar 2008 22:00:38 -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>


Index: contents.html
===================================================================
RCS file: /cvs/dirsec/dsgw/html/manual/contents.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- contents.html	16 Jan 2008 22:56:03 -0000	1.1
+++ contents.html	6 Mar 2008 22:00:38 -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>
    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">


Index: dn.htm
===================================================================
RCS file: /cvs/dirsec/dsgw/html/manual/dn.htm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dn.htm	29 Feb 2008 20:38:14 -0000	1.2
+++ dn.htm	6 Mar 2008 22:00:38 -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,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 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <HTML>
 <HEAD>


Index: filters.htm
===================================================================
RCS file: /cvs/dirsec/dsgw/html/manual/filters.htm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- filters.htm	29 Feb 2008 20:38:14 -0000	1.2
+++ filters.htm	6 Mar 2008 22:00:38 -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,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 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <HTML>
 <HEAD>


Index: index.html
===================================================================
RCS file: /cvs/dirsec/dsgw/html/manual/index.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.html	16 Jan 2008 22:56:03 -0000	1.1
+++ index.html	6 Mar 2008 22:00:38 -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,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 -->
 <A NAME="6807">
 <H1>
 </H1>


Index: intro.htm
===================================================================
RCS file: /cvs/dirsec/dsgw/html/manual/intro.htm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- intro.htm	29 Feb 2008 20:38:14 -0000	1.2
+++ intro.htm	6 Mar 2008 22:00:38 -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>
 <title>Introduction to the Directory Server Web Interface</title>


Index: mod.htm
===================================================================
RCS file: /cvs/dirsec/dsgw/html/manual/mod.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod.htm	16 Jan 2008 22:56:03 -0000	1.1
+++ mod.htm	6 Mar 2008 22:00:38 -0000	1.2
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<!-- --- 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.
@@ -37,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 -->
   <title>Editing Directory Entries</title>
 </head>
 <body>


Index: objclass.htm
===================================================================
RCS file: /cvs/dirsec/dsgw/html/manual/objclass.htm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- objclass.htm	29 Feb 2008 20:38:14 -0000	1.2
+++ objclass.htm	6 Mar 2008 22:00:38 -0000	1.3
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<!-- --- 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.
@@ -37,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 -->
 </head>
 <body>
 <a name="1096805"></a>


Index: search.htm
===================================================================
RCS file: /cvs/dirsec/dsgw/html/manual/search.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- search.htm	16 Jan 2008 22:56:03 -0000	1.1
+++ search.htm	6 Mar 2008 22:00:38 -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>
 <title>Searching the Directory Tree</title>



From fedora-directory-commits at redhat.com  Thu Mar  6 22:00:42 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu,  6 Mar 2008 17:00:42 -0500
Subject: [Fedora-directory-commits] dsgw/pbconfig authPassword.html.in, 1.1,
	1.2 authSearch.html.in, 1.1, 1.2 display-orgperson.html.in,
	1.1, 1.2 display-orgunit.html.in, 1.1,
	1.2 display-room.html.in, 1.1, 1.2 edit-passwd.html.in, 1.1,
	1.2 list-Auth.html.in, 1.2, 1.3 list-People.html.in, 1.1,
	1.2 pb.tmpl.in, 1.3, 1.4
Message-ID: <200803062200.m26M0g0Y017674@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	authPassword.html.in authSearch.html.in 
	display-orgperson.html.in display-orgunit.html.in 
	display-room.html.in edit-passwd.html.in list-Auth.html.in 
	list-People.html.in pb.tmpl.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 &amp; 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/pbconfig/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:23 -0000	1.1
+++ authPassword.html.in	6 Mar 2008 22:00:40 -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,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 -->
 <!--
  |  $Id$
  |
@@ -45,30 +45,33 @@
  |
  | HISTORY:
  |   
- +------------------------------------------------------------------------
+ +########################################################################
 -->
 
+<!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 -->&amp;file=style.css">
 </HEAD>
 
 <!-- DS_AUTH_PASSWORD_BODY -->
 <!-- DS_AUTH_PASSWORD_INFO -->
 <!-- DS_AUTH_PASSWORD_FORM -->
-<P>
+<BR>
 Password for <b>
 <!-- DS_AUTH_PASSWORD_NAME -->
 </b>: <INPUT NAME="password" TYPE="password" SIZE=16>
-<P>
+<BR>
 <CENTER>
 <TABLE BORDER=2 WIDTH=100%>
 <TR>
 <!-- DS_AUTH_PASSWORD_BUTTONS -->
 </TABLE>
+</CENTER>
 </FORM>
 </BODY>
 </HTML>


Index: authSearch.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbconfig/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:23 -0000	1.1
+++ authSearch.html.in	6 Mar 2008 22:00:40 -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,8 +34,8 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
-<!-- ---------------------------------------------------------------------------
+  END COPYRIGHT BLOCK -->
+<!-- ###########################################################################
  |  $Id$
  |
  | AUTHOR: 
@@ -45,14 +45,16 @@
  |
  | HISTORY:
  |   
- +------------------------------------------------------------------------------ -->
+ +############################################################################## -->
 
+<!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 -->&amp;file=style.css">
 </HEAD>
 <!-- DS_AUTH_SEARCH_BODY -->
 <!-- DS_AUTH_SEARCH_INFO -->
@@ -60,16 +62,19 @@
 The first step in authenticating to the directory is identifying
 yourself.<br>Please type your name:
 <!-- DS_AUTH_SEARCH_NAME -->
-<P>
+<BR>
 <CENTER>
 <TABLE BORDER=1 WIDTH=100%%>
 <TR>
 <!-- DS_AUTH_SEARCH_BUTTONS -->
 </TABLE>
+</CENTER>
 </FORM>
-<P>
+<BR>
+<CENTER>
 <!-- DS_AUTH_AS_ROOT_FORM -->
 <INPUT TYPE="submit" VALUE="Authenticate as directory manager">??(only available to Directory Administrators)
 </FORM>
+</CENTER>
 </BODY>
 </HTML>


Index: display-orgperson.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbconfig/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:23 -0000	1.1
+++ display-orgperson.html.in	6 Mar 2008 22:00:40 -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 -->
@@ -51,14 +53,14 @@
 <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
 </title>
 
-<script language="JavaScript">
+<script type="text/javascript">
 <!-- Hide from non-JavaScript-capable browsers
 
 var cardurl;
 
 function locator(){
 
-<!-- DS_ATTRIBUTE "attr=_vcard" "options=link" "mimetype=text/x-vcard" "prefix=var cardurl=" "suffix=";" -->
+<!-- DS_ATTRIBUTE "attr=_vcard" "options=link,entities" "mimetype=text/x-vcard" "prefix=var cardurl=" "suffix=";" -->
 
     card.cards.document.location = cardurl;
 }
@@ -91,27 +93,27 @@
   return;
 }
 
-document.write('<a href=\"aim:goim?Screenname=' + aimID.replace(/ /,"+") + '\"><IMG SRC=\"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=\"lang?<!-- GCONTEXT -->&amp;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 -->&amp;file=style.css">
 </head>
 
 
 <!-- COLORS "BGCOLOR=white" -->
 <!-- IF "!Displaying" -->
-<body bgcolor="#FFFFFF" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0">
+<body bgcolor="#FFFFFF" style="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>
+<tr style="width: 100%" class="bgColor1">
+<TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;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 -->&amp;file=clear.gif" width="1" height="10" border="0"></td>
 </tr>
 </table>
 <!-- ELSE -->
@@ -130,14 +132,14 @@
 <!-- ENDIF // Adding -->
 
 
-<!-- --------------- Begin Header Info ------------------ -->
+<!-- ############### Begin Header Info ################## -->
 <!-- single-pixel gif to enforce left alignment -->
-<img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=pixel.gif" height="1" width="1" hspace="20" align="left" border="0">
+<img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=pixel.gif" height="1" width="1" hspace="20" align="left" border="0">
 
 <table width="90%" border="0" cellpadding="2" cellspacing="0" align="left" bgcolor="#FFFFFF">
   <tr valign="middle" align="left" class="bgcolor4">
     <td width="10" nowrap align="center">
-      <img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=32-person.gif" height="32" width="32" border="0" align="center">
+      <img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=32-person.gif" height="32" width="32" border="0" align="middle">
     </td>
     <td nowrap class="boldbig">
 <!-- IF "Adding" -->
@@ -150,17 +152,17 @@
 <A HREF=
 <!-- DS_ORGCHARTLINK -->
  class="linknodec">
-<IMG SRC="lang?<!-- GCONTEXT -->&file=orgicon.gif" BORDER=0 ALT="Click to view this person's organization chart." HSPACE=5><span style="text-decoration:none;color:black">&nbsp;org chart</span></a>
+<IMG SRC="lang?<!-- GCONTEXT -->&amp;file=orgicon.gif" BORDER=0 ALT="Click to view this person's organization chart." HSPACE=5 align="top"><span style="text-decoration:none;color:black">&nbsp;org chart</span></a>
 <!-- ENDIF -->
-    <a href="javascript:showVCard()" onMouseOver="top.status='View this person\'s digital business card.'; return true" class="linknodec"><img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=tiny_vcard.gif" align="texttop" border="0" height="20" 
+    <a href="javascript:showVCard()" onMouseOver="top.status='View this person\'s digital business card.'; return true" class="linknodec"><img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=tiny_vcard.gif" align="top" border="0" height="20" 
        width="20" alt="Click to view this person's digital business card."><span style="text-decoration:none;color:black">&nbsp; vCard</span></a>
 <!-- DS_ATTRIBUTE "attr=userCertificate;binary" "type=hidden" "options=typeonly" -->
 <!-- IF "AttributeHasValues" "userCertificate;binary" -->  
     &nbsp;&nbsp;
 <a href=
 <!-- DS_ATTRIBUTE "attr=userCertificate;binary" "options=link" "mimetype=application/x-x509-email-cert" -->
-onMouseOver="top.status='Retrieve this person\'s security certificate.'; return true"><img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=tiny_cert.gif" align="texttop" border="0" height="20" width="20" alt="Click to retrieve this 
-person's security certificate."><span style="text-decoration:none;color:black">&nbsp;Get&nbsp;Certificate</span></a>
+onMouseOver="top.status='Retrieve this person\'s security certificate.'; return true"><img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=tiny_cert.gif" border="0" height="20" width="20" alt="Click to retrieve this 
+person's security certificate." align="top"><span style="text-decoration:none;color:black">&nbsp;Get&nbsp;Certificate</span></a>
 <!-- ENDIF -->      
     &nbsp;
     </td>
@@ -188,7 +190,7 @@
     <td colspan="3">
 <!-- ENDIF -->
 
-<!-- ---------------- Begin Table Data ------------------ -->
+<!-- ################ Begin Table Data ################## -->
     
 <table border="0" cellpadding="4" cellspacing="1" width="100%" align="center">
 
@@ -235,7 +237,7 @@
     <td align="left" bgcolor="white">
 <!-- DS_ATTRIBUTE "attr=nsaimid" "cols=>16" -->
 <!-- IF "DisplayAimPresence" -->
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/javascript">
 <!-- Hide from non-JavaScript-capable browsers
 showAimIcon();
 // End hiding -->
@@ -379,7 +381,7 @@
 
 </table>
 
-<!-- ---------------------------------------------- -->
+<!-- ############################################## -->
     </td>
 
 <!-- IF "AttributeHasValues" "jpegPhoto" -->


Index: display-orgunit.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbconfig/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:23 -0000	1.1
+++ display-orgunit.html.in	6 Mar 2008 22:00:40 -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,8 +34,8 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
-<!-- ---------------------------------------------------------------------------
+  END COPYRIGHT BLOCK -->
+<!-- ###########################################################################
  | $Id$
  |
  | AUTHOR: 
@@ -46,8 +46,10 @@
  | HISTORY:
  |   
  |
- +--------------------------------------------------------------------------- -->
+ +########################################################################### -->
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <!-- HEAD -->
 <!-- inet. organizational person directory entry -->
@@ -60,7 +62,7 @@
 <!-- ENDIF // Adding -->
 Organizational Unit Entry
 </TITLE>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 </HEAD>
 <BODY bgcolor=WHITE>
 
@@ -73,14 +75,14 @@
 
 
 
-<!-- --------------- Begin Header Info ------------------ -->
+<!-- ############### Begin Header Info ################## -->
 <!-- single-pixel gif to enforce left alignment -->
-<img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=pixel.gif" height="1" width="1" hspace="20" align="left" border="0">
+<img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=pixel.gif" height="1" width="1" hspace="20" align="left" border="0">
 
 <table width="90%" border="0" cellpadding="2" cellspacing="0" align="left" bgcolor="#FFFFFF">
   <tr valign="middle" align="left" class="bgColor4">
     <td width="10" nowrap align="center">
-      <img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=department.gif" height="32" width="32" border="0" align="center">
+      <img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=department.gif" height="32" width="32" border="0" align="middle">
     </td>
     <td nowrap class="boldbig">
 <!-- DS_ATTRIBUTE "attr=ou" "syntax=cis" "options=readonly" --> 
@@ -98,7 +100,7 @@
   <tr valign="top">
     <td colspan="3">
     
-<!-- ---------------- Begin Table Data ------------------ -->
+<!-- ################ Begin Table Data ################## -->
     
 <table border="0" cellpadding="4" cellspacing="1" width="100%" align="center">
 
@@ -213,14 +215,14 @@
 
 </table>
 
-<!-- ---------------------------------------------- -->
+<!-- ############################################## -->
 
     </td>
   </tr>
   <tr valign="middle" align="left" class="bgColor4">
     <td colspan="2">
-      <img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=pixel.gif" border="0" height="20" width="91">  
-      <img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=pixel.gif" border="0" height="20" width="107">
+      <img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=pixel.gif" border="0" height="20" width="91">  
+      <img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=pixel.gif" border="0" height="20" width="107">
     </td>
   </tr>  
 


Index: display-room.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbconfig/display-room.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- display-room.html.in	14 Jan 2008 22:31:23 -0000	1.1
+++ display-room.html.in	6 Mar 2008 22:00:40 -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=Room" -->
@@ -46,7 +48,7 @@
 <!-- ENDIF // Adding -->
 Room Entry
 </title>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 </head>
 <body bgcolor="white">
 
@@ -58,14 +60,14 @@
 <!-- PCONTEXT -->
 <!-- ENDIF // Adding -->
 
-<!-- --------------- Begin Header Info ------------------ -->
+<!-- ############### Begin Header Info ################## -->
 <!-- single-pixel gif to enforce left alignment -->
-<img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=pixel.gif" height="1" width="1" hspace="20" align="left" border="0">
+<img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=pixel.gif" height="1" width="1" hspace="20" align="left" border="0">
 
 <table width="90%" border="0" cellpadding="2" cellspacing="0" align="left" bgcolor="#FFFFFF">
   <tr valign="middle" align="left" class="bgColor4">
     <td width="10" nowrap align="center">
-      <img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=32-conference.gif" height="32" width="32" border="0" align="center">
+      <img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=32-conference.gif" height="32" width="32" border="0" align="middle">
     </td>
     <td nowrap class="boldbig">
 <!-- IF "Adding" -->
@@ -74,8 +76,8 @@
 <!-- DS_ATTRIBUTE "attr=cn" "syntax=dn" "options=readonly" -->
     </td>
     <td align="right">
-      <img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=pixel.gif" border="0" height="20" width="91">  
-      <img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=pixel.gif" border="0" height="20" width="107">
+      <img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=pixel.gif" border="0" height="20" width="91">  
+      <img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=pixel.gif" border="0" height="20" width="107">
     </td>
   </tr>
   <tr valign="top" align="left">
@@ -92,7 +94,7 @@
   <tr valign="top">
     <td colspan="3">
     
-<!-- ---------------- Begin Table Data ------------------ -->
+<!-- ################ Begin Table Data ################## -->
     
 <table border="0" cellpadding="4" cellspacing="1" width="100%" align="center">
 
@@ -138,8 +140,8 @@
   </tr>
   <tr valign="middle" align="left" class="bgColor4">
     <td colspan="3">
-      <img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=pixel.gif" border="0" height="20" width="91">  
-      <img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=pixel.gif" border="0" height="20" width="107">
+      <img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=pixel.gif" border="0" height="20" width="91">  
+      <img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=pixel.gif" border="0" height="20" width="107">
     </td>
   </tr>  
 


Index: edit-passwd.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbconfig/edit-passwd.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- edit-passwd.html.in	14 Jan 2008 22:31:23 -0000	1.1
+++ edit-passwd.html.in	6 Mar 2008 22:00:40 -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 -->
@@ -43,31 +45,31 @@
 <TITLE>Change Password -
 <!-- 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 -->&amp;file=style.css">
 </HEAD>
 
-<body bgcolor="#FFFFFF" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0"
+<body bgcolor="#FFFFFF" style="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>
+<tr style="width: 100%" class="bgColor1">
+<TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;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 -->&amp;file=clear.gif" width="1" height="10" border="0"></td>
 </tr>
 </table>
 
-<img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=pixel.gif" height="1" width="1" hspace="20" align="left" border="0">
+<img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=pixel.gif" height="1" width="1" hspace="20" align="left" border="0">
 
 <TABLE width="90%" border="0" cellpadding="2" cellspacing="0"  bgcolor="#FFFFFF">
   <tr class="bgColor4">
     <td width="10" nowrap >
-      <img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=32-person.gif" height="32" width="32" border="0" >
+      <img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=32-person.gif" height="32" width="32" border="0" >
     </td>
 
     <td nowrap class="boldbig">
@@ -78,7 +80,7 @@
     </tr>
 </TABLE>
 
-<P>
+<BR>
 <!-- DS_BEGIN_ENTRYFORM -->
 
 
@@ -118,7 +120,7 @@
 
 <P>
 
-<img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=pixel.gif" height="1" width="1" hspace="20" align="left" border="0">
+<img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=pixel.gif" height="1" width="1" hspace="20" align="left" border="0">
 
 <TABLE width="90%" border="0" cellpadding="2" cellspacing="0"  bgcolor="#FFFFFF">
   <tr class="bgColor4">


Index: list-Auth.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbconfig/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:40 -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,8 +37,8 @@
  Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
-  --- END COPYRIGHT BLOCK ---  -->
-<!-- ---------------------------------------------------------------------------
+  END COPYRIGHT BLOCK -->
+<!-- ###########################################################################
  |  $Id$
  |
  | AUTHOR: 
@@ -46,7 +48,7 @@
  |
  | HISTORY:
  |   
- |------------------------------------------------------------------------------ -->
+ |############################################################################## -->
 <!-- HEAD -->
 <TITLE>Authenticate as...</TITLE>
 
@@ -56,18 +58,18 @@
     Each entry is tied to this single form through the magic of an
     anchor that contains href=javascript:authSubmit().
 -->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 </head>
 <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 -->&amp;file=clear.gif" width="10" height="45" border="0"></TD>
 <TD valign="middle" align="left" class="text15" width="100%">Authenticate as...</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 -->&amp;file=clear.gif" width="1" height="10" border="0"></td>
 </tr>
 </table>
 
@@ -82,7 +84,7 @@
 <!-- PCONTEXT -->
 </FORM>
 
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/javascript">
 <!-- Hide from non-JavaScript-capable browsers
 function authSubmit(encodeddn)
 {
@@ -92,12 +94,12 @@
 // End hiding -->
 </SCRIPT>
 
-<img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=pixel.gif" height="1" width="1" hspace="20" align="left" border="0">
+<img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=pixel.gif" height="1" width="1" hspace="20" align="left" border="0">
 
 <TABLE width="90%" border="0" cellpadding="2" cellspacing="0"  bgcolor="#FFFFFF">
   <tr class="bgColor4">
     <td nowrap align="right" class="boldbig">
-      <img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" height="32" width="1" border="0" >
+      <img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif" height="32" width="1" border="0" >
     </td>
     </tr>
 </TABLE>
@@ -134,7 +136,7 @@
 </CENTER>
 
 <FORM>
-<img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=pixel.gif" height="1" width="1" hspace="20" align="left" border="0">
+<img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=pixel.gif" height="1" width="1" hspace="20" align="left" border="0">
 
 <TABLE width="90%" border="0" cellpadding="2" cellspacing="0"  bgcolor="#FFFFFF">
   <tr class="bgColor4">


Index: list-People.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbconfig/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:23 -0000	1.1
+++ list-People.html.in	6 Mar 2008 22:00:40 -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,11 +37,11 @@
  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 -->&amp;file=style.css">
 
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/javascript">
 <!-- Hide from non-JavaScript-capable browsers
 
 function showAimIcon(aimID, aimStatusText)
@@ -48,16 +50,17 @@
   return;
 }
 
-document.write('<a href=\"aim:goim?Screenname=' + aimID.replace(/ /,"+") + '\"><IMG SRC=\"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=\"lang?<!-- GCONTEXT -->&amp;file=aim-online.gif\" ALT=\"Click to send an AIM to this person\" BORDER=0 HSPACE=5><\/a>');
 }
 // End hiding -->
 </SCRIPT>
+<TITLE></TITLE>
 </head>
 
 <body bgcolor=white>
 
 <!-- single-pixel gif to enforce left alignment -->
-<img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=pixel.gif" height="1" width="1" hspace="20" align="left" border="0">
+<img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=pixel.gif" height="1" width="1" hspace="20" align="left" border="0">
 
 <!-- IF "FoundEntries" -->
 
@@ -110,7 +113,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" -->


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



From fedora-directory-commits at redhat.com  Thu Mar  6 22:00:41 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu,  6 Mar 2008 17:00:41 -0500
Subject: [Fedora-directory-commits] dsgw/html/manual/ja add.htm, 1.1,
	1.2 attribut.htm, 1.2, 1.3 auth.htm, 1.1, 1.2 contents.html,
	1.1, 1.2 filters.htm, 1.1, 1.2 intro.htm, 1.1, 1.2 mod.htm,
	1.1, 1.2 objclass.htm, 1.1, 1.2 search.htm, 1.1, 1.2
Message-ID: <200803062200.m26M0gEB017625@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	add.htm attribut.htm auth.htm contents.html filters.htm 
	intro.htm mod.htm objclass.htm search.htm 
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 &amp; 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: add.htm
===================================================================
RCS file: /cvs/dirsec/dsgw/html/manual/ja/add.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- add.htm	16 Jan 2008 22:56:03 -0000	1.1
+++ add.htm	6 Mar 2008 22:00:39 -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 -->
 <TITLE>?????????????????? ?????????????????????


Index: attribut.htm
===================================================================
RCS file: /cvs/dirsec/dsgw/html/manual/ja/attribut.htm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- attribut.htm	29 Feb 2008 20:38:15 -0000	1.2
+++ attribut.htm	6 Mar 2008 22:00:39 -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 -->
 <title></title>


Index: auth.htm
===================================================================
RCS file: /cvs/dirsec/dsgw/html/manual/ja/auth.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- auth.htm	16 Jan 2008 22:56:03 -0000	1.1
+++ auth.htm	6 Mar 2008 22:00:39 -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 -->
 


Index: contents.html
===================================================================
RCS file: /cvs/dirsec/dsgw/html/manual/ja/contents.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- contents.html	16 Jan 2008 22:56:03 -0000	1.1
+++ contents.html	6 Mar 2008 22:00:39 -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 -->
    <TITLE>Directory Server??????????????????????????????</TITLE>


Index: filters.htm
===================================================================
RCS file: /cvs/dirsec/dsgw/html/manual/ja/filters.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- filters.htm	16 Jan 2008 22:56:03 -0000	1.1
+++ filters.htm	6 Mar 2008 22:00:39 -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-->


Index: intro.htm
===================================================================
RCS file: /cvs/dirsec/dsgw/html/manual/ja/intro.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- intro.htm	16 Jan 2008 22:56:03 -0000	1.1
+++ intro.htm	6 Mar 2008 22:00:39 -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 -->
 <title>Netscape Directory Server?????????????????????????????????</title>


Index: mod.htm
===================================================================
RCS file: /cvs/dirsec/dsgw/html/manual/ja/mod.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod.htm	16 Jan 2008 22:56:03 -0000	1.1
+++ mod.htm	6 Mar 2008 22:00:39 -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 -->
 <TITLE>?????????????????? ?????????????????????</TITLE>


Index: objclass.htm
===================================================================
RCS file: /cvs/dirsec/dsgw/html/manual/ja/objclass.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- objclass.htm	16 Jan 2008 22:56:03 -0000	1.1
+++ objclass.htm	6 Mar 2008 22:00:39 -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 -->
 


Index: search.htm
===================================================================
RCS file: /cvs/dirsec/dsgw/html/manual/ja/search.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- search.htm	16 Jan 2008 22:56:03 -0000	1.1
+++ search.htm	6 Mar 2008 22:00:39 -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,8 +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 -->
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <!-- HEAD -->
 <title>?????????????????? ??????????????????</title>



From fedora-directory-commits at redhat.com  Thu Mar  6 22:00:13 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu,  6 Mar 2008 17:00:13 -0500
Subject: [Fedora-directory-commits] dsgw/config authPassword.html.in, 1.1,
 1.2 authSearch.html.in, 1.1, 1.2 csearch.html.in, 1.2,
 1.3 csearchAttr.html.in, 1.1, 1.2 csearchBase.html.in, 1.1,
 1.2 csearchMatch.html.in, 1.1, 1.2 csearchString.html.in, 1.1,
 1.2 csearchType.html.in, 1.1, 1.2 display-country.html.in, 1.1,
 1.2 display-dc.html.in, 1.1, 1.2 display-dnedit.html.in, 1.2,
 1.3 display-dneditpeople.html.in, 1.2, 1.3 display-group.html.in, 1.1,
 1.2 display-groupun.html.in, 1.1, 1.2 display-ntgroup.html.in, 1.1,
 1.2 display-ntperson.html.in, 1.1, 1.2 display-org.html.in, 1.1,
 1.2 display-orgperson.html.in, 1.1, 1.2 display-orgunit.html.in, 1.1,
 1.2 display-person.html.in, 1.1, 1.2 dsgw.tmpl.in, 1.3, 1.4 edit-passwd.html,
 1.1.1.1, 1.2 list-Anything.html.in, 1.1, 1.2 list-Auth.html.in, 1.2,
 1.3 list-Domaincomponent.html.in, 1.1, 1.2 list-Groups.html.in, 1.1,
 1.2 list-NT-Groups.html.in, 1.1, 1.2 list-NT-People.html.in, 1.1,
 1.2 list-Org-Units.html.in, 1.1, 1.2 list-Organizations.html.in, 1.1,
 1.2 list-People.html.in, 1.1, 1.2 list-fa-Groups.html.in, 1.1, 1.2 list-fa-!
 People.html.in, 1.1, 1.2 list-urlsearch.html.in, 1.1, 1.2 newentry.html.in,
 1.2, 1.3 newentryName.html.in, 1.1, 1.2 newentryType.html.in, 1.1,
 1.2 search.html.in, 1.2, 1.3 searchString.html.in, 1.1, 1.2
Message-ID: <200803062200.m26M0hTe017714@cvs-int.fedora.redhat.com>

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 &amp; 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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;file=type" NAME="searchTypeFrame" NORESIZE SCROLLING="NO">
+        <FRAME SRC="@cgiuri@/csearch?<!-- GCONTEXT -->&amp;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 -->&amp;file=attr" NAME="searchAttrFrame" NORESIZE SCROLLING="NO">
+	<FRAME SRC="@cgiuri@/csearch?<!-- GCONTEXT -->&amp;file=match" NAME="searchMatchFrame" NORESIZE SCROLLING="NO">
+        <FRAME SRC="@cgiuri@/csearch?<!-- GCONTEXT -->&amp;file=string" NAME="searchStringFrame" SCROLLING="NO">
      </FRAMESET>
-     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=emptyFrame.html" NAME="outputFrame">
+     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;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&amp;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 -->&amp;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 -->&amp;file=message.gif" height=32 width=32 border=0>
             </TD>
             <TD width=9>
               &nbsp;


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 -->&amp;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 -->&amp;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 -->&amp;file=message.gif" height=32 width=32 border=0>
             </TD>
             <TD width=9>
               &nbsp;


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 -->&amp;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 -->&amp;file=message.gif" height=32 width=32 border=0>
             </TD>
             <TD width=9>
               &nbsp;


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 -->&amp;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 -->&amp;file=message.gif" height=32 width=32 border=0>
             </TD>
             <TD width=9>
               &nbsp;


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 -->&amp;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 -->&amp;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 -->&amp;file=message.gif" height=32 width=32 border=0>
             </TD>
             <TD width=9>
               &nbsp;


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 -->&amp;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 -->&amp;file=message.gif" height=32 width=32 border=0>
             </TD>
             <TD width=9>
               &nbsp;


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 -->&amp;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 -->&amp;file=message.gif" height=32 width=32 border=0>
             </TD>
             <TD width=9>
               &nbsp;


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 -->&amp;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 -->&amp;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 -->&amp;file=message.gif" height=32 width=32 border=0>
             </TD>
             <TD width=9>
               &nbsp;


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 -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;file=message.gif" height=32 width=32 border=0>
             </TD>
             <TD width=9>
               &nbsp;


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 -->&amp;file=newentrytitle.html" NORESIZE SCROLLING="NO">
+    <FRAME SRC="@cgiuri@/newentry?<!-- GCONTEXT -->&amp;file=type"
          NAME="newentryTypeFrame" SCROLLING="NO"> 
-    <FRAME SRC="@cgiuri@/newentry?<!-- GCONTEXT -->&file=name"
+    <FRAME SRC="@cgiuri@/newentry?<!-- GCONTEXT -->&amp;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 -->&amp;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 -->&amp;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 -->&amp;file=searchtitle.html" SCROLLING="NO">
+    <FRAME SRC="@cgiuri@/search?<!-- GCONTEXT -->&amp;file=string" NAME=searchFrame NORESIZE SCROLLING="NO">
+    <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&amp;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 -->&amp;file=style.css">
 </HEAD>
 <!-- DS_SEARCH_BODY -->
 <!-- DS_SEARCH_FORM "target=outputFrame" -->



From fedora-directory-commits at redhat.com  Thu Mar  6 22:00:13 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu,  6 Mar 2008 17:00:13 -0500
Subject: [Fedora-directory-commits] dsgw Makefile.am, 1.17, 1.18 config.c,
	1.5, 1.6 csearch.c, 1.5, 1.6 dbtdsgw.h, 1.4, 1.5 dnedit.c, 1.5,
	1.6 doauth.c, 1.4, 1.5 domodify.c, 1.3, 1.4 dsgw.h, 1.8,
	1.9 dsgwutil.c, 1.10, 1.11 emitauth.c, 1.3, 1.4 entrydisplay.c,
	1.8, 1.9 error.c, 1.3, 1.4 htmlout.c, 1.4, 1.5 htmlparse.c,
	1.3, 1.4 ldaputil.c, 1.4, 1.5 newentry.c, 1.3, 1.4 search.c,
	1.3, 1.4 setup-ds-dsgw.in, 1.5, 1.6 tutor.c, 1.3, 1.4 unauth.c,
	1.2, 1.3 cgidbgwrapper.sh.in, 1.1, 1.2 lang.c, 1.4,
	1.5 aclocal.m4, 1.14, 1.15 configure, 1.17, 1.18 missing, 1.13,
	1.14 install-sh, 1.13, 1.14 Makefile.in, 1.18, 1.19 depcomp,
	1.13, 1.14 config.sub, 1.13, 1.14 config.guess, 1.13,
	1.14 compile, 1.13, 1.14
Message-ID: <200803062200.m26M0gmY017632@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	Makefile.am config.c csearch.c dbtdsgw.h dnedit.c doauth.c 
	domodify.c dsgw.h dsgwutil.c emitauth.c entrydisplay.c error.c 
	htmlout.c htmlparse.c ldaputil.c newentry.c search.c 
	setup-ds-dsgw.in tutor.c unauth.c cgidbgwrapper.sh.in lang.c 
	aclocal.m4 configure missing install-sh Makefile.in depcomp 
	config.sub config.guess compile 
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 &amp; 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: Makefile.am
===================================================================
RCS file: /cvs/dirsec/dsgw/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Makefile.am	1 Feb 2008 16:50:12 -0000	1.17
+++ Makefile.am	6 Mar 2008 22:00:09 -0000	1.18
@@ -39,7 +39,6 @@
 cookiedir=$(localstatedir)@cookiedir@
 manualdir = $(datadir)@manualdir@
 manualsubdir = @manualsubdir@
-gwinfodir = $(manualdir)/en/$(manualsubdir)/info
 # this is the directory where the manuals will actually be installed
 maninstdir = $(manualdir)/en/$(manualsubdir)
 perldir = $(libdir)@perldir@
@@ -66,8 +65,7 @@
 	-DCONFIGDIR=\"$(configdir)\" -DSECURITYDIR=\"$(securitydir)\" \
 	-DCGIBINDIR=\"$(cgibindir)\" -DCONTEXTDIR=\"$(contextdir)\" \
 	-DINSTCONFIGDIR=\"$(instconfigdir)\" -DMANUALDIR=\"$(manualdir)\" \
-	-DCGIURIBASE=\"$(cgiuri)\" -DMANUALSUBDIR=\"$(manualsubdir)\" \
-	-DINFODIR=\"$(gwinfodir)\"
+	-DCGIURIBASE=\"$(cgiuri)\" -DMANUALSUBDIR=\"$(manualsubdir)\"
 
 LIBS = @adminutil_lib@ -ladmsslutil at adminutil_ver@ -ladminutil at adminutil_ver@ \
 	@icu_lib@ -licui18n -licuuc -licudata \
@@ -232,9 +230,8 @@
 dist_maninst_DATA = \
 	html/manual/a.gif html/manual/add.htm html/manual/attribua.gif html/manual/attribut.htm html/manual/auth.htm \
 	html/manual/contents.html html/manual/intro.htm html/manual/mod.htm html/manual/n.gif \
-	html/manual/objclass.htm html/manual/search.htm html/manual/t.gif html/manual/y.gif html/manual/index.map
-
-dist_gwinfo_DATA = html/info/infonav.html
+	html/manual/objclass.htm html/manual/search.htm html/manual/t.gif html/manual/y.gif html/manual/index.map \
+	html/info/infonav.html
 
 nodist_context_DATA = dsgw-httpd.conf
 nodist_sbin_SCRIPTS = setup-ds-dsgw
@@ -311,6 +308,7 @@
         -e 's, at contextdir\@,$(contextdir),g' \
         -e 's, at securitydir\@,$(securitydir),g' \
         -e 's, at instconfigdir\@,$(instconfigdir),g' \
+        -e 's, at cookiedir\@,$(cookiedir),g' \
 	-e 's, at perlpath\@,$(perlpath),g' \
 	-e 's, at perlexec\@, at perlexec@,g' \
 	-e 's, at manualdir\@,$(manualdir),g' \
@@ -322,12 +320,13 @@
         -e 's, at PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
         -e 's, at brand\@,$(brand),g' \
         -e 's, at capbrand\@,$(capbrand),g' \
-        -e 's, at vendor\@,$(vendor),g'
+        -e 's, at vendor\@,$(vendor),g' \
+		-e "s, at progname\@,$$progname,g"
 
 if DEBUG
 $(DBGSCRIPTS) : cgidbgwrapper.sh.in
 	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
-	$(fixupcmd) $< > $@
+	progname=`basename $@ .sh` ; $(fixupcmd) $< > $@
 endif
 
 % : %.in


Index: config.c
===================================================================
RCS file: /cvs/dirsec/dsgw/config.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config.c	28 Jan 2008 21:22:47 -0000	1.5
+++ config.c	6 Mar 2008 22:00:09 -0000	1.6
@@ -231,7 +231,7 @@
     free( path );
 
     if (context != NULL) {
-	gc->gc_urlpfxmain = PR_smprintf("%s?context=%s&file=", dsgw_getvp(DSGW_CGINUM_LANG), context);
+	gc->gc_urlpfxmain = PR_smprintf("%s?context=%s&amp;file=", dsgw_getvp(DSGW_CGINUM_LANG), context);
     }
 
     read_dsgwconfig( fname, NULL, gc->gc_admserv, 0 );


Index: csearch.c
===================================================================
RCS file: /cvs/dirsec/dsgw/csearch.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- csearch.c	27 Feb 2008 03:36:50 -0000	1.5
+++ csearch.c	6 Mar 2008 22:00:09 -0000	1.6
@@ -164,7 +164,7 @@
 		dsgw_emits ("\n");
 
 	    } else if ( dsgw_directive_is( line, "DS_CSEARCH_SCRIPT" )) {
-		dsgw_emits("<SCRIPT LANGUAGE=\"JavaScript\">\n"
+		dsgw_emits("<SCRIPT type=\"text/javascript\">\n"
 			   "<!-- Hide from non-JavaScript-capable browsers\n"
 			   "var searchType = '';\n"
 			   "var searchAttr = '';\n"


Index: dbtdsgw.h
===================================================================
RCS file: /cvs/dirsec/dsgw/dbtdsgw.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dbtdsgw.h	29 Feb 2008 20:38:10 -0000	1.4
+++ dbtdsgw.h	6 Mar 2008 22:00:09 -0000	1.5
@@ -99,8 +99,8 @@
 	ResDef( DBT_youMayNotChangeEntriesBesidesYou_, 47, "You may not change entries besides your own." )/*extracted from error.c*/
 	ResDef( DBT_problem_, 48, "Problem" )/*extracted from error.c*/
 	ResDef( DBT_authenticationProblem_, 49, "Authentication Problem" )/*extracted from error.c*/
-	ResDef( DBT_NPYouMustReAuthenticateBeforeCon_, 50, ".\n<P>You must re-authenticate before continuing.\n" )/*extracted from error.c*/
-	ResDef( DBT_NPYouMustReAuthenticateBeforeCon_1, 51, ".\n<P>You must re-authenticate before continuing.\n" )/*extracted from error.c*/
+	ResDef( DBT_NPYouMustReAuthenticateBeforeCon_, 50, ".\n<BR>You must re-authenticate before continuing.\n" )/*extracted from error.c*/
+	ResDef( DBT_NPYouMustReAuthenticateBeforeCon_1, 51, ".\n<BR>You must re-authenticate before continuing.\n" )/*extracted from error.c*/
 	ResDef( DBT_unknownError_, 52, "unknown error" )/*extracted from error.c*/
 	ResDef( DBT_theOperationWasSuccessful_, 53, "The operation was successful." )/*extracted from error.c*/
 	ResDef( DBT_anInternalErrorOccurredInTheServ_, 54, "An internal error occurred in the server.  This usually\nindicates a serious malfunction in the server and should be\nbrought to the attention of your server administrator." )/*extracted from error.c*/
@@ -140,19 +140,19 @@
 	ResDef( DBT_entryAlreadyExists_, 88, "Entry Already Exists" )/*extracted from edit.c*/
 	ResDef( DBT_anEntryNamed_, 89, "An entry named " )/*extracted from edit.c*/
 	ResDef( DBT_onmouseoverWindowStatusClickHere_, 90, "onMouseOver=\"window.status='Click here to view this entry'; return true\"" )/*extracted from edit.c*/
-	ResDef( DBT_alreadyExistsPPleaseChooseAnothe_, 91, " already exists.<P>Please choose another name and/or location.\n<P>\n" )/*extracted from edit.c*/
+	ResDef( DBT_alreadyExistsPPleaseChooseAnothe_, 91, " already exists.<BR>Please choose another name and/or location.\n<BR>\n" )/*extracted from edit.c*/
 	ResDef( DBT_parentEntryDoesNotExist_, 92, "Parent entry does not exist" )/*extracted from edit.c*/
-	ResDef( DBT_youCannotAddAnEntryByTheNamePBSB_, 93, "You cannot add an entry by the name:<P><B>%s</B>,<P>\nbecause the parent of that entry does not exist.<P>\nBefore you can add this entry, you must first add\n" )/*extracted from edit.c*/
+	ResDef( DBT_youCannotAddAnEntryByTheNamePBSB_, 93, "You cannot add an entry by the name:<BR><B>%s</B>,<br>\nbecause the parent of that entry does not exist.<br>\nBefore you can add this entry, you must first add\n" )/*extracted from edit.c*/
 	ResDef( DBT_itsParentN_, 94, "its parent.\n" )/*extracted from edit.c*/
-	ResDef( DBT_anEntryNamedPBSBN_, 95, "an entry named:<P><B>%s</B>.\n" )/*extracted from edit.c*/
+	ResDef( DBT_anEntryNamedPBSBN_, 95, "an entry named:<br><B>%s</B>.\n" )/*extracted from edit.c*/
 	ResDef( DBT_warningNoAuthenticationContinuin_, 96, "Warning:  no authentication (continuing)...\n" )/*extracted from domodify.c*/
 	ResDef( DBT_SDirectoryEntry_, 97, "%s Directory Entry" )/*extracted from domodify.c*/
-	ResDef( DBT_PreEntryDnSPrePN_, 98, "<PRE>Entry DN: %s</PRE><P>\n" )/*extracted from domodify.c*/
+	ResDef( DBT_PreEntryDnSPrePN_, 98, "<PRE>Entry DN: %s</PRE><br>\n" )/*extracted from domodify.c*/
 	ResDef( DBT_changesToBSBHaveBeenSaved_, 99, "Changes to <B>%s</B> have been saved." )/*extracted from domodify.c*/
 	ResDef( DBT_BSBHasBeenAdded_, 100, "<B>%s</B> has been added." )/*extracted from domodify.c*/
 	ResDef( DBT_BSBHasBeenDeleted_, 101, "<B>%s</B> has been deleted." )/*extracted from domodify.c*/
 	ResDef( DBT_renamedBSBToBSB_, 102, "Renamed <B>%s</B> to <B>%s</B>." )/*extracted from domodify.c*/
-	ResDef( DBT_PBNoteBBecauseYouSTheEntryYouWer_, 103, "<P><B>Note:</B>  because you %s the entry you were \nauthenticated as, it was necessary to discard your \nauthentication credentials. You will need to authenticate \nagain to make additional changes.\n" )/*extracted from domodify.c*/
+	ResDef( DBT_PBNoteBBecauseYouSTheEntryYouWer_, 103, "<br><B>Note:</B>  because you %s the entry you were \nauthenticated as, it was necessary to discard your \nauthentication credentials. You will need to authenticate \nagain to make additional changes.\n" )/*extracted from domodify.c*/
 	ResDef( DBT_deleted_, 104, "deleted" )/*extracted from domodify.c*/
 	ResDef( DBT_renamed_, 105, "renamed" )/*extracted from domodify.c*/
 	ResDef( DBT_changedThePasswordOf_, 106, "changed the password of" )/*extracted from domodify.c*/
@@ -160,14 +160,14 @@
 	ResDef( DBT_TnotAsciiLdBytesN_, 108, "\tNOT ASCII (%ld bytes)\n" )/*extracted from domodify.c*/
 	ResDef( DBT_noValuesWereEnteredPleaseTryAgai_, 109, "No values were entered.  Please try again.\n" )/*extracted from domodify.c*/
 	ResDef( DBT_noChangesWereMadeN_, 110, "No changes were made.\n" )/*extracted from domodify.c; XXXmcs: no longer used*/
-	ResDef( DBT_PSendingSToTheDirectoryServerN_, 111, "<P>Sending %s to the directory server...\n" )/*extracted from domodify.c*/
+	ResDef( DBT_PSendingSToTheDirectoryServerN_, 111, "<br>Sending %s to the directory server...\n" )/*extracted from domodify.c*/
 	ResDef( DBT_information_, 112, "information" )/*extracted from domodify.c*/
 	ResDef( DBT_changes_, 113, "changes" )/*extracted from domodify.c*/
-	ResDef( DBT_PSuccessfullyAddedEntryN_, 114, "<P>Successfully added entry.\n" )/*extracted from domodify.c*/
-	ResDef( DBT_PSuccessfullyEditedEntryYourChan_, 115, "<P>Successfully edited entry.  Your changes have been saved.\n" )/*extracted from domodify.c*/
-	ResDef( DBT_PSuccessfullyDeletedEntryN_, 116, "<P>Successfully deleted entry.\n" )/*extracted from domodify.c*/
+	ResDef( DBT_PSuccessfullyAddedEntryN_, 114, "<br>Successfully added entry.\n" )/*extracted from domodify.c*/
+	ResDef( DBT_PSuccessfullyEditedEntryYourChan_, 115, "<br>Successfully edited entry.  Your changes have been saved.\n" )/*extracted from domodify.c*/
+	ResDef( DBT_PSuccessfullyDeletedEntryN_, 116, "<br>Successfully deleted entry.\n" )/*extracted from domodify.c*/
 	ResDef( DBT_PreTheNewNameForTheEntryIsSNPreH_, 117, "<PRE>The new name for the entry is: %s\n</PRE><HR>\n" )/*extracted from domodify.c*/
-	ResDef( DBT_PSuccessfullyRenamedEntryN_, 118, "<P>Successfully renamed entry.\n" )/*extracted from domodify.c*/
+	ResDef( DBT_PSuccessfullyRenamedEntryN_, 118, "<br>Successfully renamed entry.\n" )/*extracted from domodify.c*/
 	ResDef( DBT_youMustProvideTheOldPassword_, 119, "You must provide the old password." )/*extracted from domodify.c*/
 	ResDef( DBT_youMustProvideANewPasswordPlease_, 120, "You must provide a new password.  Please try again" )/*extracted from domodify.c*/
 	ResDef( DBT_theNewAndConfirmingPasswordsDoNo_, 121, "The new and confirming passwords do not match.  Please try again" )/*extracted from domodify.c*/
@@ -204,8 +204,8 @@
 	ResDef( DBT_missingFilenameForIncludeDirecti_, 152, "Missing filename for \"include\" directive\n" )/*extracted from config.c*/
 	ResDef( DBT_unknownDirectiveInConfigFileN_, 153, "Unknown directive in config file\n" )/*extracted from config.c*/
 	ResDef( DBT_EraseDbCouldNotOpenLcacheConfFil_, 154, "<= erase_db could not open lcache.conf file \"%s\"\n" )/*extracted from config.c*/
-	ResDef( DBT_FontSize1NPTheDatabaseHasBeenDel_, 155, "<FONT SIZE=\"+1\">\n<P>The database has been deleted. Creating new database... \n</FONT>\n " )/*extracted from config.c*/
-	ResDef( DBT_FontSize1NPTheDatabaseCouldNotBe_, 156, "<FONT SIZE=\"+1\">\n<P>The database could not be deleted \n</FONT>\n " )/*extracted from config.c*/
+	ResDef( DBT_FontSize1NPTheDatabaseHasBeenDel_, 155, "<FONT SIZE=\"+1\">\n<br>The database has been deleted. Creating new database... \n</FONT>\n " )/*extracted from config.c*/
+	ResDef( DBT_FontSize1NPTheDatabaseCouldNotBe_, 156, "<FONT SIZE=\"+1\">\n<br>The database could not be deleted \n</FONT>\n " )/*extracted from config.c*/
 	ResDef( DBT_AppSuffixCouldNotOpenLdifFileSN_, 157, "<= app_suffix could not open ldif file \"%s\"\n" )/*extracted from config.c*/
 	ResDef( DBT_AppSuffixCouldNotOpenTmpFileSN_, 158, "<= app_suffix could not open tmp file \"%s\"\n" )/*extracted from config.c*/
 	ResDef( DBT_unableToRenameSToS_, 159, "Unable to rename %s to %s" )/*extracted from config.c*/
@@ -362,7 +362,7 @@
 	ResDef( DBT_YouAreNowAuthenticated_, 315, "You are now authenticated to the directory as <B>%s</B>." )/*extracted from doauth.c*/
 	ResDef( DBT_YourAuthenticationCredentialsWill_, 316, "Your authentication credentials will expire in %d minutes.\n" )/*extracted from doauth.c*/
 	ResDef( DBT_AfterYourCredentialsExpire_, 317, "After your credentials expire, you will need to \nre-authenticate to the directory.\n" )/*extracted from doauth.c*/
-	ResDef( DBT_ThePasswordForThisEntryWillExpire_, 318, "<P>The password for this entry will expire <B>%s</B>.\n" )/*extracted from doauth.c*/
+	ResDef( DBT_ThePasswordForThisEntryWillExpire_, 318, "<br>The password for this entry will expire <B>%s</B>.\n" )/*extracted from doauth.c*/
 	ResDef( DBT_AuthenticationFailedBecause_, 319, "Authentication failed because" )/*extracted from doauth.c*/
 	ResDef( DBT_AuthEntryNotExist_, 320, "Authentication failed because the entry you attempted to authenticate as does\nnot exist in the directory.\nYou may only authenticate as an existing directory\nentry.\n")/*extracted from doauth.c*/
 	ResDef( DBT_AuthEntryHasNoPassword_, 321, "Authentication failed because the entry you attempted to authenticate as does\nnot have a password.  Before you can authenticate\nas this entry, a password must be set by a\ndirectory administrator\n")/*extracted from doauth.c*/


Index: dnedit.c
===================================================================
RCS file: /cvs/dirsec/dsgw/dnedit.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dnedit.c	27 Feb 2008 03:36:50 -0000	1.5
+++ dnedit.c	6 Mar 2008 22:00:09 -0000	1.6
@@ -96,7 +96,7 @@
 
     /* Send the top-level document HTML */
     dsgw_emits( "<HTML>\n"
-		"<SCRIPT LANGUAGE=\"JavaScript\">\n" );
+		"<SCRIPT type=\"text/javascript\">\n" );
     dsgw_emitf( "var emptyFrame = '';\n" );
     dsgw_emitf( "var attrname = '%s';\n", attrname );
     /*
@@ -393,7 +393,7 @@
 	"<FRAMESET BORDER=1 FRAMEBORDER=1 ROWS=230,*,0,0 "
 	"SCROLLING=\"NO\" NORESIZE onLoad=\"genOutputFrame"
 	"(this.outputFrame, this.dnlist);\">\n" );
-    dsgw_emitf( "   <FRAME SRC=\"%s?tmplname=%s&dn=%s&context=%s&DNATTR=%s&"
+    dsgw_emitf( "   <FRAME SRC=\"%s?tmplname=%s&amp;dn=%s&amp;context=%s&amp;DNATTR=%s&amp;"
 	     "DNDESC=%s\" NAME=\"controlFrame\" SCROLLING=\"no\">\n",
 	     dsgw_getvp( DSGW_CGINUM_EDIT ), tmplname, edn, context, attrname,
 	     attrdesc );


Index: doauth.c
===================================================================
RCS file: /cvs/dirsec/dsgw/doauth.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- doauth.c	27 Feb 2008 03:36:50 -0000	1.4
+++ doauth.c	6 Mar 2008 22:00:09 -0000	1.5
@@ -187,11 +187,13 @@
 
 	/* Construct a success message */
 	dsgw_send_header();
+	dsgw_emits( "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\"\n" );
+	dsgw_emits( "    \"http://www.w3.org/TR/html4/strict.dtd\">\n" );
 	dsgw_emits( "<HTML>" );
 	dsgw_head_begin();
 	dsgw_emits( "\n" 
 	    "<TITLE>Authentication Successful</TITLE>\n"
-	    "<SCRIPT LANGUAGE=\"JavaScript\">\n"
+	    "<SCRIPT type=\"text/javascript\">\n"
 	    "<!-- Hide from non-JavaScript browsers\n" );
 
 	if ( authdesturl != NULL && strlen( authdesturl ) > 0 ) {
@@ -256,8 +258,11 @@
 			XP_GetClientStr( DBT_continue_4 ));
 	}
 	dsgw_emit_helpbutton( "AUTHSUCCESS" );
-	dsgw_emits(
-	    "\n</TABLE></FORM>");
+	dsgw_emits( "\n<" );
+	dsgw_fputn(stdout, "\\", 1); /* only way to emit a single \ in a javascript quote */
+	dsgw_emits("/TABLE><");
+	dsgw_fputn(stdout, "\\", 1); /* only way to emit a single \ in a javascript quote */
+	dsgw_emits("/FORM>\n");
 	dsgw_quotation_end(); dsgw_emits(";\n");
 
 	dsgw_emits(
@@ -271,8 +276,11 @@
 	dsgw_emit_homebutton();
 	dsgw_emits( "\n<TD ALIGN=CENTER WIDTH=50%%>" );
 	dsgw_emit_helpbutton( "AUTHSUCCESS" );
-	dsgw_emits(
-	    "\n</TABLE></FORM>\n");
+	dsgw_emits( "\n<" );
+	dsgw_fputn(stdout, "\\", 1); /* only way to emit a single \ in a javascript quote */
+	dsgw_emits("/TABLE><");
+	dsgw_fputn(stdout, "\\", 1); /* only way to emit a single \ in a javascript quote */
+	dsgw_emits("/FORM>\n");
 	dsgw_quotation_end(); dsgw_emits(";\n");
 
 	dsgw_emitf(
@@ -294,7 +302,7 @@
 #else
 	dsgw_emitf( XP_GetClientStr( DBT_YouAreNowAuthenticated_ ), binddn );
 #endif
-	dsgw_emits( "<P>\n" );
+	dsgw_emits( "<BR>\n" );
 #ifdef NOTFORNOW
 	free( ufn );
 #endif
@@ -313,13 +321,12 @@
 		dsgw_emitf(
 		    XP_GetClientStr( DBT_ThePasswordForThisEntryWillExpire_ ),
 		    asctime( pw_exp_time_tm ));
-		dsgw_emits( "<P>\n" );
+		dsgw_emits( "<BR>\n" );
 	}
 
 	dsgw_emits(
-	    "<P>\n"
-	    "<TR>\n"
-	    "<SCRIPT LANGUAGE=\"JavaScript\">\n"
+	    "<BR>\n"
+	    "<SCRIPT type=\"text/javascript\">\n"
 	    "<!-- Hide from non-JavaScript browsers\n"
 	    "if ( authdesturl != null ) {\n"
 	    "    document.write( contButtons );\n"
@@ -342,6 +349,8 @@
 do_autherror( int rc, char *msg, char *lderrtxt, int omitclosebutton )
 {
     dsgw_send_header();
+    dsgw_emits( "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\"\n" );
+    dsgw_emits( "    \"http://www.w3.org/TR/html4/strict.dtd\">\n" );
     dsgw_emits( "<HTML>" );
     dsgw_head_begin();
     dsgw_emitf( "\n"
@@ -354,7 +363,7 @@
     dsgw_emits( 
 	"</FONT>\n"
 	"</CENTER>\n"
-	"<P>\n");
+	"<BR>\n");
     if ( msg != NULL ) {
 	dsgw_emitf( "%s %s\n", 
 	    XP_GetClientStr( DBT_AuthenticationFailedBecause_ ),
@@ -387,8 +396,8 @@
     if ( lderrtxt != NULL ) {
 	dsgw_emitf( "<BR>(%s)", lderrtxt );
     }
-    dsgw_emits( "<P>\n" );
-    dsgw_form_begin( NULL, NULL );
+    dsgw_emits( "<BR>\n" );
+    dsgw_form_begin( NULL, "action=\"javascript:void();\"" );
     dsgw_emits(
 	"\n"
 	"<TABLE BORDER=2 WIDTH=100%%>\n"


Index: domodify.c
===================================================================
RCS file: /cvs/dirsec/dsgw/domodify.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- domodify.c	19 Feb 2008 15:20:21 -0000	1.3
+++ domodify.c	6 Mar 2008 22:00:09 -0000	1.4
@@ -317,7 +317,7 @@
 	}
 
 	/* output JavaScript to clear the cookie in the user's browser */
-	dsgw_emits( "<SCRIPT LANGUAGE=\"JavaScript\">\n" );
+	dsgw_emits( "<SCRIPT type=\"text/javascript\">\n" );
 	dsgw_emits( "<!-- Hide from non-JavaScript browsers\n" );
 	dsgw_emitf( "document.cookie = '%s=%s; path=/'\n",
 		DSGW_AUTHCKNAME, DSGW_UNAUTHSTR );
@@ -341,7 +341,7 @@
 
 	    entry_name_js = dsgw_escape_quotes( entry_name );
 	    new_name_js = dsgw_escape_quotes( new_name );
-	    dsgw_emits( "<SCRIPT LANGUAGE=\"JavaScript\">\n" );
+	    dsgw_emits( "<SCRIPT type=\"text/javascript\">\n" );
 	    dsgw_emits( "dsmodify_info = '" );
 	    dsgw_emitf( success_msg, entry_name_js, new_name_js );
 	    dsgw_emits( "';\n" );
@@ -359,7 +359,7 @@
 
     if (( jscomp == NULL || changetype == DSGW_CHANGETYPE_DELETE )
 	    && !gc->gc_admserv ) {
-	dsgw_form_begin( NULL, NULL );
+	dsgw_form_begin( NULL, "action=\"javascript:void();\"" );
 	dsgw_emits( "\n<CENTER><TABLE border=2 width=\"100%\"><TR>\n" );
 	/*
 	 * Show framed button.  If the modify succeeded, it is "Close".


Index: dsgw.h
===================================================================
RCS file: /cvs/dirsec/dsgw/dsgw.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dsgw.h	27 Feb 2008 03:36:50 -0000	1.8
+++ dsgw.h	6 Mar 2008 22:00:09 -0000	1.9
@@ -121,7 +121,7 @@
 #define DSGW_CONTEXTDIR_HTTP    (getenv("DSGW_CONTEXT_DIR") ? getenv("DSGW_CONTEXT_DIR") : CONTEXTDIR)
 #define	DSGW_HTMLDIR		HTMLDIR
 #define DSGW_MANROOT	        MANUALDIR "/"
-#define DSGW_MANSUBDIR          MANUALSUBDIR "/"
+#define DSGW_MANSUBDIR          MANUALSUBDIR
 #define DSGW_MANUALSHORTCUT	".MANUAL"
 #define DSGW_MANUALSHORTCUT_LEN	7
 
@@ -803,6 +803,7 @@
 void dsgw_emit_confirm_script();
 
 char *dsgw_build_urlprefix();
+char *dsgw_build_urlprefix_ext(int unescaped);
 void dsgw_init_searchprefs( struct ldap_searchobj **solistp );
 void dsgw_addtemplate( dsgwtmpl **tlpp, char *template, int count,
 	char **ocvals );
@@ -874,6 +875,7 @@
         ;
 #endif
 char *dsgw_strdup_with_entities( char *s, int *madecopyp );
+void dsgw_convert_entities( char *s );
 void dsgw_HTML_emits( char * );
 void dsgw_emit_cgi_var( int argc, char **argv );
 void dsgw_emit_button( int argc, char **argv, const char* format, ... )


Index: dsgwutil.c
===================================================================
RCS file: /cvs/dirsec/dsgw/dsgwutil.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dsgwutil.c	27 Feb 2008 03:36:50 -0000	1.10
+++ dsgwutil.c	6 Mar 2008 22:00:09 -0000	1.11
@@ -636,9 +636,9 @@
     dsgw_emitf( "<INPUT TYPE=\"button\" VALUE=\"%s\" onClick=\""
                 "if ( top.helpwin ) {"
                 "  top.helpwin.focus();"
-                "  top.helpwin.infotopic.location='%s?tutor=!%s&context=%s';"
+                "  top.helpwin.infotopic.location='%s?tutor=!%s&amp;context=%s';"
                 "} else {"
-                "  window.open('%s?tutor=%s&context=%s', 'infowin_dsgw', "
+                "  window.open('%s?tutor=%s&amp;context=%s', 'infowin_dsgw', "
                 "    'resizable=1,width=400,height=500');"
                 "}\">\n",
                 XP_GetClientStr(DBT_help_1), tutorvp, topic, context, 
@@ -654,14 +654,34 @@
 char *
 dsgw_build_urlprefix()
 {
+    return dsgw_build_urlprefix_ext(0);
+}
+
+/*
+ * Return malloc'd URL prefix that consists of:
+ *	prefix + '/' + HOST:PORT + '/' (not anymore - RJP)
+ *      prefix + ? + context=CONTEXT&hp=HOST:PORT&dn=
+ * By default, the URL will be HTML escaped for use as regular
+ * href or src values in plain old HTML.  The optional argument
+ * is used if the url will be used in javascript - in which
+ * case, the html will not be escaped e.g.
+ * escaped - url=search?context=pb&amp;dn=foo
+ * unescaped for js - url=search?context=pb&dn=foo
+ */
+char *
+dsgw_build_urlprefix_ext(int unescaped)
+{
     char	*prefix = dsgw_getvp( DSGW_CGINUM_DOSEARCH );
     char	*urlprefix;
 
-    urlprefix = PR_smprintf("%s?context=%s&dn=", prefix, context);
+    if (unescaped) {
+	urlprefix = PR_smprintf("%s?context=%s&dn=", prefix, context);
+    } else {
+	urlprefix = PR_smprintf("%s?context=%s&amp;dn=", prefix, context);
+    }
     return( urlprefix );
 }
 
-
 void
 dsgw_addtemplate( dsgwtmpl **tlpp, char *template, int count, char **ocvals )
 {
@@ -995,7 +1015,7 @@
 
 	dsgw_emits( "\n" 
 		"<TITLE>Password Expired</TITLE>\n"
-		"<SCRIPT LANGUAGE=\"JavaScript\">\n"
+		"<SCRIPT type=\"text/javascript\">\n"
 		"<!-- Hide from non-JavaScript browsers\n" );
 
 	if ( encodeddn != NULL && strlen( encodeddn ) > 0 ) {
@@ -1064,7 +1084,7 @@
 	dsgw_emits( XP_GetClientStr( DBT_YouMustChangeYourPasswd_ ));
 	dsgw_emits( "<P>\n"
 	    "<TR>\n"
-	    "<SCRIPT LANGUAGE=\"JavaScript\">\n"
+	    "<SCRIPT type=\"text/javascript\">\n"
 	    "<!-- Hide from non-JavaScript browsers\n"
 	    "if ( editdesturl != null ) {\n"
 	    "    document.write( contButtons );\n"


Index: emitauth.c
===================================================================
RCS file: /cvs/dirsec/dsgw/emitauth.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- emitauth.c	27 Feb 2008 03:36:50 -0000	1.3
+++ emitauth.c	6 Mar 2008 22:00:09 -0000	1.4
@@ -158,7 +158,7 @@
 		dsgw_emits ("\n");
 
 	    } else if ( dsgw_directive_is( line, "DS_AUTH_SEARCH_SCRIPT" )) {
-		dsgw_emits ("<SCRIPT NAME=\"JavaScript\">\n"
+		dsgw_emits ("<SCRIPT type=\"text/javascript\">\n"
 			    "<!-- Hide from non-JavaScript browsers\n"
 			    "function doUnauth()\n"
 			    "{\n");
@@ -242,7 +242,7 @@
 		}
 
 	    } else if ( dsgw_directive_is( line, "DS_AUTH_PASSWORD_SCRIPT" )) {
-		dsgw_emits ("<SCRIPT NAME=\"JavaScript\">\n"
+		dsgw_emits ("<SCRIPT type=\"text/javascript\">\n"
 			    "<!-- Hide from non-JavaScript browsers\n");
 		/* doUnauth function - invoke CGI which tosses cookies. */
 		dsgw_emitf ("function doUnauth()\n"


Index: entrydisplay.c
===================================================================
RCS file: /cvs/dirsec/dsgw/entrydisplay.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- entrydisplay.c	28 Feb 2008 22:17:26 -0000	1.8
+++ entrydisplay.c	6 Mar 2008 22:00:09 -0000	1.9
@@ -88,6 +88,7 @@
 #define DSGW_ATTROPT_HEX		0x00000400	/* display as hex value */
 #define DSGW_ATTROPT_DECIMAL	0x00000800	/* display as decimal value */
 #define DSGW_ATTROPT_QUOTED	0x00001000	/* quote the result */
+#define DSGW_ATTROPT_ENTITIES   0x00002000	/* force the use of entities e.g. urls in javascript */
 #define DSGW_ATTROPT_EDITABLE	0x10000000	/* not exposed in HTML */
 #define DSGW_ATTROPT_ADDING	0x20000000	/* not exposed in HTML */
 #define DSGW_ATTROPT_LINK2EDIT	0x40000000	/* not exposed in HTML */
@@ -105,6 +106,7 @@
 	"hex",
 	"decimal",
 	"quoted",
+	"entities",
 	NULL
 };
 
@@ -122,6 +124,7 @@
 	DSGW_ATTROPT_HEX,
 	DSGW_ATTROPT_DECIMAL,
 	DSGW_ATTROPT_QUOTED,
+	DSGW_ATTROPT_ENTITIES,
 };
 
 
@@ -720,25 +723,14 @@
     free( tip );
 }
 
-
 static void
-output_prelude( dsgwtmplinfo *tip )
+output_prelude_script( dsgwtmplinfo *tip )
 {
     int		editable, adding;
-    char	*line, *encodeddn;
-
-    if ( tip->dsti_preludelines != NULL ) {	/* output the prelude */
-	dsgw_savelines_rewind( tip->dsti_preludelines );
-	while (( line = dsgw_savelines_next( tip->dsti_preludelines ))
-		!= NULL ) {
-	    output_nonentry_line( tip, line );
-	}
-	dsgw_savelines_free( tip->dsti_preludelines );
-	tip->dsti_preludelines = NULL;
-    }
+    char	*encodeddn;
 
     /* output any JavaScript functions we want to include before the entry */
-    dsgw_emits( "<SCRIPT LANGUAGE=\"JavaScript\">\n" );
+    dsgw_emits( "<SCRIPT type=\"text/javascript\">\n" );
     dsgw_emits( "<!-- Hide from non-JavaScript-capable browsers\n" );
     dsgw_emits( "var emptyFrame = '';\n" );
     editable = ( tip->dsti_options & DSGW_DISPLAY_OPT_EDITABLE ) != 0;
@@ -746,8 +738,8 @@
 
     if ( !editable ) {
 	char *urlprefix = dsgw_ch_malloc( strlen(gc->gc_urlpfxmain) + 128);
-	
 	sprintf(urlprefix, "%semptyFrame.html", gc->gc_urlpfxmain);
+	dsgw_convert_entities(urlprefix);
 
 	/* include the functions used to support "Edit" buttons */
 	/* function haveAuthCookie() */
@@ -877,6 +869,35 @@
     dsgw_emits( "// End hiding -->\n</SCRIPT>\n" );
 }
 
+/*
+  Try to output our prelude javascript with any other javascript defined
+  in the template prelude section - if there is none, just output
+  the javascript prelude at the end of the prelude section
+*/
+static void
+output_prelude( dsgwtmplinfo *tip )
+{
+    char	*line;
+
+    if ( tip->dsti_preludelines != NULL ) {	/* output the prelude */
+	int did_output_prelude_script = 0;
+	dsgw_savelines_rewind( tip->dsti_preludelines );
+	while (( line = dsgw_savelines_next( tip->dsti_preludelines ))
+		!= NULL ) {
+	    if (!did_output_prelude_script && PL_strcasestr(line, "<script")) {
+		output_prelude_script( tip );
+		did_output_prelude_script = 1;
+	    }
+	    output_nonentry_line( tip, line );
+	}
+	dsgw_savelines_free( tip->dsti_preludelines );
+	tip->dsti_preludelines = NULL;
+	if (!did_output_prelude_script) {
+	    output_prelude_script( tip );
+	}
+    }
+}
+
 
 static void
 output_nonentry_line( dsgwtmplinfo *tip, char *line )
@@ -1027,8 +1048,9 @@
 	 * instead of passing the host:port to use
 	 */
 	char    *urlprefix, *escapeddn, *mimetype, *prefix, *suffix;
+	const char *amp = (options & DSGW_ATTROPT_ENTITIES) ? "&" : "&amp;";
 
-	urlprefix = dsgw_build_urlprefix();
+	urlprefix = dsgw_build_urlprefix_ext(options & DSGW_ATTROPT_ENTITIES);
 	escapeddn = dsgw_strdup_escaped( dn );
 	mimetype = get_arg_by_name( DSGW_ATTRARG_MIMETYPE, argc, argv );
 	if (( prefix = get_arg_by_name( "prefix", argc, argv )) == NULL ) {
@@ -1041,8 +1063,10 @@
 	/* XXXmcs
 	 * always reference first value for now ( "&0" ) unless returning
 	 * link to a vCard (in which case we leave the &0 off)
+	 * have to encode & in ldq as %26
 	 */
-	dsgw_emitf("%s\"%s%s&ldq=%s%%26%s%s\"%s\n", prefix, urlprefix, escapeddn, attr,
+	dsgw_emitf("%s\"%s%s%sldq=%s%%26%s%s\"%s\n", prefix, urlprefix, escapeddn, amp,
+		   attr,
 		   ( mimetype == NULL ) ? "" : mimetype,
 		    ( strcasecmp( "_vcard", attr ) == 0 ) ? "" : "%260", suffix );
 	free( urlprefix );
@@ -2013,7 +2037,7 @@
     }
 
     if (( adip->adi_opts & DSGW_ATTROPT_LINK2EDIT ) != 0 ) {
-	urlprefix = PR_smprintf("%s?context=%s&dn=",
+	urlprefix = PR_smprintf("%s?context=%s&amp;dn=",
 				dsgw_getvp( DSGW_CGINUM_EDIT ), context);
     } else {
 	urlprefix = dsgw_build_urlprefix();
@@ -2108,7 +2132,7 @@
 
     /* Output a javascript array of values for this attribute */
     if (( adip->adi_opts & DSGW_ATTROPT_DNPICKER ) != 0 ) {
-	dsgw_emits( "<SCRIPT LANGUAGE=\"JavaScript\">\n" );
+	dsgw_emits( "<SCRIPT type=\"text/javascript\">\n" );
 	dsgw_emits( "<!-- Hide from non-JavaScript-capable browsers\n" );
 	dsgw_emitf( "var %s_values = new Object;\n", adip->adi_attr );
 	for ( i = 0; adip->adi_vals != NULL && adip->adi_vals[ i ] != NULL; ++i ) {


Index: error.c
===================================================================
RCS file: /cvs/dirsec/dsgw/error.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- error.c	9 Feb 2008 18:23:38 -0000	1.3
+++ error.c	6 Mar 2008 22:00:09 -0000	1.4
@@ -257,7 +257,7 @@
 	if (ckrc != DSGW_CKDB_KEY_NOT_PRESENT && !skipauthwarning) {
 	    dsgw_send_header();
 	    dsgw_emit_alertForm();
-	    dsgw_emits( "<SCRIPT LANGUAGE=JavaScript><!--\n" );
+	    dsgw_emits( "<SCRIPT type=\"text/javascript\"><!--\n" );
 	    dsgw_emit_alert (NULL, NULL, dsgw_err2string( ckrc ),
 			     0L, "", "", "");
 	    dsgw_emits( "// -->\n</SCRIPT>\n");
@@ -268,7 +268,7 @@
 
     dsgw_html_begin( XP_GetClientStr(DBT_authenticationProblem_), 1 );
     
-    dsgw_emits( "<SCRIPT LANGUAGE=\"JavaScript\">\n<!-- hide\n\n" );
+    dsgw_emits( "<SCRIPT type=\"text/javascript\">\n<!-- hide\n\n" );
     dsgw_emitf( "document.cookie = '%s=%s; path=/';\n\n", DSGW_AUTHCKNAME,
 	       DSGW_UNAUTHSTR );
     


Index: htmlout.c
===================================================================
RCS file: /cvs/dirsec/dsgw/htmlout.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- htmlout.c	27 Feb 2008 03:36:50 -0000	1.4
+++ htmlout.c	6 Mar 2008 22:00:09 -0000	1.5
@@ -94,11 +94,15 @@
     static int	header_done = 0;
 
     if ( !header_done ) {
+	dsgw_emits( "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\"\n" );
+	dsgw_emits( "    \"http://www.w3.org/TR/html4/strict.dtd\">\n" );
 	dsgw_emits( "<HTML>" );
 	dsgw_head_begin();
 	dsgw_emits( "\n" );
 	if ( title != NULL ) {
 	    dsgw_emitf( "<TITLE>%s</TITLE>\n", title );
+	} else { /* html title element is required */
+	    dsgw_emitf( "<TITLE>TITLE</TITLE>\n" );
 	}
 	dsgw_emitf( "</HEAD>\n<BODY %s>\n", dsgw_html_body_colors );
     } else {
@@ -146,10 +150,10 @@
     int	freenewlabel;
 
     if ( urlprefix == NULL ) {
-	dsgw_emits( "<A HREF=" );
+	dsgw_emits( "<A HREF=\"" );
 	escaped_url = NULL;
     } else {
-	dsgw_emitf( "<A HREF=%s", urlprefix );
+	dsgw_emitf( "<A HREF=\"%s", urlprefix );
 	escaped_url = dsgw_ch_malloc( 3 * strlen( url ) + 1 );
 	*escaped_url = '\0';
 	dsgw_strcat_escaped( escaped_url, url );
@@ -161,6 +165,7 @@
     } else {
 	dsgw_emits( url );
     }
+    dsgw_emits("\""); /* close quote in a href above */
 
     if ( extra != NULL ) {
 	dsgw_emits( " " );
@@ -265,6 +270,7 @@
 static char	*specials = "&\"<>";
 static char	*entities[] = { "&amp;", "&quot;", "&lt;", "&gt;" };
 static int	entitylen[] = { 5, 6, 4, 4 };
+static int      entitynum = sizeof(entities)/sizeof(entities[0]);
 
 char *
 dsgw_strdup_with_entities( char *s, int *madecopyp )
@@ -310,6 +316,47 @@
     return( d );
 }
 
+/* this will convert a string with escaped entities ("&amp;")
+   back to the original unescaped string ("&")
+   This is necessary for converting URLs which would normally
+   have entities in them (e.g. search?context=foo&amp;dn=bar)
+   for use in javascript (e.g. window.href = 'search?context=foo&dn=bar')
+   since javascript must use the unescaped version
+   This converts the string in place since the entities "&amp;"
+   take up much more room than the single character represented
+   If you need to work on a copy then make a copy with strdup first.
+*/
+void
+dsgw_convert_entities(char *s)
+{
+    int		spcount, idx;
+    char	*p, *q, *r, *d;
+
+    if (!s || !*s) {
+	return;
+    }
+
+    d = r = s;
+    for ( p = s; *p != '\0'; LDAP_UTF8INC( p )) {
+	if ( ((*p) & 0x80) == 0 && ( (*p) == '&') ) {
+	    for( idx = 0; idx < entitynum; ++idx ) {
+		if (!strncmp(p, entities[ idx ], entitylen[ idx ])) {
+		    break;
+		}
+	    }
+	    if (idx < entitynum) {
+		*r = specials[idx];
+		++r;
+		p += entitylen[ idx ]-1; /* the 1 will be added in the for loop */
+	    } else {
+		r += LDAP_UTF8COPY( r, p );
+	    }
+	} else {
+	    r += LDAP_UTF8COPY( r, p );
+	}
+    }
+    *r = '\0';
+}
 
 void
 dsgw_form_begin( const char* name, const char* format, ... )
@@ -488,7 +535,7 @@
 
     msg = XP_GetClientStr(key);
 
-    dsgw_emits( "<SCRIPT LANGUAGE=\"JavaScript\">\n" );
+    dsgw_emits( "<SCRIPT type=\"text/javascript\">\n" );
     switch (key) {
     case DBT_completionJavascriptAdd:
 	dsgw_emits(msg);
@@ -539,7 +586,7 @@
 
     yes = XP_GetClientStr(yes_key);
 
-    dsgw_emitf ("<SCRIPT LANGUAGE=JavaScript><!--\n"
+    dsgw_emitf ("<SCRIPT type=\"text/javascript\"><!--\n"
 		"function OK() {\n");
     if (yes) dsgw_emitf ("    %s\n", yes);
     dsgw_emits ("    top.close();\n"


Index: htmlparse.c
===================================================================
RCS file: /cvs/dirsec/dsgw/htmlparse.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- htmlparse.c	27 Feb 2008 03:36:50 -0000	1.3
+++ htmlparse.c	6 Mar 2008 22:00:09 -0000	1.4
@@ -436,7 +436,7 @@
 dsgw_submit(int verify, char **vars)
 {
     if(verify)  {
-        dsgw_emits ("<SCRIPT language=JavaScript><!--\n"
+        dsgw_emits ("<SCRIPT type=\"text/javascript\"><!--\n"
 		    "function verify(form)\n{\n"
 		    "    window.confirmedForm = form;\n");
 	dsgw_emit_confirm (NULL, "CONFIRMVALUE5", NULL /* no */,
@@ -476,9 +476,6 @@
     dsgw_emits("</tr></table></center>\n");
 
     dsgw_emits("</form>\n");
-
-    dsgw_emits("<SCRIPT language=JavaScript>\n");
-    dsgw_emits("</SCRIPT>\n");
 }
 
 
@@ -503,9 +500,6 @@
     dsgw_emits("</tr></table></center>\n");
 
     dsgw_emits("</form>\n");
-
-    dsgw_emits("<SCRIPT language=JavaScript>\n");
-    dsgw_emits("</SCRIPT>\n");
 }
 
 
@@ -605,7 +599,7 @@
 emit_alert_noentries()
 {
     dsgw_emit_alertForm();
-    dsgw_emits( "<SCRIPT LANGUAGE=JavaScript><!--\n" );
+    dsgw_emits( "<SCRIPT LANGUAGE=\"text/javascript\"><!--\n" );
     dsgw_emit_alert (NULL, NULL, XP_GetClientStr(DBT_SearchFound0Entries_),
 		     0L, "", "", "");
     dsgw_emits( "// -->\n</SCRIPT>\n");


Index: ldaputil.c
===================================================================
RCS file: /cvs/dirsec/dsgw/ldaputil.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ldaputil.c	27 Feb 2008 03:36:50 -0000	1.4
+++ ldaputil.c	6 Mar 2008 22:00:09 -0000	1.5
@@ -737,7 +737,7 @@
 	    char **xdn;
 	    char **sn;
 
-	    dsgw_emits( "<SCRIPT LANGUAGE=\"JavaScript\">\n" );
+	    dsgw_emits( "<SCRIPT type=\"text/javascript\">\n" );
 	    dsgw_emits( "var dnlist = new Array;\n" );
 	    for ( i = 0, entry = ldap_first_entry( ld, msgp ); entry != NULL;
 		    i++, entry = ldap_next_entry( ld, entry )) {
@@ -779,7 +779,7 @@
     } else {
 	/* Count <= 0 */
 	if ( options & DSGW_DISPLAY_OPT_DNLIST_JS ) {
-	    dsgw_emitf( "<SCRIPT LANGUAGE=\"JavaScript\">\n" );
+	    dsgw_emitf( "<SCRIPT type=\"text/javascript\">\n" );
 	    dsgw_emitf( "var dnlist = new Array;\n" );
 	    dsgw_emitf( "dnlist.count = 0;\n" );
 	    dsgw_emitf( "</SCRIPT>\n" );


Index: newentry.c
===================================================================
RCS file: /cvs/dirsec/dsgw/newentry.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- newentry.c	27 Feb 2008 03:36:50 -0000	1.3
+++ newentry.c	6 Mar 2008 22:00:09 -0000	1.4
@@ -59,7 +59,7 @@
 		dsgw_emits ("\n");
 
 	    } else if ( dsgw_directive_is( line, "DS_NEWENTRY_SCRIPT" )) {
-		dsgw_emits ("<SCRIPT LANGUAGE=\"JavaScript\">\n"
+		dsgw_emits ("<SCRIPT type=\"text/javascript\">\n"
 			    "<!-- Hide from non-JavaScript-capable browsers\n"
 			    "var selectedType = -1;\n"
 			    "\n"
@@ -270,7 +270,7 @@
     edn = dsgw_strdup_escaped (dn);
     free(dn);
 		     
-    newurl = PR_smprintf(DSGW_URLPREFIX_CGI_HTTP "%s?tmplname=%s&context=%s&ADD=1&dn=%s",
+    newurl = PR_smprintf(DSGW_URLPREFIX_CGI_HTTP "%s?tmplname=%s&amp;context=%s&amp;ADD=1&amp;dn=%s",
 			 dsgw_getvp( DSGW_CGINUM_EDIT ), entryType, context, edn);
     free(edn);
 


Index: search.c
===================================================================
RCS file: /cvs/dirsec/dsgw/search.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- search.c	27 Feb 2008 03:36:50 -0000	1.3
+++ search.c	6 Mar 2008 22:00:09 -0000	1.4
@@ -109,7 +109,7 @@
 		    dsgw_head_begin();
 		    dsgw_emits ("\n");
 		} else if ( dsgw_directive_is( line, "DS_SEARCH_SCRIPT" )) {
-		    dsgw_emits ("<SCRIPT LANGUAGE=\"JavaScript\">\n"
+		    dsgw_emits ("<SCRIPT type=\"text/javascript\">\n"
 				"<!-- Hide from non-JavaScript-capable browsers\n"
 				"\n"
 				"function validate(sform)\n"


Index: setup-ds-dsgw.in
===================================================================
RCS file: /cvs/dirsec/dsgw/setup-ds-dsgw.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- setup-ds-dsgw.in	1 Feb 2008 16:50:12 -0000	1.5
+++ setup-ds-dsgw.in	6 Mar 2008 22:00:09 -0000	1.6
@@ -65,6 +65,7 @@
 securitydir="@securitydir@"
 defaultsecdir=1
 httpdconf="@httpdconf@"
+cookiedir="@cookiedir@"
 
 # see if there is a $dsgwconfigdir/../admin-serv
 admservdir=$basecfgdir/admin-serv
@@ -86,6 +87,14 @@
     dsgwuser=`ls -l $admservdir/local.conf | awk '{print $3}'`
     dsgwgroup=`ls -l $admservdir/local.conf | awk '{print $4}'`
     echo Using Administration Server URL $httpurl . . .
+else
+    echo
+    echo '########################################################################'
+    echo Error: It appears the Administration Server has not yet been configured.
+    echo There are configuration files missing from $admservdir
+    echo Please run setup-ds-admin.pl to create your Administration Server
+    echo then run this script again.
+    exit 1
 fi
 
 # see if there are any directory servers here
@@ -235,6 +244,13 @@
 chown $dsgwuser:$dsgwgroup $dsgwconfigdir/default.conf
 chmod 0400 $dsgwconfigdir/default.conf
 
+echo Generating the credential database directory . . .
+if [ ! -d "$cookiedir" ] ; then
+    mkdir -p "$cookiedir"
+fi
+chown $dsgwuser:$dsgwgroup "$cookiedir"
+chmod 0700 "$cookiedir"
+
 # tell Apache about the dsgw - must restart Apache
 echo Adding configuration to httpd config file $httpdconf . . .
 grep dsgw-httpd.conf "$httpdconf" > /dev/null 2>&1 || (echo "" ; echo "# DSGW configuration" ; echo "Include $dsgwconfigdir/dsgw-httpd.conf") >> $httpdconf


Index: tutor.c
===================================================================
RCS file: /cvs/dirsec/dsgw/tutor.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tutor.c	16 Jan 2008 22:56:02 -0000	1.3
+++ tutor.c	6 Mar 2008 22:00:09 -0000	1.4
@@ -46,45 +46,7 @@
 #include "dsgw.h"
 
 #define BASE_MAN_DIRECTORY "manual/"
-#define BASE_INFO_DIRECTORY "info/"
 #define HELP_INDEX_HTML "index.html"
-/*#define MANUAL_HPATH "bin/lang?file=" DSGW_MANUALSHORTCUT "/"*/
-
-/* Copied from ldapserver/lib/base/util.c */
-static int
-my_util_uri_is_evil(char *t)
-{
-    register int x;
- 
-    for(x = 0; t[x]; ++x) {
-        if(t[x] == '/') {
-            if(t[x+1] == '/')
-                return 1;
-            if(t[x+1] == '.') {
-                switch(t[x+2]) {
-                case '.':
-                    if((!t[x+3]) || (t[x+3] == '/'))
-                        return 1;
-                case '/':
-                case '\0':
-                    return 1;
-                }
-            }
-        }
-#ifdef XP_WIN32
-        /* On NT, the directory "abc...." is the same as "abc"
-         * The only cheap way to catch this globally is to disallow
-         * names with the trailing "."s.  Hopefully this is not over
-         * restrictive
-         */
-        if ((t[x] == '.') && ( (t[x+1] == '/') || (t[x+1] == '\0') )) {
-            return 1;
-        }
-#endif
-    }
-    return 0;
-}
-
 
 FILE *
 _open_html_file( char *filename )
@@ -94,9 +56,7 @@
     char *p;
 
     p = dsgw_file2path( DSGW_MANROOT, DSGW_MANSUBDIR );
-    mypath = (char *)dsgw_ch_malloc( strlen( p ) +
-				       strlen( filename ) + 1 );
-    sprintf( mypath, "%s%s", p, filename );
+    mypath = PR_smprintf("%s/%s", p, filename);
 
     if (!(f = fopen( mypath, "r" ))) {
 	dsgw_error( DSGW_ERR_OPENHTMLFILE, filename, DSGW_ERROPT_EXIT,
@@ -104,7 +64,7 @@
     }
 
     free( p );
-    free( mypath );
+    PR_smprintf_free( mypath );
 
     return f;
 }
@@ -142,6 +102,7 @@
     char *param = NULL;
     char *html=NULL;
     char *base=NULL;
+    int isgood = 0;
 
 #ifdef DSGW_DEBUG
    dsgw_logstringarray( "env", env ); 
@@ -156,111 +117,102 @@
         exit(0);
     }
 
-    html = (char *) dsgw_ch_malloc(strlen(param)+10+10);
-    sprintf(html, "%s.html", param);
-    if (my_util_uri_is_evil(html))  {
-        dsgw_send_header();
-        dsgw_emits( "<CENTER><H2>Error</H2></CENTER>\n"
-		   "<P>\n"
-		   "URL contains dangerous characters.  Cannot display\n"
-		   "help text." );
-	exit( 0 );
+    if (param[0] == '!') {
+	isgood = dsgw_valid_docname((param+1));
+    } else {
+	isgood = dsgw_valid_docname(param);
+    }
+
+    if (!isgood) {
+	dsgw_error( DSGW_ERR_OPENHTMLFILE, param, DSGW_ERROPT_EXIT,
+		0, NULL );
+	exit( 1 );
     }
 
     if(param[0]=='!')  {
         param++;
-        if(!strncmp(param, BASE_INFO_DIRECTORY, strlen(BASE_INFO_DIRECTORY)))  {
-            sprintf(html, "%s.html", param);
-        } else if(!strncmp(param, BASE_MAN_DIRECTORY, strlen(BASE_MAN_DIRECTORY))) {
-            if(!strstr(param, ".html"))  {
-                sprintf(html, "%s.htm", param);
-            }  else  {
-                sprintf(html, "%s", param);
-            }
-            base=param;
-        } 
-        else  {
-            char line[BIG_LINE];
-            FILE *map=NULL;
-            char *man_index=NULL;
-
-            man_index = dsgw_file2path ( DSGW_MANROOT, DSGW_MANSUBDIR "index.map" );
-
-            html[0]='\0';
-
-            map=fopen(man_index, "r");
-            if(!map) 
-                goto ohwell;
-            while(fgets(line, sizeof(line), map))  {
-                if(line[0]==';')  
-                    continue;
-                else if(ldap_utf8isspace(line))
-                    continue;
-                else  {
-                    /* parse out the line */
-                    register char *head=NULL, *tail=NULL;
-                    int found;
-
-                    head=&(line[0]);
-                    tail=head;
-                    found=0;
-                    while(*tail)  {
-                        if(ldap_utf8isspace(tail) || *tail=='=')  {
-                            *tail='\0';
-                           found=1;
-                            /* get rid of extra stuff at the end */
-                            tail++;
-			    while(1) {
-				if (*tail == 0) {
-				    ++tail; /* This looks wrong. */
-				    break;
-				}
-				LDAP_UTF8INC(tail);
-                                if((!ldap_utf8isspace(tail)) && (*tail!='='))
-                                    break;
+	char *man_path = dsgw_file2path ( DSGW_MANROOT, DSGW_MANSUBDIR );
+	char line[BIG_LINE];
+	FILE *map=NULL;
+	char *man_index=NULL;
+
+	man_index = PR_smprintf("%s/%s", man_path, "index.map" );
+
+	map=fopen(man_index, "r");
+	if(!map) 
+	    goto ohwell;
+	while(fgets(line, sizeof(line), map))  {
+	    if(line[0]==';')  
+		continue;
+	    else if(ldap_utf8isspace(line))
+		continue;
+	    else  {
+		/* parse out the line */
+		register char *head=NULL, *tail=NULL;
+		int found;
+
+		head=&(line[0]);
+		tail=head;
+		found=0;
+		while(*tail)  {
+		    if(ldap_utf8isspace(tail) || *tail=='=')  {
+			*tail='\0';
+			found=1;
+			/* get rid of extra stuff at the end */
+			tail++;
+			while(1) {
+			    if (*tail == 0) {
+				++tail; /* This looks wrong. */
+				break;
 			    }
-                            break;
-                        }
-                        LDAP_UTF8INC(tail);
-                    }
-                    if(!found) continue;
-
-                    /* script name is in head */
-                    if(strncasecmp(head, param, strlen(param)))  {
-                        continue;
-                    }
-                    /* match found.  get the actual file name */
-                    head=tail;
+			    LDAP_UTF8INC(tail);
+			    if((!ldap_utf8isspace(tail)) && (*tail!='='))
+				break;
+			}
+			break;
+		    }
+		    LDAP_UTF8INC(tail);
+		}
+		if(!found) continue;
+
+		/* script name is in head */
+		if(strncasecmp(head, param, strlen(param)))  {
+		    continue;
+		}
+		/* match found.  get the actual file name */
+		head=tail;
 /* Step on CRs and LFs. */
-                    while(*tail)  {
-                        if((*tail=='\r') || (*tail=='\n') || (*tail==';'))  {
-                            *tail='\0';
-                            break;
-                        }
-                        LDAP_UTF8INC(tail);
-                    }
-                    /* assumedly, head should now have the proper HTML file
-                     * from the manual inside. redirect the client 'cause
-                     * there's no other way to get them to jump to the 
-                     * right place. 
-		     * Looks like: 
-		     * http://host:port/dsgw/bin/lang?context=CONTEXT&file=.MANUAL/FILE.HTM
-		     * Where MANUAL is literal
-		     */ 
-                    dsgw_emitf("Location: %s%s/%s\n\n", 
-			       gc->gc_urlpfxmain, DSGW_MANUALSHORTCUT, head);
-
-                    fclose(map);
-                    exit(0);
-                }
-            }
-            fclose(map);
-	    free( man_index );
-
-ohwell:
-            if(!html[0])
-                sprintf(html, "%s%s.html", BASE_MAN_DIRECTORY, param);
-        }
+		while(*tail)  {
+		    if((*tail=='\r') || (*tail=='\n') || (*tail==';'))  {
+			*tail='\0';
+			break;
+		    }
+		    LDAP_UTF8INC(tail);
+		}
+		/* assumedly, head should now have the proper HTML file
+		 * from the manual inside. redirect the client 'cause
+		 * there's no other way to get them to jump to the 
+		 * right place. 
+		 * Looks like: 
+		 * http://host:port/dsgw/bin/lang?context=CONTEXT&file=.MANUAL/FILE.HTM
+		 * Where MANUAL is literal
+		 */
+		html = PL_strdup(gc->gc_urlpfxmain);
+		dsgw_convert_entities(html);
+		dsgw_emitf("Location: %s%s/%s\n\n", 
+			   html, DSGW_MANUALSHORTCUT, head);
+		free(html);
+		fclose(map);
+		exit(0);
+	    }
+	}
+	fclose(map);
+	free( man_index );
+
+    ohwell:
+	if(!html || !html[0])
+	    html = PR_smprintf( "%s%s.html", BASE_MAN_DIRECTORY, param);
+	free(man_path);
         dsgw_send_header();
         _my_return_html_file(html, base);
     }  else  {
@@ -270,12 +222,21 @@
         dsgw_emits("<frameset BORDER=0 FRAMEBORDER=NO rows=\"57,*\" "
 		"onLoad=\"top.master=top.opener.top;top.master.helpwin=self;\" "
 		"onUnload=\"if (top.master) { top.master.helpwin=0; }\">\n" );
-        dsgw_emitf("<frame src=\"%s?tutor=!info/infonav&context=%s\" scrolling=no "
+        dsgw_emitf("<frame src=\"%s?file=%s/infonav.html&amp;context=%s\" scrolling=no "
 		   "marginwidth=0 marginheight=0 "
-		   "name=\"infobuttons\">\n", dsgw_getvp(DSGW_CGINUM_TUTOR), context);
-        dsgw_emitf("<frame src=\"%s?tutor=!%s&context=%s\" "
+		   "name=\"infobuttons\">\n", dsgw_getvp(DSGW_CGINUM_LANG), DSGW_MANUALSHORTCUT,
+		   context);
+        dsgw_emitf("<frame src=\"%s?tutor=!%s&amp;context=%s\" "
 		   "name=\"infotopic\">\n", dsgw_getvp(DSGW_CGINUM_TUTOR), param, context);
         dsgw_emits("</frameset>\n");
     }
-    return 1;
+    return 0;
 }
+
+/*
+  emacs settings
+  Local Variables:
+  indent-tabs-mode: t
+  tab-width: 8
+  End:
+*/


Index: unauth.c
===================================================================
RCS file: /cvs/dirsec/dsgw/unauth.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- unauth.c	14 Jan 2008 22:58:30 -0000	1.2
+++ unauth.c	6 Mar 2008 22:00:09 -0000	1.3
@@ -108,7 +108,7 @@
 	 * Something went wrong, so generate some JavaScript to
 	 * discard the cookie.
 	 */
-	dsgw_emits( "<SCRIPT LANGUAGE=\"JavaScript\">\n" );
+	dsgw_emits( "<SCRIPT type=\"text/javascript\">\n" );
 	dsgw_emitf( "document.cookie = '%s=%s; path=/';\n", DSGW_AUTHCKNAME,
 		DSGW_UNAUTHSTR );
 	dsgw_emits( "</SCRIPT>\n" );


Index: cgidbgwrapper.sh.in
===================================================================
RCS file: /cvs/dirsec/dsgw/cgidbgwrapper.sh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cgidbgwrapper.sh.in	16 Jan 2008 22:56:02 -0000	1.1
+++ cgidbgwrapper.sh.in	6 Mar 2008 22:00:09 -0000	1.2
@@ -4,18 +4,32 @@
 inf=/tmp/$PROG.in.$$
 outf=/tmp/$PROG.out.$$
 
+#USEGDB=1
+VALGRINDSUPP=/path/to/valgrind.supp
+VALGRIND="valgrind --tool=memcheck --leak-check=yes --suppressions=$VALGRINDSUPP --num-callers=40 --log-file=/tmp/$PROG.vg"
 env > /tmp/env
-echo "set env LD_LIBRARY_PATH @prefix@/lib:@libdir@:/usr/lib64:/usr/lib" > .gdbinit
-echo "break main" >> .gdbinit
 if [ "$REQUEST_METHOD" = POST ] ; then
     cat - > $inf
-    echo "run < $inf > $outf" >> .gdbinit
 else
     rm -f $inf
-    echo "run > $outf" >> .gdbinit
 fi
 
-DISPLAY=:0.0 LD_LIBRARY_PATH=@prefix@/lib xterm -bg white -fn 10x20 -title gdb -e gdb -x .gdbinit $PROG
+if [ -n "$USEGDB" ] ; then
+    echo "set env LD_LIBRARY_PATH @prefix@/lib:@libdir@:/usr/lib64:/usr/lib" > .gdbinit
+    echo "break main" >> .gdbinit
+    if [ "$REQUEST_METHOD" = POST ] ; then
+        echo "run < $inf > $outf" >> .gdbinit
+    else
+        echo "run > $outf" >> .gdbinit
+    fi
+    DISPLAY=:0.0 LD_LIBRARY_PATH=@prefix@/lib xterm -bg white -fn 10x20 -title gdb -e gdb -x .gdbinit $PROG
+else
+    if [ -f $inf ] ; then
+        $VALGRIND ./$PROG < $inf > $outf
+    else
+        $VALGRIND ./$PROG > $outf
+    fi
+fi
 
 cat $outf
 rm -f $inf $outf


Index: lang.c
===================================================================
RCS file: /cvs/dirsec/dsgw/lang.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lang.c	27 Feb 2008 03:36:50 -0000	1.4
+++ lang.c	6 Mar 2008 22:00:09 -0000	1.5
@@ -125,7 +125,7 @@
     static char* docdir = NULL;
     static char* helpdir = NULL;
     char* docname = NULL;
-    char* tfname;
+    char* tfname = NULL;
     int result = 0;
     int  manual_file = 0; /* Flag: is the file a documentation file? */
     
@@ -191,11 +191,7 @@
         }
 
 	helpdir = dsgw_file2path ( DSGW_MANROOT, DSGW_MANSUBDIR );
-	tfname = (char *)dsgw_ch_malloc( strlen( helpdir ) +
-				strlen( mandocname ) +
-				1 );
-        sprintf( tfname, "%s%s",
-			 helpdir, mandocname);
+	tfname = PR_smprintf("%s/%s", helpdir, mandocname);
 	free( helpdir );
         free( mandocname );
 
@@ -228,6 +224,7 @@
 /*
  * XXXmcs: the following free() causes a crash on NT... so don't do it!
  */
+    free(tfname);
 
     return result;
 }










Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/dsgw/Makefile.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.in	1 Feb 2008 16:50:12 -0000	1.18
+++ Makefile.in	6 Mar 2008 22:00:09 -0000	1.19
@@ -70,8 +70,8 @@
 	$(am__EXEEXT_1)
 @DEBUG_TRUE at am__append_4 = $(DBGSCRIPTS)
 DIST_COMMON = README $(am__configure_deps) $(dist_config_DATA) \
-	$(dist_gwinfo_DATA) $(dist_html_DATA) $(dist_maninst_DATA) \
-	$(dist_orghtml_DATA) $(dist_pbconfig_DATA) $(dist_pbhtml_DATA) \
+	$(dist_html_DATA) $(dist_maninst_DATA) $(dist_orghtml_DATA) \
+	$(dist_pbconfig_DATA) $(dist_pbhtml_DATA) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS \
 	ChangeLog NEWS compile config.guess config.sub depcomp \
@@ -93,10 +93,10 @@
 	newentry$(EXEEXT) tutor$(EXEEXT) lang$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" \
 	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(configdir)" \
-	"$(DESTDIR)$(gwinfodir)" "$(DESTDIR)$(htmldir)" \
-	"$(DESTDIR)$(maninstdir)" "$(DESTDIR)$(orghtmldir)" \
-	"$(DESTDIR)$(pbconfigdir)" "$(DESTDIR)$(pbhtmldir)" \
-	"$(DESTDIR)$(contextdir)" "$(DESTDIR)$(propertydir)"
+	"$(DESTDIR)$(htmldir)" "$(DESTDIR)$(maninstdir)" \
+	"$(DESTDIR)$(orghtmldir)" "$(DESTDIR)$(pbconfigdir)" \
+	"$(DESTDIR)$(pbhtmldir)" "$(DESTDIR)$(contextdir)" \
+	"$(DESTDIR)$(propertydir)"
 cgibinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 @CXXLINK_REQUIRED_TRUE at am__EXEEXT_2 = dummy$(EXEEXT)
 PROGRAMS = $(cgibin_PROGRAMS) $(noinst_PROGRAMS)
@@ -192,7 +192,6 @@
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 dist_configDATA_INSTALL = $(INSTALL_DATA)
-dist_gwinfoDATA_INSTALL = $(INSTALL_DATA)
 dist_htmlDATA_INSTALL = $(INSTALL_DATA)
 dist_maninstDATA_INSTALL = $(INSTALL_DATA)
 dist_orghtmlDATA_INSTALL = $(INSTALL_DATA)
@@ -200,9 +199,8 @@
 dist_pbhtmlDATA_INSTALL = $(INSTALL_DATA)
 nodist_contextDATA_INSTALL = $(INSTALL_DATA)
 nodist_propertyDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_config_DATA) $(dist_gwinfo_DATA) $(dist_html_DATA) \
-	$(dist_maninst_DATA) $(dist_orghtml_DATA) \
-	$(dist_pbconfig_DATA) $(dist_pbhtml_DATA) \
+DATA = $(dist_config_DATA) $(dist_html_DATA) $(dist_maninst_DATA) \
+	$(dist_orghtml_DATA) $(dist_pbconfig_DATA) $(dist_pbhtml_DATA) \
 	$(nodist_context_DATA) $(nodist_property_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -392,7 +390,6 @@
 
 # look for included m4 files in the ./m4/ directory
 ACLOCAL_AMFLAGS = -I m4
-gwinfodir = $(manualdir)/en/$(manualsubdir)/info
 # this is the directory where the manuals will actually be installed
 maninstdir = $(manualdir)/en/$(manualsubdir)
 @BUNDLE_FALSE at perlpath = $(perldir)
@@ -409,7 +406,7 @@
 	-DCGIBINDIR=\"$(cgibindir)\" -DCONTEXTDIR=\"$(contextdir)\" \
 	-DINSTCONFIGDIR=\"$(instconfigdir)\" \
 	-DMANUALDIR=\"$(manualdir)\" -DCGIURIBASE=\"$(cgiuri)\" \
-	-DMANUALSUBDIR=\"$(manualsubdir)\" -DINFODIR=\"$(gwinfodir)\"
+	-DMANUALSUBDIR=\"$(manualsubdir)\"
 
 # We need to make sure that libpthread is linked before libc on HP-UX.
 @HPUX_TRUE at AM_LDFLAGS = -lpthread
@@ -540,9 +537,9 @@
 dist_maninst_DATA = \
 	html/manual/a.gif html/manual/add.htm html/manual/attribua.gif html/manual/attribut.htm html/manual/auth.htm \
 	html/manual/contents.html html/manual/intro.htm html/manual/mod.htm html/manual/n.gif \
-	html/manual/objclass.htm html/manual/search.htm html/manual/t.gif html/manual/y.gif html/manual/index.map
+	html/manual/objclass.htm html/manual/search.htm html/manual/t.gif html/manual/y.gif html/manual/index.map \
+	html/info/infonav.html
 
-dist_gwinfo_DATA = html/info/infonav.html
 nodist_context_DATA = dsgw-httpd.conf
 nodist_sbin_SCRIPTS = setup-ds-dsgw
 
@@ -592,6 +589,7 @@
         -e 's, at contextdir\@,$(contextdir),g' \
         -e 's, at securitydir\@,$(securitydir),g' \
         -e 's, at instconfigdir\@,$(instconfigdir),g' \
+        -e 's, at cookiedir\@,$(cookiedir),g' \
 	-e 's, at perlpath\@,$(perlpath),g' \
 	-e 's, at perlexec\@, at perlexec@,g' \
 	-e 's, at manualdir\@,$(manualdir),g' \
@@ -603,7 +601,8 @@
         -e 's, at PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
         -e 's, at brand\@,$(brand),g' \
         -e 's, at capbrand\@,$(capbrand),g' \
-        -e 's, at vendor\@,$(vendor),g'
+        -e 's, at vendor\@,$(vendor),g' \
+		-e "s, at progname\@,$$progname,g"
 
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -888,23 +887,6 @@
 	  echo " rm -f '$(DESTDIR)$(configdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(configdir)/$$f"; \
 	done
-install-dist_gwinfoDATA: $(dist_gwinfo_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(gwinfodir)" || $(mkdir_p) "$(DESTDIR)$(gwinfodir)"
-	@list='$(dist_gwinfo_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_gwinfoDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gwinfodir)/$$f'"; \
-	  $(dist_gwinfoDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gwinfodir)/$$f"; \
-	done
-
-uninstall-dist_gwinfoDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_gwinfo_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(gwinfodir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(gwinfodir)/$$f"; \
-	done
 install-dist_htmlDATA: $(dist_html_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
@@ -1204,7 +1186,7 @@
 check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) config.h
 installdirs:
-	for dir in "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(gwinfodir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(maninstdir)" "$(DESTDIR)$(orghtmldir)" "$(DESTDIR)$(pbconfigdir)" "$(DESTDIR)$(pbhtmldir)" "$(DESTDIR)$(contextdir)" "$(DESTDIR)$(propertydir)"; do \
+	for dir in "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(maninstdir)" "$(DESTDIR)$(orghtmldir)" "$(DESTDIR)$(pbconfigdir)" "$(DESTDIR)$(pbhtmldir)" "$(DESTDIR)$(contextdir)" "$(DESTDIR)$(propertydir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -1255,11 +1237,10 @@
 info-am:
 
 install-data-am: install-cgibinPROGRAMS install-cgibinSCRIPTS \
-	install-dist_configDATA install-dist_gwinfoDATA \
-	install-dist_htmlDATA install-dist_maninstDATA \
-	install-dist_orghtmlDATA install-dist_pbconfigDATA \
-	install-dist_pbhtmlDATA install-nodist_contextDATA \
-	install-nodist_propertyDATA
+	install-dist_configDATA install-dist_htmlDATA \
+	install-dist_maninstDATA install-dist_orghtmlDATA \
+	install-dist_pbconfigDATA install-dist_pbhtmlDATA \
+	install-nodist_contextDATA install-nodist_propertyDATA
 
 install-exec-am: install-nodist_sbinSCRIPTS
 
@@ -1290,12 +1271,11 @@
 ps-am:
 
 uninstall-am: uninstall-cgibinPROGRAMS uninstall-cgibinSCRIPTS \
-	uninstall-dist_configDATA uninstall-dist_gwinfoDATA \
-	uninstall-dist_htmlDATA uninstall-dist_maninstDATA \
-	uninstall-dist_orghtmlDATA uninstall-dist_pbconfigDATA \
-	uninstall-dist_pbhtmlDATA uninstall-info-am \
-	uninstall-nodist_contextDATA uninstall-nodist_propertyDATA \
-	uninstall-nodist_sbinSCRIPTS
+	uninstall-dist_configDATA uninstall-dist_htmlDATA \
+	uninstall-dist_maninstDATA uninstall-dist_orghtmlDATA \
+	uninstall-dist_pbconfigDATA uninstall-dist_pbhtmlDATA \
+	uninstall-info-am uninstall-nodist_contextDATA \
+	uninstall-nodist_propertyDATA uninstall-nodist_sbinSCRIPTS
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-cgibinPROGRAMS clean-generic clean-libtool \
@@ -1306,11 +1286,10 @@
 	distuninstallcheck dvi dvi-am html html-am info info-am \
 	install install-am install-cgibinPROGRAMS \
 	install-cgibinSCRIPTS install-data install-data-am \
-	install-dist_configDATA install-dist_gwinfoDATA \
-	install-dist_htmlDATA install-dist_maninstDATA \
-	install-dist_orghtmlDATA install-dist_pbconfigDATA \
-	install-dist_pbhtmlDATA install-exec install-exec-am \
-	install-info install-info-am install-man \
+	install-dist_configDATA install-dist_htmlDATA \
+	install-dist_maninstDATA install-dist_orghtmlDATA \
+	install-dist_pbconfigDATA install-dist_pbhtmlDATA install-exec \
+	install-exec-am install-info install-info-am install-man \
 	install-nodist_contextDATA install-nodist_propertyDATA \
 	install-nodist_sbinSCRIPTS install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
@@ -1318,11 +1297,11 @@
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-cgibinPROGRAMS \
 	uninstall-cgibinSCRIPTS uninstall-dist_configDATA \
-	uninstall-dist_gwinfoDATA uninstall-dist_htmlDATA \
-	uninstall-dist_maninstDATA uninstall-dist_orghtmlDATA \
-	uninstall-dist_pbconfigDATA uninstall-dist_pbhtmlDATA \
-	uninstall-info-am uninstall-nodist_contextDATA \
-	uninstall-nodist_propertyDATA uninstall-nodist_sbinSCRIPTS
+	uninstall-dist_htmlDATA uninstall-dist_maninstDATA \
+	uninstall-dist_orghtmlDATA uninstall-dist_pbconfigDATA \
+	uninstall-dist_pbhtmlDATA uninstall-info-am \
+	uninstall-nodist_contextDATA uninstall-nodist_propertyDATA \
+	uninstall-nodist_sbinSCRIPTS
 
 
 # By default create only the default root bundle (english).
@@ -1349,7 +1328,7 @@
 
 @DEBUG_TRUE@$(DBGSCRIPTS) : cgidbgwrapper.sh.in
 @DEBUG_TRUE@	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
- at DEBUG_TRUE@	$(fixupcmd) $< > $@
+ at DEBUG_TRUE@	progname=`basename $@ .sh` ; $(fixupcmd) $< > $@
 
 % : %.in
 	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi











From fedora-directory-commits at redhat.com  Thu Mar  6 22:00:42 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu,  6 Mar 2008 17:00:42 -0500
Subject: [Fedora-directory-commits] dsgw/pbhtml alert.html.in, 1.1,
	1.2 carded.html.in, 1.1, 1.2 confirm.html.in, 1.1,
	1.2 emptyFrame.html, 1.1.1.1, 1.2 index.html.in, 1.1,
	1.2 intro.html.in, 1.1, 1.2 modify.html.in, 1.1,
	1.2 nonemp.html, 1.1.1.1, 1.2 nullStringError.html.in, 1.1,
	1.2 phone.html.in, 1.1, 1.2 report.html.in, 1.1, 1.2
Message-ID: <200803062200.m26M0g7f017695@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	alert.html.in carded.html.in confirm.html.in emptyFrame.html 
	index.html.in intro.html.in modify.html.in nonemp.html 
	nullStringError.html.in phone.html.in report.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 &amp; 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: alert.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbhtml/alert.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alert.html.in	14 Jan 2008 22:31:24 -0000	1.1
+++ alert.html.in	6 Mar 2008 22:00:40 -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,18 +34,20 @@
  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>
 <TITLE>
 <!-- DS_POSTEDVALUE "NAME=TITLE" -->
 </title>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 </HEAD>
 
 <BODY onLoad="document.OK.btn.focus();" bgcolor="#CCCCCC">
 <TABLE cols=2 width="100%"><TR VALIGN=CENTER>
-<TD ALIGN=CENTER WIDTH=32><IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=32-alert.gif" HEIGHT=32 WIDTH=32 BORDER="0" ALT="Alert"></TD>
+<TD ALIGN=CENTER WIDTH=32><IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=32-alert.gif" HEIGHT=32 WIDTH=32 BORDER="0" ALT="Alert"></TD>
 <TD>
 <!-- DS_POSTEDVALUE "NAME=MSG" -->
 </TD></TR></TABLE>


Index: carded.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbhtml/carded.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- carded.html.in	14 Jan 2008 22:31:24 -0000	1.1
+++ carded.html.in	6 Mar 2008 22:00:40 -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,14 +34,16 @@
  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>
   <title>vCard</title>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
   </head>
 
-<script language=javascript>
+<script type="text/javascript">
 
 function autoCloser(){
 


Index: confirm.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbhtml/confirm.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- confirm.html.in	14 Jan 2008 22:31:24 -0000	1.1
+++ confirm.html.in	6 Mar 2008 22:00:40 -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,19 +34,21 @@
  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>
 <TITLE>
 <!-- DS_POSTEDVALUE "NAME=TITLE" -->
 </TITLE>
 <!-- DS_CONFIRM_SCRIPT -->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 </HEAD>
 
 <BODY>
 <TABLE COLS=2 WIDTH="100%"><TR VALIGN=CENTER>
-<TD ALIGN=CENTER WIDTH=36><IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=32-alert.gif" HEIGHT=32 WIDTH=32 BORDER="0" ALT="Confirm"></TD><TD>
+<TD ALIGN=CENTER WIDTH=36><IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=32-alert.gif" HEIGHT=32 WIDTH=32 BORDER="0" ALT="Confirm"></TD><TD>
 <!-- DS_POSTEDVALUE "NAME=MSG" -->
 </TD></TR></TABLE>
 <FORM><TABLE COLS=4 WIDTH="100%"><TR ALIGN=CENTER>


Index: emptyFrame.html
===================================================================
RCS file: /cvs/dirsec/dsgw/pbhtml/emptyFrame.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- emptyFrame.html	1 Jun 2006 19:43:47 -0000	1.1.1.1
+++ emptyFrame.html	6 Mar 2008 22:00:40 -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,5 +34,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 -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML><BODY BGCOLOR="white"></BODY></HTML>


Index: index.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbhtml/index.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.html.in	14 Jan 2008 22:31:24 -0000	1.1
+++ index.html.in	6 Mar 2008 22:00:40 -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 Frameset//EN"
+    "http://www.w3.org/TR/html4/frameset.dtd">
 <html>
 <head>
 <meta name="description" content="Directory Express: 
@@ -46,23 +48,23 @@
 
 <frameset rows="64,*" frameborder="no" border="0" framespacing="0">
     <frame 
-      src="@cgiuri@/lang?<!-- GCONTEXT -->&file=phone.html" 
+      src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=phone.html" 
       name="buttonBarFrame" 
       marginwidth="0" 
       marginheight="0" 
       scrolling="no"
     >
     <frame 
-      src="@cgiuri@/lang?<!-- GCONTEXT -->&file=intro.html"
+      src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=intro.html"
       name="resultframe" 
       marginwidth="10" 
       marginheight="10" 
       scrolling="auto"
     >
 </frameset>
-<noframe>
+<noframes>
 <body>
 
 </body>
-</noframe>	
+</noframes>	
 </html>


Index: intro.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbhtml/intro.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- intro.html.in	14 Jan 2008 22:31:24 -0000	1.1
+++ intro.html.in	6 Mar 2008 22:00:40 -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,17 +34,19 @@
  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>
 <title>Directory Express</title>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 </head>
 
 <body bgcolor="#FFFFFF">
 
 <!-- single-pixel gif to enforce left alignment -->
-<img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=pixel.gif" height="0" width="0" hspace="20" align="left" border="0">
+<img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=pixel.gif" height="0" width="0" hspace="20" align="left" border="0">
 
 <table border="0" cellpadding="0" cellspacing="0" width="90%" align="left">
   <tr>
@@ -72,7 +74,7 @@
 <br clear="ALL">
 
 <!-- single-pixel gif to enforce left alignment -->
-<img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=pixel.gif" height="0" width="0" hspace="20" align="left" border="0">
+<img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=pixel.gif" height="0" width="0" hspace="20" align="left" border="0">
 
 
 <table width="90%" border="0" cellpadding="0" cellspacing="0" bgcolor="#CCCCCC" align="left">
@@ -84,7 +86,7 @@
   </tr>
   <tr>
     <td>
-<!-- ------------------------------------------------------------- -->
+<!-- ############################################################# -->
 <table border="0" cellpadding="1" cellspacing="0" width="100%" bgcolor="white">
   <tr align="left" class="bgColor4">
     <td class="bgColor4">
@@ -108,7 +110,7 @@
   </tr>
   <tr align="left">
     <td width="10">
-      <a href="javascript:void(0)" onMouseOver="top.status='This entry is a person.'; return true" name="Person"><img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=16-person.gif" height="16" width="16" vspace="3" border="0"></a>
+      <a href="javascript:void(0)" onMouseOver="top.status='This entry is a person.'; return true" name="Person"><img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=16-person.gif" height="16" width="16" vspace="3" border="0"></a>
     </td>
     <td nowrap>
         Jane Castle
@@ -131,7 +133,7 @@
   </tr>
   <tr align="left" bgcolor="#FFFFFF">
     <td width="10">
-      <a href="javascript:void(0)" onMouseOver="top.status='This entry is a person.'; return true" name="Person"><img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=16-person.gif" height="16" width="16" vspace="3" border="0"></a>
+      <a href="javascript:void(0)" onMouseOver="top.status='This entry is a person.'; return true" name="Person2"><img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=16-person.gif" height="16" width="16" vspace="3" border="0"></a>
     </td>
     <td nowrap>
         John Castle
@@ -154,7 +156,7 @@
   </tr>
   <tr align="left" bgcolor="#FFFFFF">
     <td width="10">
-      <a href="javascript:void(0)" onMouseOver="top.status='This entry is a conference room.'; return true" name="Conference Room"><img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=16-conference.gif" height="16" width="16" vspace="3" border="0"></a>
+      <a href="javascript:void(0)" onMouseOver="top.status='This entry is a conference room.'; return true" name="Conference_Room"><img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=16-conference.gif" height="16" width="16" vspace="3" border="0"></a>
     </td>
     <td nowrap>
         King's Castle
@@ -176,7 +178,7 @@
     <td colspan="6"></td>
   </tr>  <tr align="left" bgcolor="#FFFFFF">
     <td width="10">
-      <a href="javascript:void(0)" onMouseOver="top.status='This entry is a person.'; return true" name="Person"><img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=16-person.gif" height="16" width="16" vspace="3" border="0"></a>
+      <a href="javascript:void(0)" onMouseOver="top.status='This entry is a person.'; return true" name="Person3"><img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=16-person.gif" height="16" width="16" vspace="3" border="0"></a>
     </td>
     <td nowrap>
         Quincy Castlegate
@@ -198,7 +200,7 @@
     <td colspan="6"></td>
   </tr>
 </table>
-<!-- ------------------------------------------------------------- -->
+<!-- ############################################################# -->
     </td>
   </tr>
   <tr align="left" bgcolor="#FFFFFF">
@@ -212,7 +214,7 @@
 <br clear="ALL">
 
 <!-- single-pixel gif to enforce left alignment -->
-<img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=pixel.gif" height="0" width="0" hspace="20" align="left" border="0">
+<img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=pixel.gif" height="0" width="0" hspace="20" align="left" border="0">
 
 <table border="0" cellpadding="0" cellspacing="0" width="90%" align="left">
   <tr>


Index: modify.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbhtml/modify.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- modify.html.in	14 Jan 2008 22:31:24 -0000	1.1
+++ modify.html.in	6 Mar 2008 22:00:40 -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,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 -->
 <!--
  | $Id$
  |
@@ -48,6 +48,8 @@
  |   
  +-------------------------------------------------------------------------- -->
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <HEAD>
 <TITLE>
@@ -100,7 +102,7 @@
 
 <HR>
 <TABLE><TR><TD>
-<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=person.gif" ALT="Person" HSPACE=5>
+<IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=person.gif" ALT="Person" HSPACE=5>
 </TD><TD><FONT SIZE="+2">
 Your Name Here</FONT></TD>
 <TD VALIGN=BOTTOM></TD>
@@ -163,7 +165,7 @@
 <TD VALIGN="TOP" NOWRAP>Legal Name:</TD>
 <TD VALIGN="top"><B>Employees: 
 <A HREF=/clients/dsgw/pbhtml/emptyFrame.html onClick="alert('Note: Please use the HR form to update your Legal Name ONLY.')"> PeopleSoft
-Form</A><BR>Vendors, Services, and Other Contractors: <A href="@cgiuri@/lang?<!-- GCONTEXT -->&file=nonemp.html">Special Email
+Form</A><BR>Vendors, Services, and Other Contractors: <A href="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=nonemp.html">Special Email
 </A>
 </B></TD>
 </TR>
@@ -223,15 +225,15 @@
 
 <TR>
 <TD VALIGN="TOP">Business Category:</TD>
-<TD VALIGN="TOP"><B>Employees:<A HREF=/clients/dsgw/pbhtml/emptyFrame.html>PeopleSoft Form</A><BR>Vendors, Services, and Other Contractors: <A href="@cgiuri@/lang?<!-- GCONTEXT -->&file=nonemp.html">Special Email</A></B></TD>
+<TD VALIGN="TOP"><B>Employees:<A HREF=/clients/dsgw/pbhtml/emptyFrame.html>PeopleSoft Form</A><BR>Vendors, Services, and Other Contractors: <A href="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=nonemp.html">Special Email</A></B></TD>
 <TD VALIGN="TOP">Title:</TD>
-<TD VALIGN="TOP"><B>Employees:<A HREF=/clients/dsgw/pbhtml/emptyFrame.html>PeopleSoft Form</A><BR>Vendors, Services, and Other Contractors: <A href="@cgiuri@/lang?<!-- GCONTEXT -->&file=nonemp.html">Special Email</A></B></TD></TR>
+<TD VALIGN="TOP"><B>Employees:<A HREF=/clients/dsgw/pbhtml/emptyFrame.html>PeopleSoft Form</A><BR>Vendors, Services, and Other Contractors: <A href="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=nonemp.html">Special Email</A></B></TD></TR>
 
 <TR>
 <TD VALIGN="TOP">Organizational Unit:</TD>
-<TD VALIGN="TOP"><B>Employees:<A HREF=/clients/dsgw/pbhtml/emptyFrame.html>PeopleSoft Form</A><BR>Vendors, Services, and Other Contractors <A href="@cgiuri@/lang?<!-- GCONTEXT -->&file=nonemp.html">Special Email</A></B></TD>
+<TD VALIGN="TOP"><B>Employees:<A HREF=/clients/dsgw/pbhtml/emptyFrame.html>PeopleSoft Form</A><BR>Vendors, Services, and Other Contractors <A href="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=nonemp.html">Special Email</A></B></TD>
 <TD VALIGN="TOP">Manager:</TD>
-<TD VALIGN="TOP"><B>Employees:<A HREF=/clients/dsgw/pbhtml/emptyFrame.html>PeopleSoft Form</A><BR><B>Vendors, Services, and Other Contractors: <A href="@cgiuri@/lang?<!-- GCONTEXT -->&file=nonemp.html">Special Email</A></B></TD></TR>
+<TD VALIGN="TOP"><B>Employees:<A HREF=/clients/dsgw/pbhtml/emptyFrame.html>PeopleSoft Form</A><BR><B>Vendors, Services, and Other Contractors: <A href="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=nonemp.html">Special Email</A></B></TD></TR>
 
 <TR>
 <TD VALIGN="TOP">Cube #:</TD>
@@ -242,9 +244,9 @@
 
 <TR>
 <TD VALIGN="TOP">Dept#:</TD>
-<TD VALIGN="TOP"><B>Employees:<A HREF=/clients/dsgw/pbhtml/emptyFrame.html>PeopleSoft Form</A><BR>Vendors, Services, and Other Contractors: <A href="@cgiuri@/lang?<!-- GCONTEXT -->&file=nonemp.html">Special Email</A></B></TD>
+<TD VALIGN="TOP"><B>Employees:<A HREF=/clients/dsgw/pbhtml/emptyFrame.html>PeopleSoft Form</A><BR>Vendors, Services, and Other Contractors: <A href="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=nonemp.html">Special Email</A></B></TD>
 <TD VALIGN="TOP" BGCOLOR=teal><FONT COLOR=lightyellow><B>Employee Status:</B></FONT></TD>
-<TD VALIGN="TOP"><B>Employees:<A HREF=/clients/dsgw/pbhtml/emptyFrame.html>PeopleSoft Form</A><BR>Vendors, Services, and Other Contractors: <A href="@cgiuri@/lang?<!-- GCONTEXT -->&nonemp.html">Special Email</A></B></TD></TR>
+<TD VALIGN="TOP"><B>Employees:<A HREF=/clients/dsgw/pbhtml/emptyFrame.html>PeopleSoft Form</A><BR>Vendors, Services, and Other Contractors: <A href="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=nonemp.html">Special Email</A></B></TD></TR>
 
 <TR>
 <TD VALIGN="TOP">Vehicle License#:</TD>


Index: nonemp.html
===================================================================
RCS file: /cvs/dirsec/dsgw/pbhtml/nonemp.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- nonemp.html	1 Jun 2006 19:43:48 -0000	1.1.1.1
+++ nonemp.html	6 Mar 2008 22:00:40 -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,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 -->
 <!--
  | $Id$
  |


Index: nullStringError.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbhtml/nullStringError.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nullStringError.html.in	14 Jan 2008 22:31:24 -0000	1.1
+++ nullStringError.html.in	6 Mar 2008 22:00:40 -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>
 <title>Error!</title>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 </head>
 <body bgcolor="white">
 
@@ -57,7 +59,7 @@
         <table border="0">
           <tr> 
             <td>
-              <img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=32-alert.gif" height="32" width="32" border="0">
+              <img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=32-alert.gif" height="32" width="32" border="0">
             </td>
             <td>
               &nbsp;


Index: phone.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbhtml/phone.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phone.html.in	14 Jan 2008 22:31:24 -0000	1.1
+++ phone.html.in	6 Mar 2008 22:00:40 -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>
 <meta http-equiv="content-type" content="text/html;charset=utf-8">
 <title>Directory Express</title>
 
-<script language="javascript">
+<script type="text/javascript">
 //<!--
 
 function gotourl(i){
@@ -49,12 +51,13 @@
 
 //-->
 </script>
-<script language="javascript" src="/clients/dsgw/pbhtml/phone.js">
+<script type="text/javascript" src="/clients/dsgw/pbhtml/phone.js">
 </script>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 </head>
 
-<body class="Search" onLoad="fieldFocus();" marginwidth="0" marginheight="0" leftmargin="0" topmargin="0">
+<body class="Search" onLoad="fieldFocus();" style="marginwidth: 0; marginheight: 0; leftmargin: 0; topmargin: 0">
+<!-- <body class="Search" onLoad="fieldFocus();" marginwidth="0" marginheight="0" leftmargin="0" topmargin="0"> -->
 
 <form method="post" name="searchform" target="resultframe" action="@cgiuri@/dosearch" onSubmit="return checkForNullString()"> 
 
@@ -67,26 +70,26 @@
 <table BORDER="0" width="100%" cellpadding=0 cellspacing=0>
 
 <TR>
-<TD valign="top" colspan="5" width="100%"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="1" height="5" border="0"></TD>
+<TD valign="top" colspan="5" width="100%"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif" width="1" height="5" border="0"></TD>
 </TR>
 
 <tr>
 <td>
-<IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="10" height="40" border="0">
+<IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif" width="10" height="40" border="0">
 </td>
-<TD ALIGN=LEFT VALIGN=CENTER nowrap>
-<img src="@cgiuri@/lang?<!-- GCONTEXT -->&file=rolodex.gif" width="51" height="54" border="0" align="left"></td>
-<TD valign="center" class="appName" nowrap>Directory Express</td>
-<TD ALIGN=LEFT width="75%">
+<TD align="left" valign="middle" nowrap>
+<img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=rolodex.gif" width="51" height="54" border="0" align="left"></td>
+<TD valign="middle" class="appName" nowrap>Directory Express</td>
+<TD align="left" width="75%">
 		<TABLE BORDER=0>
 		<TR>
-                <TD valign="top"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="15" height="1" border="0"></TD>
-                <TD nowrap VALIGN=CENTER ALIGN=CENTER>
+                <TD valign="top"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif" width="15" height="1" border="0"></TD>
+                <TD nowrap valign="middle" align="center">
 		<span class="apptext">Search for:</span>
 		</TD>
-		<TD nowrap VALIGN=CENTER>
+		<TD nowrap valign="middle">
 		<span class="apptext">
-			<font face=\"verdana, Arial, Helvetica, sans-serif\" style=\"font-size: 12px\">
+			<font face="verdana, Arial, Helvetica, sans-serif" style="font-size: 12px">
                         <input type="text" name="searchstring" size=30>
                         <input type="submit" value="Search" name="submitbutton">
 			</font>
@@ -99,11 +102,11 @@
 <!-- TR>
 <td></td>
 <td></td>
-<td align=left class="text30">(Enter any part of a name, user ID, or phone number)
+<td align="left" class="text30">(Enter any part of a name, user ID, or phone number)
 </td></tr -->
 
 <TR>
-<TD valign="top" colspan="5" width="100%"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif" width="1" height="5" border="0"></TD>
+<TD valign="top" colspan="5" width="100%"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif" width="1" height="5" border="0"></TD>
 </TR>
 
 </table>


Index: report.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbhtml/report.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- report.html.in	14 Jan 2008 22:31:24 -0000	1.1
+++ report.html.in	6 Mar 2008 22:00:40 -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,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 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <HTML>
 <HEAD>
@@ -45,7 +45,7 @@
 
 <CENTER><P><FORM method="GET" action="@cgiuri@/report.pl" TARGET="response"></P></CENTER>
 
-<CENTER><P><IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&pbrd.jpg" HEIGHT=46 WIDTH=491 ALIGN=ABSCENTER></P></CENTER>
+<CENTER><P><IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=pbrd.jpg" HEIGHT=46 WIDTH=491 ALIGN=ABSCENTER></P></CENTER>
 
 <CENTER><P><B><FONT SIZE=+1>Make a report that looks like this table:</FONT></B>
 </P></CENTER>



From fedora-directory-commits at redhat.com  Thu Mar  6 22:00:43 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu,  6 Mar 2008 17:00:43 -0500
Subject: [Fedora-directory-commits] dsgw/tests/edit testget.13,1.2,1.3
Message-ID: <200803062200.m26M0hZ5017710@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	testget.13 
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 &amp; 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: testget.13
===================================================================
RCS file: /cvs/dirsec/dsgw/tests/edit/testget.13,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- testget.13	27 Feb 2008 03:36:53 -0000	1.2
+++ testget.13	6 Mar 2008 22:00:40 -0000	1.3
@@ -1 +1 @@
-info=<SCRIPT language=JavaScript>You've just been p0wned!</SCRIPT>&dn=uid=newuser,ou=people,dc=example,dc=com&dnattr=uid&dndesc=u i d&add=1&tmplname=person
\ No newline at end of file
+info=<SCRIPT type="text/javascript">You've just been p0wned!</SCRIPT>&dn=uid=newuser,ou=people,dc=example,dc=com&dnattr=uid&dndesc=u i d&add=1&tmplname=person
\ No newline at end of file



From fedora-directory-commits at redhat.com  Thu Mar  6 22:00:16 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu,  6 Mar 2008 17:00:16 -0500
Subject: [Fedora-directory-commits] 
 dsgw/config/es authPassword.html, 1.1.1.1,
 1.2 authSearch.html, 1.1.1.1, 1.2 csearch.html.in, 1.2, 1.3 csearchAttr.html,
 1.1.1.1, 1.2 csearchBase.html, 1.1.1.1, 1.2 csearchString.html, 1.1.1.1,
 1.2 csearchType.html, 1.1.1.1, 1.2 display-country.html.in, 1.1,
 1.2 display-dnedit.html, 1.1.1.1, 1.2 display-dneditpeople.html, 1.1.1.1,
 1.2 display-group.html.in, 1.1, 1.2 display-groupun.html.in, 1.1,
 1.2 display-ntgroup.html.in, 1.1, 1.2 display-ntperson.html.in, 1.1,
 1.2 display-org.html.in, 1.1, 1.2 display-orgperson.html.in, 1.1,
 1.2 display-orgunit.html.in, 1.1, 1.2 display-person.html.in, 1.1,
 1.2 edit-passwd.html, 1.1.1.1, 1.2 list-Anything.html, 1.1.1.1,
 1.2 list-Auth.html, 1.1.1.1, 1.2 list-Groups.html, 1.1.1.1,
 1.2 list-NT-Groups.html, 1.1.1.1, 1.2 list-NT-People.html, 1.1.1.1,
 1.2 list-Org-Units.html, 1.1.1.1, 1.2 list-Organizations.html, 1.1.1.1,
 1.2 list-People.html, 1.1.1.1, 1.2 list-fa-Groups.html, 1.1.1.1,
 1.2 list-fa-People.html, 1.1.1.1, 1.2 list-urlsearch.html, 1.1.1.1,
 1.2 newentry.html.in, 1.2, 1.3 newentryName.!
 html, 1.1.1.1, 1.2 newentryType.html, 1.1.1.1, 1.2 search.html.in, 1.2,
 1.3 searchString.html, 1.1.1.1, 1.2
Message-ID: <200803062200.m26M0kSS017769@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	authPassword.html authSearch.html csearch.html.in 
	csearchAttr.html csearchBase.html csearchString.html 
	csearchType.html display-country.html.in display-dnedit.html 
	display-dneditpeople.html 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 edit-passwd.html list-Anything.html 
	list-Auth.html list-Groups.html list-NT-Groups.html 
	list-NT-People.html list-Org-Units.html 
	list-Organizations.html list-People.html list-fa-Groups.html 
	list-fa-People.html list-urlsearch.html newentry.html.in 
	newentryName.html newentryType.html search.html.in 
	searchString.html 
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 &amp; 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
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/authPassword.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- authPassword.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ authPassword.html	6 Mar 2008 22:00:14 -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 -->
 <!--authPassword.html-->


Index: authSearch.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/authSearch.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- authSearch.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ authSearch.html	6 Mar 2008 22:00:14 -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 -->
 <!--authSearch.html-->


Index: csearch.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/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:14 -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-->


Index: csearchAttr.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/csearchAttr.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- csearchAttr.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ csearchAttr.html	6 Mar 2008 22:00:14 -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 -->
 <!--csearchAttr.html-->


Index: csearchBase.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/csearchBase.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- csearchBase.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ csearchBase.html	6 Mar 2008 22:00:14 -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 -->
 <!--csearchBase.html-->


Index: csearchString.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/csearchString.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- csearchString.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ csearchString.html	6 Mar 2008 22:00:14 -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 -->
 <!--csearchString.html-->


Index: csearchType.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/csearchType.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- csearchType.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ csearchType.html	6 Mar 2008 22:00:14 -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 -->
 <!--csearchType.html-->


Index: display-country.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/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:18 -0000	1.1
+++ display-country.html.in	6 Mar 2008 22:00:14 -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" -->


Index: display-dnedit.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/display-dnedit.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- display-dnedit.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ display-dnedit.html	6 Mar 2008 22:00:14 -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_ENTRYBEGIN -->


Index: display-dneditpeople.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/display-dneditpeople.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- display-dneditpeople.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ display-dneditpeople.html	6 Mar 2008 22:00:14 -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_ENTRYBEGIN -->


Index: display-group.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/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:18 -0000	1.1
+++ display-group.html.in	6 Mar 2008 22:00:14 -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" -->


Index: display-groupun.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/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:18 -0000	1.1
+++ display-groupun.html.in	6 Mar 2008 22:00:14 -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" -->


Index: display-ntgroup.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/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:18 -0000	1.1
+++ display-ntgroup.html.in	6 Mar 2008 22:00:14 -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" -->


Index: display-ntperson.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/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:18 -0000	1.1
+++ display-ntperson.html.in	6 Mar 2008 22:00:14 -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()
 {


Index: display-org.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/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:18 -0000	1.1
+++ display-org.html.in	6 Mar 2008 22:00:14 -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" -->


Index: display-orgperson.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/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:18 -0000	1.1
+++ display-orgperson.html.in	6 Mar 2008 22:00:14 -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()
 {


Index: display-orgunit.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/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:18 -0000	1.1
+++ display-orgunit.html.in	6 Mar 2008 22:00:14 -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" -->


Index: display-person.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/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:18 -0000	1.1
+++ display-person.html.in	6 Mar 2008 22:00:14 -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()
 {


Index: edit-passwd.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/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:14 -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
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/list-Anything.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-Anything.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ list-Anything.html	6 Mar 2008 22:00:14 -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,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 -->
 <!-- TITLE "Buscar todo" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-Auth.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/list-Auth.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-Auth.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ list-Auth.html	6 Mar 2008 22:00:14 -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,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 -->
 <!-- TITLE "Autenticar..." -->
 
 <!--
@@ -52,7 +52,7 @@
 <!-- PCONTEXT -->
 </FORM>
 
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/javascript">
 <!-- Hide from non-JavaScript-capable browsers
 function authSubmit(encodeddn)
 {


Index: list-Groups.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/list-Groups.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-Groups.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ list-Groups.html	6 Mar 2008 22:00:14 -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,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 -->
 <!-- TITLE "B&uacute;squeda de grupos" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-NT-Groups.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/list-NT-Groups.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-NT-Groups.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ list-NT-Groups.html	6 Mar 2008 22:00:14 -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,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 -->
 <!-- TITLE "B&uacute;squeda de grupos NT" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-NT-People.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/list-NT-People.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-NT-People.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ list-NT-People.html	6 Mar 2008 22:00:14 -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,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 -->
 <!-- TITLE "B&uacute;squeda de personas NT" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-Org-Units.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/list-Org-Units.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-Org-Units.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ list-Org-Units.html	6 Mar 2008 22:00:14 -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,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 -->
 <!-- TITLE "Search for Organizational Units" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-Organizations.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/list-Organizations.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-Organizations.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ list-Organizations.html	6 Mar 2008 22:00:14 -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,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 -->
 <!-- TITLE "B&uacute;squeda de organizaciones" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-People.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/list-People.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-People.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ list-People.html	6 Mar 2008 22:00:14 -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,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 -->
 <!-- TITLE "B&uacute;squeda de personas" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-fa-Groups.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/list-fa-Groups.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-fa-Groups.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ list-fa-Groups.html	6 Mar 2008 22:00:14 -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,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 -->
 <!-- TITLE "Buscar personas" -->
 <!-- IF "FoundEntries" -->
 


Index: list-fa-People.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/list-fa-People.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-fa-People.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ list-fa-People.html	6 Mar 2008 22:00:14 -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,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 -->
 <!-- TITLE "Search for People" -->
 <!-- IF "FoundEntries" -->
 


Index: list-urlsearch.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/list-urlsearch.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-urlsearch.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ list-urlsearch.html	6 Mar 2008 22:00:14 -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,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 -->
 <!-- TITLE "B&uacute;squeda basada en URL" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: newentry.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/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:14 -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-->


Index: newentryName.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/newentryName.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- newentryName.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ newentryName.html	6 Mar 2008 22:00:14 -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 -->
 <!--newentryName.html-->


Index: newentryType.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/newentryType.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- newentryType.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ newentryType.html	6 Mar 2008 22:00:14 -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>
 <!--newentryType.html-->
 <!-- DS_NEWENTRY_TYPE_BODY -->


Index: search.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/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:14 -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 -->
 <!-- search.html -->


Index: searchString.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/searchString.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- searchString.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ searchString.html	6 Mar 2008 22:00:14 -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 -->
 <!-- searchString.html -->



From fedora-directory-commits at redhat.com  Thu Mar  6 22:00:17 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu,  6 Mar 2008 17:00:17 -0500
Subject: [Fedora-directory-commits] 
 dsgw/config/fr authPassword.html, 1.1.1.1,
 1.2 authSearch.html, 1.1.1.1, 1.2 csearch.html.in, 1.2, 1.3 csearchAttr.html,
 1.1.1.1, 1.2 csearchBase.html, 1.1.1.1, 1.2 csearchString.html, 1.1.1.1,
 1.2 csearchType.html, 1.1.1.1, 1.2 display-country.html.in, 1.1,
 1.2 display-dnedit.html, 1.1.1.1, 1.2 display-dneditpeople.html, 1.1.1.1,
 1.2 display-group.html.in, 1.1, 1.2 display-groupun.html.in, 1.1,
 1.2 display-mailgroup.html.in, 1.1, 1.2 display-ntgroup.html.in, 1.1,
 1.2 display-ntperson.html.in, 1.1, 1.2 display-org.html.in, 1.1,
 1.2 display-orgperson.html.in, 1.1, 1.2 display-orgunit.html.in, 1.1,
 1.2 display-person.html.in, 1.1, 1.2 display-umperson.html.in, 1.1,
 1.2 edit-passwd.html, 1.1.1.1, 1.2 list-Anything.html, 1.1.1.1,
 1.2 list-Auth.html, 1.1.1.1, 1.2 list-Groups.html, 1.1.1.1,
 1.2 list-NT-Groups.html, 1.1.1.1, 1.2 list-NT-People.html, 1.1.1.1,
 1.2 list-Org-Units.html, 1.1.1.1, 1.2 list-Organizations.html, 1.1.1.1,
 1.2 list-People.html, 1.1.1.1, 1.2 list-fa-Groups.html, 1.1.1.1,
 1.2 list-fa-People.html, 1.1.1.1, 1.2 lis!
 t-urlsearch.html, 1.1.1.1, 1.2 newentry.html.in, 1.2, 1.3 newentryName.html,
 1.1.1.1, 1.2 newentryType.html, 1.1.1.1, 1.2 search.html.in, 1.2,
 1.3 searchString.html, 1.1.1.1, 1.2
Message-ID: <200803062200.m26M0l1D017844@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	authPassword.html authSearch.html csearch.html.in 
	csearchAttr.html csearchBase.html csearchString.html 
	csearchType.html display-country.html.in display-dnedit.html 
	display-dneditpeople.html display-group.html.in 
	display-groupun.html.in display-mailgroup.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 
	display-umperson.html.in edit-passwd.html list-Anything.html 
	list-Auth.html list-Groups.html list-NT-Groups.html 
	list-NT-People.html list-Org-Units.html 
	list-Organizations.html list-People.html list-fa-Groups.html 
	list-fa-People.html list-urlsearch.html newentry.html.in 
	newentryName.html newentryType.html search.html.in 
	searchString.html 
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 &amp; 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
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/authPassword.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- authPassword.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ authPassword.html	6 Mar 2008 22:00:14 -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 -->
 <!--authPassword.html-->


Index: authSearch.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/authSearch.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- authSearch.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ authSearch.html	6 Mar 2008 22:00:14 -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 -->
 <!--authSearch.html-->


Index: csearch.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/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:12 -0000	1.2
+++ csearch.html.in	6 Mar 2008 22:00:14 -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-->


Index: csearchAttr.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/csearchAttr.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- csearchAttr.html	1 Jun 2006 19:43:54 -0000	1.1.1.1
+++ csearchAttr.html	6 Mar 2008 22:00:14 -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 -->
 <!--csearchAttr.html-->


Index: csearchBase.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/csearchBase.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- csearchBase.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ csearchBase.html	6 Mar 2008 22:00:14 -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 -->
 <!--csearchBase.html-->


Index: csearchString.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/csearchString.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- csearchString.html	1 Jun 2006 19:43:54 -0000	1.1.1.1
+++ csearchString.html	6 Mar 2008 22:00:14 -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 -->
 <!--csearchString.html-->


Index: csearchType.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/csearchType.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- csearchType.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ csearchType.html	6 Mar 2008 22:00:14 -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 -->
 <!--csearchType.html-->


Index: display-country.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/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:18 -0000	1.1
+++ display-country.html.in	6 Mar 2008 22:00:14 -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" -->


Index: display-dnedit.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/display-dnedit.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- display-dnedit.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ display-dnedit.html	6 Mar 2008 22:00:14 -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_ENTRYBEGIN -->


Index: display-dneditpeople.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/display-dneditpeople.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- display-dneditpeople.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ display-dneditpeople.html	6 Mar 2008 22:00:14 -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_ENTRYBEGIN -->


Index: display-group.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/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:18 -0000	1.1
+++ display-group.html.in	6 Mar 2008 22:00:14 -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" -->


Index: display-groupun.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/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:18 -0000	1.1
+++ display-groupun.html.in	6 Mar 2008 22:00:14 -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" -->


Index: display-mailgroup.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/display-mailgroup.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- display-mailgroup.html.in	14 Jan 2008 22:31:18 -0000	1.1
+++ display-mailgroup.html.in	6 Mar 2008 22:00:14 -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=rfc822mailgroup" -->


Index: display-ntgroup.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/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:18 -0000	1.1
+++ display-ntgroup.html.in	6 Mar 2008 22:00:14 -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" -->


Index: display-ntperson.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/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:18 -0000	1.1
+++ display-ntperson.html.in	6 Mar 2008 22:00:14 -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()
 {


Index: display-org.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/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:18 -0000	1.1
+++ display-org.html.in	6 Mar 2008 22:00:14 -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" -->


Index: display-orgperson.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/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:18 -0000	1.1
+++ display-orgperson.html.in	6 Mar 2008 22:00:14 -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()
 {


Index: display-orgunit.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/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:18 -0000	1.1
+++ display-orgunit.html.in	6 Mar 2008 22:00:14 -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" -->


Index: display-person.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/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:18 -0000	1.1
+++ display-person.html.in	6 Mar 2008 22:00:14 -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()
 {


Index: display-umperson.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/display-umperson.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- display-umperson.html.in	14 Jan 2008 22:31:18 -0000	1.1
+++ display-umperson.html.in	6 Mar 2008 22:00:14 -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 -->
 <!-- U-M person directory entry -->


Index: edit-passwd.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/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:54 -0000	1.1.1.1
+++ edit-passwd.html	6 Mar 2008 22:00:14 -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
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/list-Anything.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-Anything.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ list-Anything.html	6 Mar 2008 22:00:14 -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,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 -->
 <!-- TITLE "Search for Anything" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-Auth.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/list-Auth.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-Auth.html	1 Jun 2006 19:43:54 -0000	1.1.1.1
+++ list-Auth.html	6 Mar 2008 22:00:14 -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,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 -->
 <!-- TITLE "Authenticate as..." -->
 
 <!--
@@ -52,7 +52,7 @@
 >
 </FORM>
 
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/javascript">
 <!-- Hide from non-JavaScript-capable browsers
 function authSubmit(encodeddn)
 {


Index: list-Groups.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/list-Groups.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-Groups.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ list-Groups.html	6 Mar 2008 22:00:14 -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,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 -->
 <!-- TITLE "Recherche des groupes" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-NT-Groups.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/list-NT-Groups.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-NT-Groups.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ list-NT-Groups.html	6 Mar 2008 22:00:14 -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,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 -->
 <!-- TITLE "Search for NT Groups" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-NT-People.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/list-NT-People.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-NT-People.html	1 Jun 2006 19:43:54 -0000	1.1.1.1
+++ list-NT-People.html	6 Mar 2008 22:00:14 -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,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 -->
 <!-- TITLE "Search for NT-People" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-Org-Units.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/list-Org-Units.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-Org-Units.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ list-Org-Units.html	6 Mar 2008 22:00:14 -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,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 -->
 <!-- TITLE "Recherche des unit&eacute;s organisationnelles" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-Organizations.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/list-Organizations.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-Organizations.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ list-Organizations.html	6 Mar 2008 22:00:14 -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,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 -->
 <!-- TITLE "Recherche des organisations" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-People.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/list-People.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-People.html	1 Jun 2006 19:43:54 -0000	1.1.1.1
+++ list-People.html	6 Mar 2008 22:00:14 -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,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 -->
 <!-- TITLE "Search for People" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-fa-Groups.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/list-fa-Groups.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-fa-Groups.html	1 Jun 2006 19:43:54 -0000	1.1.1.1
+++ list-fa-Groups.html	6 Mar 2008 22:00:14 -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,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 -->
 <!-- TITLE "Recherche de personnes" -->
 <!-- IF "FoundEntries" -->
 


Index: list-fa-People.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/list-fa-People.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-fa-People.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ list-fa-People.html	6 Mar 2008 22:00:14 -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,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 -->
 <!-- TITLE "Recherche de personnes" -->
 <!-- IF "FoundEntries" -->
 


Index: list-urlsearch.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/list-urlsearch.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-urlsearch.html	1 Jun 2006 19:43:54 -0000	1.1.1.1
+++ list-urlsearch.html	6 Mar 2008 22:00:14 -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,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 -->
 <!-- TITLE "Recherche ?? base d'URL" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: newentry.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/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:12 -0000	1.2
+++ newentry.html.in	6 Mar 2008 22:00:14 -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-->


Index: newentryName.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/newentryName.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- newentryName.html	1 Jun 2006 19:43:54 -0000	1.1.1.1
+++ newentryName.html	6 Mar 2008 22:00:14 -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 -->
 <!--newentryName.html-->


Index: newentryType.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/newentryType.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- newentryType.html	1 Jun 2006 19:43:54 -0000	1.1.1.1
+++ newentryType.html	6 Mar 2008 22:00:14 -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>
 <!--newentryType.html-->
 <!-- DS_NEWENTRY_TYPE_BODY -->


Index: search.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/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:12 -0000	1.2
+++ search.html.in	6 Mar 2008 22:00:14 -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 -->
 <!-- search.html -->


Index: searchString.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/searchString.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- searchString.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ searchString.html	6 Mar 2008 22:00:14 -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 -->
 <!-- searchString.html -->



From fedora-directory-commits at redhat.com  Thu Mar  6 22:00:16 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu,  6 Mar 2008 17:00:16 -0500
Subject: [Fedora-directory-commits] 
 dsgw/config/de authPassword.html, 1.1.1.1,
 1.2 authSearch.html, 1.1.1.1, 1.2 csearchAttr.html, 1.1.1.1,
 1.2 csearchBase.html, 1.1.1.1, 1.2 csearchString.html, 1.1.1.1,
 1.2 csearchType.html, 1.1.1.1, 1.2 display-country.html.in, 1.1,
 1.2 display-dnedit.html, 1.1.1.1, 1.2 display-dneditpeople.html, 1.1.1.1,
 1.2 display-group.html.in, 1.1, 1.2 display-groupun.html.in, 1.1,
 1.2 display-mailgroup.html.in, 1.1, 1.2 display-ntgroup.html.in, 1.1,
 1.2 display-ntperson.html.in, 1.1, 1.2 display-org.html.in, 1.1,
 1.2 display-orgperson.html.in, 1.1, 1.2 display-orgunit.html, 1.1.1.1,
 1.2 display-person.html.in, 1.1, 1.2 display-umperson.html.in, 1.1,
 1.2 edit-passwd.html, 1.1.1.1, 1.2 list-Anything.html, 1.1.1.1,
 1.2 list-Auth.html, 1.1.1.1, 1.2 list-Groups.html, 1.1.1.1,
 1.2 list-NT-Groups.html, 1.1.1.1, 1.2 list-NT-People.html, 1.1.1.1,
 1.2 list-Org-Units.html, 1.1.1.1, 1.2 list-Organizations.html, 1.1.1.1,
 1.2 list-People.html, 1.1.1.1, 1.2 list-fa-Groups.html, 1.1.1.1,
 1.2 list-fa-People.html, 1.1.1.1, 1.2 list-urlsearch.html, 1.1.1.!
 1, 1.2 newentry.html.in, 1.2, 1.3 newentryName.html, 1.1.1.1,
 1.2 newentryType.html, 1.1.1.1, 1.2 search.html.in, 1.2,
 1.3 searchString.html, 1.1.1.1, 1.2
Message-ID: <200803062200.m26M0k2q017767@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	authPassword.html authSearch.html csearchAttr.html 
	csearchBase.html csearchString.html csearchType.html 
	display-country.html.in display-dnedit.html 
	display-dneditpeople.html display-group.html.in 
	display-groupun.html.in display-mailgroup.html.in 
	display-ntgroup.html.in display-ntperson.html.in 
	display-org.html.in display-orgperson.html.in 
	display-orgunit.html display-person.html.in 
	display-umperson.html.in edit-passwd.html list-Anything.html 
	list-Auth.html list-Groups.html list-NT-Groups.html 
	list-NT-People.html list-Org-Units.html 
	list-Organizations.html list-People.html list-fa-Groups.html 
	list-fa-People.html list-urlsearch.html newentry.html.in 
	newentryName.html newentryType.html search.html.in 
	searchString.html 
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 &amp; 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
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/authPassword.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- authPassword.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ authPassword.html	6 Mar 2008 22:00:11 -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 -->
 <!--authPassword.html-->


Index: authSearch.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/authSearch.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- authSearch.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ authSearch.html	6 Mar 2008 22:00:11 -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 -->
 <!--authSearch.html-->


Index: csearchAttr.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/csearchAttr.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- csearchAttr.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ csearchAttr.html	6 Mar 2008 22:00:11 -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 -->
 <!--csearchAttr.html-->


Index: csearchBase.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/csearchBase.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- csearchBase.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ csearchBase.html	6 Mar 2008 22:00:11 -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 -->
 <!--csearchBase.html-->


Index: csearchString.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/csearchString.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- csearchString.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ csearchString.html	6 Mar 2008 22:00:11 -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 -->
 <!--csearchString.html-->


Index: csearchType.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/csearchType.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- csearchType.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ csearchType.html	6 Mar 2008 22:00:11 -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 -->
 <!--csearchType.html-->


Index: display-country.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/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:11 -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" -->


Index: display-dnedit.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/display-dnedit.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- display-dnedit.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ display-dnedit.html	6 Mar 2008 22:00:11 -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_ENTRYBEGIN -->


Index: display-dneditpeople.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/display-dneditpeople.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- display-dneditpeople.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ display-dneditpeople.html	6 Mar 2008 22:00:11 -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_ENTRYBEGIN -->


Index: display-group.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/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:11 -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" -->


Index: display-groupun.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/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:11 -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" -->


Index: display-mailgroup.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/display-mailgroup.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- display-mailgroup.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ display-mailgroup.html.in	6 Mar 2008 22:00:11 -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=rfc822mailgroup" -->


Index: display-ntgroup.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/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:11 -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" -->


Index: display-ntperson.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/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:11 -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()
 {


Index: display-org.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/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:11 -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" -->


Index: display-orgperson.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/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:11 -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()
 {


Index: display-orgunit.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/display-orgunit.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- display-orgunit.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ display-orgunit.html	6 Mar 2008 22:00:11 -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" -->


Index: display-person.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/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:11 -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()
 {


Index: display-umperson.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/display-umperson.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- display-umperson.html.in	14 Jan 2008 22:31:17 -0000	1.1
+++ display-umperson.html.in	6 Mar 2008 22:00:11 -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 -->
 <!-- U-M person directory entry -->


Index: edit-passwd.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/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:52 -0000	1.1.1.1
+++ edit-passwd.html	6 Mar 2008 22:00:11 -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
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/list-Anything.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-Anything.html	1 Jun 2006 19:43:51 -0000	1.1.1.1
+++ list-Anything.html	6 Mar 2008 22:00:11 -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,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 -->
 <!-- TITLE "Suche nach Beliebigem" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-Auth.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/list-Auth.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-Auth.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ list-Auth.html	6 Mar 2008 22:00:11 -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,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 -->
 <!-- TITLE "Authenticate as..." -->
 
 <!--
@@ -52,7 +52,7 @@
 >
 </FORM>
 
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/javascript">
 <!-- Hide from non-JavaScript-capable browsers
 function authSubmit(encodeddn)
 {


Index: list-Groups.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/list-Groups.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-Groups.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ list-Groups.html	6 Mar 2008 22:00:11 -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,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 -->
 <!-- TITLE "Suche nach Gruppen" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-NT-Groups.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/list-NT-Groups.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-NT-Groups.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ list-NT-Groups.html	6 Mar 2008 22:00:11 -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,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 -->
 <!-- TITLE "Search for NT Groups" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-NT-People.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/list-NT-People.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-NT-People.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ list-NT-People.html	6 Mar 2008 22:00:11 -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,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 -->
 <!-- TITLE "Search for NT-People" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-Org-Units.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/list-Org-Units.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-Org-Units.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ list-Org-Units.html	6 Mar 2008 22:00:11 -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,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 -->
 <!-- TITLE "Suche nach Gesch&auml;ftsbereichen" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-Organizations.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/list-Organizations.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-Organizations.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ list-Organizations.html	6 Mar 2008 22:00:11 -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,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 -->
 <!-- TITLE "Suche nach Firmen" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-People.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/list-People.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-People.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ list-People.html	6 Mar 2008 22:00:11 -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,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 -->
 <!-- TITLE "Search for People" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-fa-Groups.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/list-fa-Groups.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-fa-Groups.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ list-fa-Groups.html	6 Mar 2008 22:00:11 -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,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 -->
 <!-- TITLE "Suche nach Benutzern" -->
 <!-- IF "FoundEntries" -->
 


Index: list-fa-People.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/list-fa-People.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-fa-People.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ list-fa-People.html	6 Mar 2008 22:00:11 -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,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 -->
 <!-- TITLE "Suche nach Benutzern" -->
 <!-- IF "FoundEntries" -->
 


Index: list-urlsearch.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/list-urlsearch.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-urlsearch.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ list-urlsearch.html	6 Mar 2008 22:00:11 -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,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 -->
 <!-- TITLE "Suche nach URL" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: newentry.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/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:11 -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-->


Index: newentryName.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/newentryName.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- newentryName.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ newentryName.html	6 Mar 2008 22:00:11 -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 -->
 <!--newentryName.html-->


Index: newentryType.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/newentryType.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- newentryType.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ newentryType.html	6 Mar 2008 22:00:11 -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>
 <!--newentryType.html-->
 <!-- DS_NEWENTRY_TYPE_BODY -->


Index: search.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/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:11 -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 -->
 <!-- search.html -->


Index: searchString.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/searchString.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- searchString.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ searchString.html	6 Mar 2008 22:00:11 -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 -->
 <!-- searchString.html -->



From fedora-directory-commits at redhat.com  Thu Mar  6 22:00:19 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu,  6 Mar 2008 17:00:19 -0500
Subject: [Fedora-directory-commits] 
 dsgw/config/ja authPassword.html, 1.1.1.1,
 1.2 authSearch.html, 1.1.1.1, 1.2 csearch.html.in, 1.2, 1.3 csearchAttr.html,
 1.1.1.1, 1.2 csearchBase.html, 1.1.1.1, 1.2 csearchString.html, 1.1.1.1,
 1.2 csearchType.html, 1.1.1.1, 1.2 display-country.html.in, 1.1,
 1.2 display-dnedit.html, 1.1.1.1, 1.2 display-dneditpeople.html, 1.1.1.1,
 1.2 display-group.html.in, 1.1, 1.2 display-groupun.html.in, 1.1,
 1.2 display-mailgroup.html.in, 1.1, 1.2 display-ntgroup.html.in, 1.1,
 1.2 display-ntperson.html.in, 1.1, 1.2 display-org.html.in, 1.1,
 1.2 display-orgperson.html.in, 1.1, 1.2 display-orgunit.html.in, 1.1,
 1.2 display-person.html.in, 1.1, 1.2 display-umperson.html.in, 1.1,
 1.2 edit-passwd.html, 1.1.1.1, 1.2 list-Anything.html, 1.1.1.1,
 1.2 list-Auth.html, 1.1.1.1, 1.2 list-Groups.html, 1.1.1.1,
 1.2 list-NT-Groups.html, 1.1.1.1, 1.2 list-NT-People.html, 1.1.1.1,
 1.2 list-Org-Units.html, 1.1.1.1, 1.2 list-Organizations.html, 1.1.1.1,
 1.2 list-People.html, 1.1.1.1, 1.2 list-fa-Groups.html, 1.1.1.1,
 1.2 list-fa-People.html, 1.1.1.1, 1.2 lis!
 t-urlsearch.html, 1.1.1.1, 1.2 newentry.html.in, 1.2, 1.3 newentryName.html,
 1.1.1.1, 1.2 newentryType.html, 1.1.1.1, 1.2 search.html.in, 1.2,
 1.3 searchString.html, 1.1.1.1, 1.2
Message-ID: <200803062200.m26M0nbS017888@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	authPassword.html authSearch.html csearch.html.in 
	csearchAttr.html csearchBase.html csearchString.html 
	csearchType.html display-country.html.in display-dnedit.html 
	display-dneditpeople.html display-group.html.in 
	display-groupun.html.in display-mailgroup.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 
	display-umperson.html.in edit-passwd.html list-Anything.html 
	list-Auth.html list-Groups.html list-NT-Groups.html 
	list-NT-People.html list-Org-Units.html 
	list-Organizations.html list-People.html list-fa-Groups.html 
	list-fa-People.html list-urlsearch.html newentry.html.in 
	newentryName.html newentryType.html search.html.in 
	searchString.html 
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 &amp; 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
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/authPassword.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- authPassword.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ authPassword.html	6 Mar 2008 22:00:15 -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 -->
 <!--authPassword.html-->


Index: authSearch.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/authSearch.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- authSearch.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ authSearch.html	6 Mar 2008 22:00:15 -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 -->
 <!--authSearch.html-->


Index: csearch.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/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:12 -0000	1.2
+++ csearch.html.in	6 Mar 2008 22:00:15 -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-->


Index: csearchAttr.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/csearchAttr.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- csearchAttr.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ csearchAttr.html	6 Mar 2008 22:00:15 -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 -->
 <!--csearchAttr.html-->


Index: csearchBase.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/csearchBase.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- csearchBase.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ csearchBase.html	6 Mar 2008 22:00:15 -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 -->
 <!--csearchBase.html-->


Index: csearchString.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/csearchString.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- csearchString.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ csearchString.html	6 Mar 2008 22:00:15 -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 -->
 <!--csearchString.html-->


Index: csearchType.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/csearchType.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- csearchType.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ csearchType.html	6 Mar 2008 22:00:15 -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 -->
 <!--csearchType.html-->


Index: display-country.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/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:18 -0000	1.1
+++ display-country.html.in	6 Mar 2008 22:00:15 -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" -->


Index: display-dnedit.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/display-dnedit.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- display-dnedit.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ display-dnedit.html	6 Mar 2008 22:00:15 -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_ENTRYBEGIN -->


Index: display-dneditpeople.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/display-dneditpeople.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- display-dneditpeople.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ display-dneditpeople.html	6 Mar 2008 22:00:15 -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_ENTRYBEGIN -->


Index: display-group.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/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:18 -0000	1.1
+++ display-group.html.in	6 Mar 2008 22:00:15 -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" -->


Index: display-groupun.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/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:18 -0000	1.1
+++ display-groupun.html.in	6 Mar 2008 22:00:15 -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" -->


Index: display-mailgroup.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/display-mailgroup.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- display-mailgroup.html.in	14 Jan 2008 22:31:18 -0000	1.1
+++ display-mailgroup.html.in	6 Mar 2008 22:00:15 -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=rfc822mailgroup" -->


Index: display-ntgroup.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/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:18 -0000	1.1
+++ display-ntgroup.html.in	6 Mar 2008 22:00:15 -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" -->


Index: display-ntperson.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/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:18 -0000	1.1
+++ display-ntperson.html.in	6 Mar 2008 22:00:15 -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 -->
@@ -50,7 +52,7 @@
 </TITLE>
 <!-- Changed by: Ko-Haw Nieh, 27-Mar-1998 -->
 
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/javascript">
 <!-- Hide from non-JavaScript-capable browsers
 function showVCard()
 {


Index: display-org.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/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:18 -0000	1.1
+++ display-org.html.in	6 Mar 2008 22:00:15 -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" -->


Index: display-orgperson.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/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:18 -0000	1.1
+++ display-orgperson.html.in	6 Mar 2008 22:00:15 -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 -->
@@ -50,7 +52,7 @@
 </TITLE>
 <!-- Changed by: Ko-Haw Nieh, 17-Mar-1998 -->
 
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/javascript">
 <!-- Hide from non-JavaScript-capable browsers
 function showVCard()
 {


Index: display-orgunit.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/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:18 -0000	1.1
+++ display-orgunit.html.in	6 Mar 2008 22:00:15 -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" -->


Index: display-person.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/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:18 -0000	1.1
+++ display-person.html.in	6 Mar 2008 22:00:15 -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()
 {


Index: display-umperson.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/display-umperson.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- display-umperson.html.in	14 Jan 2008 22:31:18 -0000	1.1
+++ display-umperson.html.in	6 Mar 2008 22:00:15 -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 -->
 <!-- U-M person directory entry -->


Index: edit-passwd.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/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:53 -0000	1.1.1.1
+++ edit-passwd.html	6 Mar 2008 22:00:15 -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
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/list-Anything.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-Anything.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ list-Anything.html	6 Mar 2008 22:00:15 -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,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 -->
 <!-- TITLE "????????????" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-Auth.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/list-Auth.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-Auth.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ list-Auth.html	6 Mar 2008 22:00:15 -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,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 -->
 <!-- TITLE "Authenticate as..." -->
 
 <!--
@@ -52,7 +52,7 @@
 >
 </FORM>
 
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/javascript">
 <!-- Hide from non-JavaScript-capable browsers
 function authSubmit(encodeddn)
 {


Index: list-Groups.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/list-Groups.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-Groups.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ list-Groups.html	6 Mar 2008 22:00:15 -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,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 -->
 <!-- TITLE "?????????????????????" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-NT-Groups.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/list-NT-Groups.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-NT-Groups.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ list-NT-Groups.html	6 Mar 2008 22:00:15 -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,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 -->
 <!-- TITLE "Search for NT Groups" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-NT-People.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/list-NT-People.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-NT-People.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ list-NT-People.html	6 Mar 2008 22:00:15 -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,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 -->
 <!-- TITLE "Search for NT-People" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-Org-Units.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/list-Org-Units.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-Org-Units.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ list-Org-Units.html	6 Mar 2008 22:00:15 -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,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 -->
 <!-- TITLE "Search for Organizational Units" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-Organizations.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/list-Organizations.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-Organizations.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ list-Organizations.html	6 Mar 2008 22:00:15 -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,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 -->
 <!-- TITLE "Search for Organizations" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-People.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/list-People.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-People.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ list-People.html	6 Mar 2008 22:00:15 -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,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 -->
 <!-- TITLE "Search for People" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: list-fa-Groups.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/list-fa-Groups.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-fa-Groups.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ list-fa-Groups.html	6 Mar 2008 22:00:15 -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,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 -->
 <!-- TITLE "Search for People" -->
 <!-- IF "FoundEntries" -->
 


Index: list-fa-People.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/list-fa-People.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-fa-People.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ list-fa-People.html	6 Mar 2008 22:00:15 -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,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 -->
 <!-- TITLE "Search for People" -->
 <!-- IF "FoundEntries" -->
 


Index: list-urlsearch.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/list-urlsearch.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list-urlsearch.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ list-urlsearch.html	6 Mar 2008 22:00:15 -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,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 -->
 <!-- TITLE "URL?????????????????????" -->
 <CENTER><FONT SIZE=+1>
 <!-- DS_SEARCHDESC -->


Index: newentry.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/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:12 -0000	1.2
+++ newentry.html.in	6 Mar 2008 22:00:15 -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-->


Index: newentryName.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/newentryName.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- newentryName.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ newentryName.html	6 Mar 2008 22:00:15 -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 -->
 <!--newentryName.html-->


Index: newentryType.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/newentryType.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- newentryType.html	1 Jun 2006 19:43:53 -0000	1.1.1.1
+++ newentryType.html	6 Mar 2008 22:00:15 -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>
 <!--newentryType.html-->
 <!-- DS_NEWENTRY_TYPE_BODY -->


Index: search.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/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:12 -0000	1.2
+++ search.html.in	6 Mar 2008 22:00:15 -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 -->
 <!-- search.html -->


Index: searchString.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/searchString.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- searchString.html	1 Jun 2006 19:43:52 -0000	1.1.1.1
+++ searchString.html	6 Mar 2008 22:00:15 -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 -->
 <!-- searchString.html -->



From fedora-directory-commits at redhat.com  Thu Mar  6 22:00:24 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu,  6 Mar 2008 17:00:24 -0500
Subject: [Fedora-directory-commits] dsgw/html alert.html.in, 1.1,
	1.2 auth.html.in, 1.1, 1.2 authroot.html.in, 1.1,
	1.2 authtitle.html.in, 1.1, 1.2 confirm.html.in, 1.1,
	1.2 csearchtitle.html.in, 1.1, 1.2 eduser.html, 1.2,
	1.3 emptyFrame.html, 1.1.1.1, 1.2 greeting.html.in, 1.1,
	1.2 index.html.in, 1.1, 1.2 maintitle.html.in, 1.1,
	1.2 newentrytitle.html.in, 1.1, 1.2 searchtitle.html.in, 1.1, 1.2
Message-ID: <200803062200.m26M0s7r017937@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	alert.html.in auth.html.in authroot.html.in authtitle.html.in 
	confirm.html.in csearchtitle.html.in eduser.html 
	emptyFrame.html greeting.html.in index.html.in 
	maintitle.html.in newentrytitle.html.in searchtitle.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 &amp; 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: alert.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/alert.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alert.html.in	14 Jan 2008 22:31:20 -0000	1.1
+++ alert.html.in	6 Mar 2008 22:00:17 -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,18 +34,20 @@
  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>
 <TITLE>
 <!-- DS_POSTEDVALUE "NAME=TITLE" -->
 </title>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 </HEAD>
 
 <BODY onLoad="document.OK.btn.focus();" bgcolor="#CCCCCC">
 <TABLE cols=2 width="100%"><TR VALIGN=CENTER>
-<TD ALIGN=CENTER WIDTH=32><IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=alert.gif" HEIGHT=32 WIDTH=32 BORDER="0" ALT="Alert"></TD>
+<TD ALIGN=CENTER WIDTH=32><IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=alert.gif" HEIGHT=32 WIDTH=32 BORDER="0" ALT="Alert"></TD>
 <TD>
 <!-- DS_POSTEDVALUE "NAME=MSG" -->
 </TD></TR></TABLE>


Index: auth.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/auth.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- auth.html.in	14 Jan 2008 22:31:20 -0000	1.1
+++ auth.html.in	6 Mar 2008 22:00:17 -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 Frameset//EN"
+    "http://www.w3.org/TR/html4/frameset.dtd">
 <HTML>
 <HEAD>
 <TITLE>
@@ -43,7 +45,7 @@
 </HEAD>
 
 <FRAMESET ROWS=130,* BORDER=0>
-    <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=authtitle.html" NAME="authTitleFrame" NORESIZE
+    <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=authtitle.html" NAME="authTitleFrame" NORESIZE
 	    SCROLLING="NO">
     <FRAME SRC="@cgiuri@/auth?<!-- GCONTEXT -->" NAME="authFrame" SCROLLING="auto">
 </FRAMESET>


Index: authroot.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/authroot.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- authroot.html.in	14 Jan 2008 22:31:20 -0000	1.1
+++ authroot.html.in	6 Mar 2008 22:00:17 -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 Frameset//EN"
+    "http://www.w3.org/TR/html4/frameset.dtd">
 <HTML>
 <HEAD>
 <TITLE>
@@ -42,9 +44,9 @@
 </TITLE>
 </HEAD>
 <FRAMESET ROWS=130,* BORDER=0>
-    <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=authtitle.html" NAME="authTitleFrame" NORESIZE
+    <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=authtitle.html" NAME="authTitleFrame" NORESIZE
 	    SCROLLING="NO" MARGINHEIGHT=6 MARGINWIDTH=8>
-    <FRAME SRC="@cgiuri@/auth?MANAGER&<!-- GCONTEXT -->" NAME="authFrame" 
+    <FRAME SRC="@cgiuri@/auth?<!-- GCONTEXT -->" NAME="authFrame" 
 NORESIZE SCROLLING="auto" MARGINHEIGHT=8 MARGINWIDTH=8>
 </FRAMESET>
 <NOFRAMES>


Index: authtitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/authtitle.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- authtitle.html.in	14 Jan 2008 22:31:20 -0000	1.1
+++ authtitle.html.in	6 Mar 2008 22:00:17 -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>
 <TITLE>Directory Server</TITLE>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 </HEAD>
 
 <body bgcolor="#FFFFFF" marginwidth="0" marginheight="0" leftmargin="0" topmargin="0">
@@ -48,136 +50,136 @@
      <TD>
      <table class="bgColor1" border="0" cellpadding="0" cellspacing="0" width="100%">
        <tr>
-         <td colspan="4"><img border="0" height="10" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif">
+         <td colspan="4"><img border="0" height="10" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif">
          </td>
        </tr>
        <tr>
-         <td><img border="0" height="1" width="15" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-         <td><img border="0" height="54" width="51" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=rolodex.gif"></td>
-         <td><img border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="15" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+         <td><img border="0" height="54" width="51" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=rolodex.gif"></td>
+         <td><img border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td nowrap="true" align=left width="100%" class="appName">Directory Server Gateway</td>
        </tr>
        <tr>
-         <td colspan="4"><img border="0" height="12" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif">
+         <td colspan="4"><img border="0" height="12" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif">
          </td>
        </tr>
      </table>
      <table class="bgColor1" border="0" cellpadding="0" cellspacing="0" width="100%">
        <tr>
-         <td><img border="0" height="1" width="15" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="15" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td>
            <table class="bgRegTab" border="0" cellpadding="0" cellspacing="0">
              <tr>
-               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=left_off.gif"></td>
-               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=right_off.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_off.gif"></td>
+               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=right_off.gif"></td>
              </tr>
              <tr>
-               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
              <tr>
-               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/search?<!-- GCONTEXT -->" 
                TARGET="_top" onMouseOver="self.status='Standard Search'; return true;"
                onMouseOut="self.status=''; return true;"
                TITLE="Standard Search" ALT="Standard Search">Standard Search</a></td>
              </tr>
              <tr>
-               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
            </table>
          </td>
-         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td>
            <table class="bgRegTab" border="0" cellpadding="0" cellspacing="0">
              <tr>
-               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=left_off.gif"></td>
-               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=right_off.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_off.gif"></td>
+               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=right_off.gif"></td>
              </tr>
              <tr>
-               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
              <tr>
-               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/csearch?<!-- GCONTEXT -->" 
                TARGET="_top" onMouseOver="self.status='Advanced Search'; return true;"
                onMouseOut="self.status=''; return true;"
                TITLE="Advanced Search" ALT="Advanced Search">Advanced Search</a></td>
              </tr>
              <tr>
-               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
            </table>
          </td>
-         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td>
            <table class="bgRegTab" border="0" cellpadding="0" cellspacing="0">
              <tr>
-               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=left_off.gif"></td>
-               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=right_off.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_off.gif"></td>
+               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=right_off.gif"></td>
              </tr>
              <tr>
-               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
              <tr>
-               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/newentry?<!-- GCONTEXT -->" 
                 TARGET="_top" onMouseOver="self.status='New Entry'; return true;"
                 onMouseOut="self.status=''; return true;"
                 TITLE="New Entry" ALT="New Entry">New Entry</a></td>
              </tr>
              <tr>
-               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
            </table>
          </td>
-         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td>
            <table class="bgAtTab" border="0" cellpadding="0" cellspacing="0">
              <tr>
-               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=left_on.gif"></td>
-               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=right_on.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_on.gif"></td>
+               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=right_on.gif"></td>
              </tr>
              <tr>
-               <td class="bgAtTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgAtTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
              <tr>
-               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td nowrap="true"><A HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=auth.html" 
+               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td nowrap="true"><A HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=auth.html" 
                 TARGET="_top" onMouseOver="self.status='Authentication'; return true;" 
                 onMouseOut="self.status=''; return true;" TITLE="Authentication" 
                 ALT="Authentication" class="link7">Authentication</a></td>
              </tr>
              <tr>
-               <td><img border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=left_bottom.gif"></td>
-               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td><img border="0" height="1" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=right_bottom.gif"></td>
+               <td><img border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_bottom.gif"></td>
+               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td><img border="0" height="1" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=right_bottom.gif"></td>
              </tr>
            </table>
          </td>
 
-         <td width="100%"><img border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td width="100%"><img border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
        </TR>
        <TR>
-         <TD class="bgRegTab" colspan="7"><IMG border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></TD>
-         <TD class="bgAtTab"><IMG border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></TD>
-         <TD class="bgRegTab" colspan="1"><IMG border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></TD>
+         <TD class="bgRegTab" colspan="7"><IMG border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></TD>
+         <TD class="bgAtTab"><IMG border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></TD>
+         <TD class="bgRegTab" colspan="1"><IMG border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></TD>
        </TR>
      </TABLE>
      <TABLE class="bgAtTab" border="0" cellpadding="0" cellspacing="0" width="100%">
        <TR>
          <TD>
-           <IMG border="0" height="43" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif">
+           <IMG border="0" height="43" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif">
          </TD> 
        </TR>
        <TR>
-         <TD class="bgRegTab"><IMG border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></TD>
+         <TD class="bgRegTab"><IMG border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></TD>
        </TR>
        <TR>
-         <TD class="bgDarkRule"><IMG border="0" height="2" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></TD>
+         <TD class="bgDarkRule"><IMG border="0" height="2" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></TD>
        </TR>
      </TABLE>
    </TD>


Index: confirm.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/confirm.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- confirm.html.in	14 Jan 2008 22:31:20 -0000	1.1
+++ confirm.html.in	6 Mar 2008 22:00:17 -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,19 +34,21 @@
  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>
 <TITLE>
 <!-- DS_POSTEDVALUE "NAME=TITLE" -->
 </TITLE>
 <!-- DS_CONFIRM_SCRIPT -->
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 </HEAD>
 
 <BODY class="bgColor4">
 <TABLE COLS=2 WIDTH="100%"><TR VALIGN=CENTER>
-<TD ALIGN=CENTER WIDTH=36><IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=confirm.gif" HEIGHT=32 WIDTH=32 BORDER="0" ALT="Confirm"></TD><TD>
+<TD ALIGN=CENTER WIDTH=36><IMG SRC="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=confirm.gif" HEIGHT=32 WIDTH=32 BORDER="0" ALT="Confirm"></TD><TD>
 <!-- DS_POSTEDVALUE "NAME=MSG" -->
 </TD></TR></TABLE>
 <FORM><TABLE COLS=4 WIDTH="100%"><TR ALIGN=CENTER>


Index: csearchtitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/csearchtitle.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- csearchtitle.html.in	14 Jan 2008 22:31:20 -0000	1.1
+++ csearchtitle.html.in	6 Mar 2008 22:00:17 -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>
 <TITLE>Directory Server</TITLE>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 </HEAD>
 
 <body bgcolor="#FFFFFF" marginwidth="0" marginheight="0" leftmargin="0" topmargin="0">
@@ -48,136 +50,136 @@
      <TD>
      <table class="bgColor1" border="0" cellpadding="0" cellspacing="0" width="100%">
        <tr>
-         <td colspan="4"><img border="0" height="10" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif">
+         <td colspan="4"><img border="0" height="10" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif">
          </td>
        </tr>
        <tr>
-         <td><img border="0" height="1" width="15" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-         <td><img border="0" height="54" width="51" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=rolodex.gif"></td>
-         <td><img border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="15" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+         <td><img border="0" height="54" width="51" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=rolodex.gif"></td>
+         <td><img border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td nowrap="true" align=left width="100%" class="appName">Directory Server Gateway</td>
        </tr>
        <tr>
-         <td colspan="4"><img border="0" height="12" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif">
+         <td colspan="4"><img border="0" height="12" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif">
          </td>
        </tr>
      </table>
      <table class="bgColor1" border="0" cellpadding="0" cellspacing="0" width="100%">
        <tr>
-         <td><img border="0" height="1" width="15" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="15" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td>
            <table class="bgRegTab" border="0" cellpadding="0" cellspacing="0">
              <tr>
-               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=left_off.gif"></td>
-               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=right_off.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_off.gif"></td>
+               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=right_off.gif"></td>
              </tr>
              <tr>
-               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
              <tr>
-               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/search?<!-- GCONTEXT -->" 
                TARGET="_top" onMouseOver="self.status='Standard Search'; return true;"
                onMouseOut="self.status=''; return true;"
                TITLE="Standard Search" ALT="Standard Search">Standard Search</a></td>
              </tr>
              <tr>
-               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
            </table>
          </td>
-         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td>
            <table class="bgAtTab" border="0" cellpadding="0" cellspacing="0">
              <tr>
-               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=left_on.gif"></td>
-               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=right_on.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_on.gif"></td>
+               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=right_on.gif"></td>
              </tr>
              <tr>
-               <td class="bgAtTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgAtTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
              <tr>
-               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
                <td nowrap="true"><A HREF="@cgiuri@/csearch?<!-- GCONTEXT -->" 
                 TARGET="_top" onMouseOver="self.status='Advanced Search'; return true;" 
                 onMouseOut="self.status=''; return true;" TITLE="Advanced Search" 
                 ALT="Advanced Search" class="link7">Advanced Search</a></td>
              </tr>
              <tr>
-               <td><img border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=left_bottom.gif"></td>
-               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td><img border="0" height="1" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=right_bottom.gif"></td>
+               <td><img border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_bottom.gif"></td>
+               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td><img border="0" height="1" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=right_bottom.gif"></td>
              </tr>
            </table>
          </td>
-         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td>
            <table class="bgRegTab" border="0" cellpadding="0" cellspacing="0">
              <tr>
-               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=left_off.gif"></td>
-               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=right_off.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_off.gif"></td>
+               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=right_off.gif"></td>
              </tr>
              <tr>
-               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
              <tr>
-               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/newentry?<!-- GCONTEXT -->" 
                TARGET="_top" onMouseOver="self.status='New Entry'; return true;"
                onMouseOut="self.status=''; return true;"
                TITLE="New Entry" ALT="New Entry">New Entry</a></td>
              </tr>
              <tr>
-               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
            </table>
          </td>
-         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td>
            <table class="bgRegTab" border="0" cellpadding="0" cellspacing="0">
              <tr>
-               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=left_off.gif"></td>
-               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=right_off.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_off.gif"></td>
+               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=right_off.gif"></td>
              </tr>
              <tr>
-               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
              <tr>
-               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td nowrap="true"><a class="link6" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=auth.html" 
+               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td nowrap="true"><a class="link6" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=auth.html" 
                 TARGET="_top" onMouseOver="self.status='Authentication'; return true;"
                 onMouseOut="self.status=''; return true;"
                 TITLE="Authentication" ALT="Authentication">Authentication</a></td>
              </tr>
              <tr>
-               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
            </table>
          </td>
 
-         <td width="100%"><img border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td width="100%"><img border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
        </TR>
        <TR>
-         <TD class="bgRegTab" colspan="3"><IMG border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></TD>
-         <TD class="bgAtTab"><IMG border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></TD>
-         <TD class="bgRegTab" colspan="5"><IMG border="0" height="1" width="5" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></TD>
+         <TD class="bgRegTab" colspan="3"><IMG border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></TD>
+         <TD class="bgAtTab"><IMG border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></TD>
+         <TD class="bgRegTab" colspan="5"><IMG border="0" height="1" width="5" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></TD>
        </TR>
      </TABLE>
      <TABLE class="bgAtTab" border="0" cellpadding="0" cellspacing="0" width="100%">
        <TR>
          <TD>
-           <IMG border="0" height="43" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif">
+           <IMG border="0" height="43" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif">
          </TD> 
        </TR>
        <TR>
-         <TD class="bgRegTab"><IMG border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></TD>
+         <TD class="bgRegTab"><IMG border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></TD>
        </TR>
        <TR>
-         <TD class="bgDarkRule"><IMG border="0" height="2" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></TD>
+         <TD class="bgDarkRule"><IMG border="0" height="2" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></TD>
        </TR>
      </TABLE>
    </TD>


Index: eduser.html
===================================================================
RCS file: /cvs/dirsec/dsgw/html/eduser.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eduser.html	14 Jan 2008 22:58:30 -0000	1.2
+++ eduser.html	6 Mar 2008 22:00:17 -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,8 +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>User Management</TITLE></HEAD>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML><BODY bgcolor="#C0C0C0" link="#0000EE" vlink="#551A8B" alink="#FF0000">
 
 <center><table border=2 width=100%%>


Index: emptyFrame.html
===================================================================
RCS file: /cvs/dirsec/dsgw/html/emptyFrame.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- emptyFrame.html	1 Jun 2006 19:43:48 -0000	1.1.1.1
+++ emptyFrame.html	6 Mar 2008 22:00:17 -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,5 +34,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 -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML><BODY BGCOLOR="white"></BODY></HTML>


Index: greeting.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/greeting.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- greeting.html.in	14 Jan 2008 22:31:20 -0000	1.1
+++ greeting.html.in	6 Mar 2008 22:00:17 -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,18 +34,20 @@
  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>
 <TITLE>Directory Server</TITLE>
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/javascript">
 <!-- Hide from non-JavaScript browsers
 function gotoURL(h) {
     top.location.href = h;
 }
 // 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 -->&amp;file=style.css">
 </HEAD>
 
 <BODY>
@@ -54,7 +56,7 @@
 
 <TR> <TD COLSPAN=2>
 You are using the Directory Server Gateway.  This interface can be
-used to search for, modify, and create entries that are stored in the Fedora Directory Server.
+used to search for, modify, and create entries that are stored in the Directory Server.
 <P>
 You are currently viewing the Standard Search screen, which provides an
 easy and convenient way to search the directory.  Standard Search
@@ -102,7 +104,7 @@
  </TD> </TR>
 
  <TR> <TD ALIGN="center" class="bgColor9"> 
- <A HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=auth.html" TARGET="_top" class="link14">
+ <A HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=auth.html" TARGET="_top" class="link14">
  <B>Authenticate</B>
  </A></TD>
  


Index: index.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/index.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.html.in	14 Jan 2008 22:31:20 -0000	1.1
+++ index.html.in	6 Mar 2008 22:00:17 -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,15 +34,17 @@
  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>
 <TITLE>Directory Server Gateway</TITLE>
 </HEAD>
 <FRAMESET ROWS=130,* BORDER=0>
-    <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=maintitle.html" NAME="buttonBarFrame" NORESIZE
+    <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=maintitle.html" NAME="buttonBarFrame" NORESIZE
 	    SCROLLING="no">
-    <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=greeting.html" NAME="greetingFrame" 
+    <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=greeting.html" NAME="greetingFrame" 
    NORESIZE SCROLLING="auto">
 </FRAMESET>
 <NOFRAMES>


Index: maintitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/maintitle.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maintitle.html.in	14 Jan 2008 22:31:20 -0000	1.1
+++ maintitle.html.in	6 Mar 2008 22:00:17 -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>
 <TITLE>Directory Server</TITLE>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 </HEAD>
 
 <body bgcolor="#FFFFFF" marginwidth="0" marginheight="0" leftmargin="0" topmargin="0">
@@ -48,132 +50,132 @@
      <TD>
      <table class="bgColor1" border="0" cellpadding="0" cellspacing="0" width="100%">
        <tr>
-         <td colspan="4"><img border="0" height="10" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif">
+         <td colspan="4"><img border="0" height="10" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif">
          </td>
        </tr>
        <tr>
-         <td><img border="0" height="1" width="15" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-         <td><img border="0" height="54" width="51" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=rolodex.gif"></td>
-         <td><img border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="15" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+         <td><img border="0" height="54" width="51" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=rolodex.gif"></td>
+         <td><img border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td nowrap="true" align=left width="100%" class="appName">Directory Server Gateway</td>
        </tr>
        <tr>
-         <td colspan="4"><img border="0" height="12" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif">
+         <td colspan="4"><img border="0" height="12" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif">
          </td>
        </tr>
      </table>
      <table class="bgColor1" border="0" cellpadding="0" cellspacing="0" width="100%">
        <tr>
-         <td><img border="0" height="1" width="15" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="15" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td>
            <table class="bgRegTab" border="0" cellpadding="0" cellspacing="0">
              <tr>
-               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=left_off.gif"></td>
-               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=right_off.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_off.gif"></td>
+               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=right_off.gif"></td>
              </tr>
              <tr>
-               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
              <tr>
-               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/search?<!-- GCONTEXT -->" 
                TARGET="_top" onMouseOver="self.status='Standard Search'; return true;"
                onMouseOut="self.status=''; return true;"
                TITLE="Standard Search" ALT="Standard Search">Standard Search</a></td>
              </tr>
              <tr>
-               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
            </table>
          </td>
-         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td>
            <table class="bgRegTab" border="0" cellpadding="0" cellspacing="0">
              <tr>
-               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=left_off.gif"></td>
-               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=right_off.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_off.gif"></td>
+               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=right_off.gif"></td>
              </tr>
              <tr>
-               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
              <tr>
-               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/csearch?<!-- GCONTEXT -->" 
                TARGET="_top" onMouseOver="self.status='Advanced Search'; return true;"
                onMouseOut="self.status=''; return true;"
                TITLE="Advanced Search" ALT="Advanced Search">Advanced Search</a></td>
              </tr>
              <tr>
-               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
            </table>
          </td>
-         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td>
            <table class="bgRegTab" border="0" cellpadding="0" cellspacing="0">
              <tr>
-               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=left_off.gif"></td>
-               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=right_off.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_off.gif"></td>
+               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=right_off.gif"></td>
              </tr>
              <tr>
-               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
              <tr>
-               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/newentry?<!-- GCONTEXT -->" 
                TARGET="_top" onMouseOver="self.status='New Entry'; return true;"
                onMouseOut="self.status=''; return true;"
                TITLE="New Entry" ALT="New Entry">New Entry</a></td>
              </tr>
              <tr>
-               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
            </table>
          </td>
-         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td>
            <table class="bgRegTab" border="0" cellpadding="0" cellspacing="0">
              <tr>
-               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=left_off.gif"></td>
-               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=right_off.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_off.gif"></td>
+               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=right_off.gif"></td>
              </tr>
              <tr>
-               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
              <tr>
-               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td nowrap="true"><a class="link6" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=auth.html" 
+               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td nowrap="true"><a class="link6" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=auth.html" 
                 TARGET="_top" onMouseOver="self.status='Authentication'; return true;"
                 onMouseOut="self.status=''; return true;"
                 TITLE="Authentication" ALT="Authentication">Authentication</a></td>
              </tr>
              <tr>
-               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
            </table>
          </td>
 
-         <td width="100%"><img border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td width="100%"><img border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
        </TR>
        <TR>
-         <TD class="bgRegTab" colspan="9"><IMG border="0" height="1" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></TD>
+         <TD class="bgRegTab" colspan="9"><IMG border="0" height="1" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></TD>
        </TR>
      </TABLE>
      <TABLE class="bgAtTab" border="0" cellpadding="0" cellspacing="0" width="100%">
        <TR>
          <TD>
-           <IMG border="0" height="43" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif">
+           <IMG border="0" height="43" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif">
          </TD> 
        </TR>
        <TR>
-         <TD class="bgRegTab"><IMG border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></TD>
+         <TD class="bgRegTab"><IMG border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></TD>
        </TR>
        <TR>
-         <TD class="bgDarkRule"><IMG border="0" height="2" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></TD>
+         <TD class="bgDarkRule"><IMG border="0" height="2" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></TD>
        </TR>
      </TABLE>
    </TD>


Index: newentrytitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/newentrytitle.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- newentrytitle.html.in	14 Jan 2008 22:31:20 -0000	1.1
+++ newentrytitle.html.in	6 Mar 2008 22:00:17 -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>
 <TITLE>Directory Server</TITLE>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 </HEAD>
 
 <body bgcolor="#FFFFFF" marginwidth="0" marginheight="0" leftmargin="0" topmargin="0">
@@ -48,136 +50,136 @@
      <TD>
      <table class="bgColor1" border="0" cellpadding="0" cellspacing="0" width="100%">
        <tr>
-         <td colspan="4"><img border="0" height="10" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif">
+         <td colspan="4"><img border="0" height="10" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif">
          </td>
        </tr>
        <tr>
-         <td><img border="0" height="1" width="15" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-         <td><img border="0" height="54" width="51" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=rolodex.gif"></td>
-         <td><img border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="15" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+         <td><img border="0" height="54" width="51" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=rolodex.gif"></td>
+         <td><img border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td nowrap="true" align=left width="100%" class="appName">Directory Server Gateway</td>
        </tr>
        <tr>
-         <td colspan="4"><img border="0" height="12" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif">
+         <td colspan="4"><img border="0" height="12" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif">
          </td>
        </tr>
      </table>
      <table class="bgColor1" border="0" cellpadding="0" cellspacing="0" width="100%">
        <tr>
-         <td><img border="0" height="1" width="15" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="15" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td>
            <table class="bgRegTab" border="0" cellpadding="0" cellspacing="0">
              <tr>
-               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=left_off.gif"></td>
-               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=right_off.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_off.gif"></td>
+               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=right_off.gif"></td>
              </tr>
              <tr>
-               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
              <tr>
-               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/search?<!-- GCONTEXT -->" 
                TARGET="_top" onMouseOver="self.status='Standard Search'; return true;"
                onMouseOut="self.status=''; return true;"
                TITLE="Standard Search" ALT="Standard Search">Standard Search</a></td>
              </tr>
              <tr>
-               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
            </table>
          </td>
-         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td>
            <table class="bgRegTab" border="0" cellpadding="0" cellspacing="0">
              <tr>
-               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=left_off.gif"></td>
-               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=right_off.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_off.gif"></td>
+               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=right_off.gif"></td>
              </tr>
              <tr>
-               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
              <tr>
-               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/csearch?<!-- GCONTEXT -->" 
                TARGET="_top" onMouseOver="self.status='Advanced Search'; return true;"
                onMouseOut="self.status=''; return true;"
                TITLE="Advanced Search" ALT="Advanced Search">Advanced Search</a></td>
              </tr>
              <tr>
-               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
            </table>
          </td>
-         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td>
            <table class="bgAtTab" border="0" cellpadding="0" cellspacing="0">
              <tr>
-               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=left_on.gif"></td>
-               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=right_on.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_on.gif"></td>
+               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=right_on.gif"></td>
              </tr>
              <tr>
-               <td class="bgAtTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgAtTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
              <tr>
-               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
                <td nowrap="true"><A HREF="@cgiuri@/newentry?<!-- GCONTEXT -->" 
                 TARGET="_top" onMouseOver="self.status='New Entry'; return true;" 
                 onMouseOut="self.status=''; return true;" TITLE="New Entry" 
                 ALT="New Entry" class="link7">New Entry</a></td>
              </tr>
              <tr>
-               <td><img border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=left_bottom.gif"></td>
-               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td><img border="0" height="1" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=right_bottom.gif"></td>
+               <td><img border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_bottom.gif"></td>
+               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td><img border="0" height="1" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=right_bottom.gif"></td>
              </tr>
            </table>
          </td>
-         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td>
            <table class="bgRegTab" border="0" cellpadding="0" cellspacing="0">
              <tr>
-               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=left_off.gif"></td>
-               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=right_off.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_off.gif"></td>
+               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=right_off.gif"></td>
              </tr>
              <tr>
-               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
              <tr>
-               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td nowrap="true"><a class="link6" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=auth.html" 
+               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td nowrap="true"><a class="link6" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=auth.html" 
                 TARGET="_top" onMouseOver="self.status='Authentication'; return true;"
                 onMouseOut="self.status=''; return true;"
                 TITLE="Authentication" ALT="Authentication">Authentication</a></td>
              </tr>
              <tr>
-               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
            </table>
          </td>
 
-         <td width="100%"><img border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td width="100%"><img border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
        </TR>
        <TR>
-         <TD class="bgRegTab" colspan="5"><IMG border="0" height="1" width="5" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></TD>
-         <TD class="bgAtTab"><IMG border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></TD>
-         <TD class="bgRegTab" colspan="3"><IMG border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></TD>
+         <TD class="bgRegTab" colspan="5"><IMG border="0" height="1" width="5" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></TD>
+         <TD class="bgAtTab"><IMG border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></TD>
+         <TD class="bgRegTab" colspan="3"><IMG border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></TD>
        </TR>
      </TABLE>
      <TABLE class="bgAtTab" border="0" cellpadding="0" cellspacing="0" width="100%">
        <TR>
          <TD>
-           <IMG border="0" height="43" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif">
+           <IMG border="0" height="43" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif">
          </TD> 
        </TR>
        <TR>
-         <TD class="bgRegTab"><IMG border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></TD>
+         <TD class="bgRegTab"><IMG border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></TD>
        </TR>
        <TR>
-         <TD class="bgDarkRule"><IMG border="0" height="2" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></TD>
+         <TD class="bgDarkRule"><IMG border="0" height="2" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></TD>
        </TR>
      </TABLE>
    </TD>


Index: searchtitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/searchtitle.html.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- searchtitle.html.in	14 Jan 2008 22:31:20 -0000	1.1
+++ searchtitle.html.in	6 Mar 2008 22:00:17 -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>
 <TITLE>Directory Server</TITLE>
-<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=style.css">
+<LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 </HEAD>
 
 <body bgcolor="#FFFFFF" marginwidth="0" marginheight="0" leftmargin="0" topmargin="0">
@@ -48,136 +50,136 @@
      <TD>
      <table class="bgColor1" border="0" cellpadding="0" cellspacing="0" width="100%">
        <tr>
-         <td colspan="4"><img border="0" height="10" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif">
+         <td colspan="4"><img border="0" height="10" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif">
          </td>
        </tr>
        <tr>
-         <td><img border="0" height="1" width="15" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-         <td><img border="0" height="54" width="51" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=rolodex.gif"></td>
-         <td><img border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="15" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+         <td><img border="0" height="54" width="51" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=rolodex.gif"></td>
+         <td><img border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td nowrap="true" align=left width="100%" class="appName">Directory Server Gateway</td>
        </tr>
        <tr>
-         <td colspan="4"><img border="0" height="12" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif">
+         <td colspan="4"><img border="0" height="12" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif">
          </td>
        </tr>
      </table>
      <table class="bgColor1" border="0" cellpadding="0" cellspacing="0" width="100%">
        <tr>
-         <td><img border="0" height="1" width="15" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="15" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td>
            <table class="bgAtTab" border="0" cellpadding="0" cellspacing="0">
              <tr>
-               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=left_on.gif"></td>
-               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=right_on.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_on.gif"></td>
+               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=right_on.gif"></td>
              </tr>
              <tr>
-               <td class="bgAtTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgAtTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
              <tr>
-               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
                <td nowrap="true"><A HREF="@cgiuri@/search?<!-- GCONTEXT -->" 
                 TARGET="_top" onMouseOver="self.status='Standard Search'; return true;" 
                 onMouseOut="self.status=''; return true;" TITLE="Standard Search" 
                 ALT="Standard Search" class="link7">Standard Search</a></td>
              </tr>
              <tr>
-               <td><img border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=left_bottom.gif"></td>
-               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td><img border="0" height="1" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=right_bottom.gif"></td>
+               <td><img border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_bottom.gif"></td>
+               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td><img border="0" height="1" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=right_bottom.gif"></td>
              </tr>
            </table>
          </td>
-         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td>
            <table class="bgRegTab" border="0" cellpadding="0" cellspacing="0">
              <tr>
-               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=left_off.gif"></td>
-               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=right_off.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_off.gif"></td>
+               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=right_off.gif"></td>
              </tr>
              <tr>
-               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
              <tr>
-               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/csearch?<!-- GCONTEXT -->" 
                TARGET="_top" onMouseOver="self.status='Advanced Search'; return true;"
                onMouseOut="self.status=''; return true;"
                TITLE="Advanced Search" ALT="Advanced Search">Advanced Search</a></td>
              </tr>
              <tr>
-               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
            </table>
          </td>
-         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td>
            <table class="bgRegTab" border="0" cellpadding="0" cellspacing="0">
              <tr>
-               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=left_off.gif"></td>
-               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=right_off.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_off.gif"></td>
+               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=right_off.gif"></td>
              </tr>
              <tr>
-               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
              <tr>
-               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/newentry?<!-- GCONTEXT -->" 
                TARGET="_top" onMouseOver="self.status='New Entry'; return true;"
                onMouseOut="self.status=''; return true;"
                TITLE="New Entry" ALT="New Entry">New Entry</a></td>
              </tr>
              <tr>
-               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
            </table>
          </td>
-         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td><img border="0" height="1" width="3" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
          <td>
            <table class="bgRegTab" border="0" cellpadding="0" cellspacing="0">
              <tr>
-               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=left_off.gif"></td>
-               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=right_off.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_off.gif"></td>
+               <td colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td rowspan="3"><img border="0" height="23" width="9" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=right_off.gif"></td>
              </tr>
              <tr>
-               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgRegTabHighlight" colspan="2"><img border="0" height="1" width="2" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
              <tr>
-               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
-               <td nowrap="true"><a class="link6" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&file=auth.html" 
+               <td><img border="0" height="21" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
+               <td nowrap="true"><a class="link6" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=auth.html" 
                 TARGET="_top" onMouseOver="self.status='Authentication'; return true;"
                 onMouseOut="self.status=''; return true;"
                 TITLE="Authentication" ALT="Authentication">Authentication</a></td>
              </tr>
              <tr>
-               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+               <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
              </tr>
            </table>
          </td>
 
-         <td width="100%"><img border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></td>
+         <td width="100%"><img border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
        </TR>
        <TR>
-         <TD class="bgRegTab"><IMG border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></TD>
-         <TD class="bgAtTab"><IMG border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></TD>
-         <TD class="bgRegTab" colspan="7"><IMG border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></TD>
+         <TD class="bgRegTab"><IMG border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></TD>
+         <TD class="bgAtTab"><IMG border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></TD>
+         <TD class="bgRegTab" colspan="7"><IMG border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></TD>
        </TR>
      </TABLE>
      <TABLE class="bgAtTab" border="0" cellpadding="0" cellspacing="0" width="100%">
        <TR>
          <TD>
-           <IMG border="0" height="43" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif">
+           <IMG border="0" height="43" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif">
          </TD> 
        </TR>
        <TR>
-         <TD class="bgRegTab"><IMG border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></TD>
+         <TD class="bgRegTab"><IMG border="0" height="1" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></TD>
        </TR>
        <TR>
-         <TD class="bgDarkRule"><IMG border="0" height="2" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&file=clear.gif"></TD>
+         <TD class="bgDarkRule"><IMG border="0" height="2" width="1" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></TD>
        </TR>
      </TABLE>
    </TD>



From fedora-directory-commits at redhat.com  Thu Mar  6 22:00:26 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu,  6 Mar 2008 17:00:26 -0500
Subject: [Fedora-directory-commits] dsgw/html/de auth.html.in, 1.2,
	1.3 authroot.html.in, 1.2, 1.3 authtitle.html.in, 1.2,
	1.3 csearchtitle.html.in, 1.2, 1.3 eduser.html, 1.1.1.1,
	1.2 greeting.html.in, 1.2, 1.3 index.html.in, 1.2,
	1.3 maintitle.html.in, 1.2, 1.3 newentrytitle.html.in, 1.2,
	1.3 searchtitle.html.in, 1.2, 1.3
Message-ID: <200803062200.m26M0up7017959@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	auth.html.in authroot.html.in authtitle.html.in 
	csearchtitle.html.in eduser.html greeting.html.in 
	index.html.in maintitle.html.in newentrytitle.html.in 
	searchtitle.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 &amp; 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: auth.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/de/auth.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- auth.html.in	29 Feb 2008 20:38:12 -0000	1.2
+++ auth.html.in	6 Mar 2008 22:00:22 -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>
 <TITLE>


Index: authroot.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/de/authroot.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- authroot.html.in	29 Feb 2008 20:38:12 -0000	1.2
+++ authroot.html.in	6 Mar 2008 22:00:22 -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>
 <TITLE>


Index: authtitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/de/authtitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- authtitle.html.in	29 Feb 2008 20:38:12 -0000	1.2
+++ authtitle.html.in	6 Mar 2008 22:00:22 -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>
 <TITLE>Directory Server</TITLE>


Index: csearchtitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/de/csearchtitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- csearchtitle.html.in	29 Feb 2008 20:38:12 -0000	1.2
+++ csearchtitle.html.in	6 Mar 2008 22:00:22 -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>
 <TITLE>Directory Server</TITLE>


Index: eduser.html
===================================================================
RCS file: /cvs/dirsec/dsgw/html/de/eduser.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- eduser.html	1 Jun 2006 19:43:49 -0000	1.1.1.1
+++ eduser.html	6 Mar 2008 22:00:22 -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,8 +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>Benutzer-Management</TITLE></HEAD>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML><BODY bgcolor="#C0C0C0" link="#0000EE" vlink="#551A8B" alink="#FF0000">
 
 <center><table border=2 width=100%%>


Index: greeting.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/de/greeting.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- greeting.html.in	29 Feb 2008 20:38:12 -0000	1.2
+++ greeting.html.in	6 Mar 2008 22:00:22 -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,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>
 <TITLE>Directory Server</TITLE>
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/javascript">
 <!-- Hide from non-JavaScript browsers
 function gotoURL(h) {
     top.location.href = h;


Index: index.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/de/index.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.html.in	29 Feb 2008 20:38:12 -0000	1.2
+++ index.html.in	6 Mar 2008 22:00:22 -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>
 <TITLE>Directory Server Gateway</TITLE>


Index: maintitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/de/maintitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maintitle.html.in	29 Feb 2008 20:38:12 -0000	1.2
+++ maintitle.html.in	6 Mar 2008 22:00:22 -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>
 <TITLE>Directory Server</TITLE>


Index: newentrytitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/de/newentrytitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- newentrytitle.html.in	29 Feb 2008 20:38:12 -0000	1.2
+++ newentrytitle.html.in	6 Mar 2008 22:00:22 -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>
 <TITLE>Directory Server</TITLE>


Index: searchtitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/de/searchtitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- searchtitle.html.in	29 Feb 2008 20:38:12 -0000	1.2
+++ searchtitle.html.in	6 Mar 2008 22:00:22 -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>
 <TITLE>Directory Server</TITLE>



From fedora-directory-commits at redhat.com  Thu Mar  6 22:00:27 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu,  6 Mar 2008 17:00:27 -0500
Subject: [Fedora-directory-commits] dsgw/html/es auth.html.in, 1.2,
	1.3 authroot.html.in, 1.2, 1.3 authtitle.html.in, 1.2,
	1.3 csearchtitle.html.in, 1.2, 1.3 eduser.html, 1.1.1.1,
	1.2 greeting.html.in, 1.2, 1.3 index.html.in, 1.2,
	1.3 maintitle.html.in, 1.2, 1.3 newentrytitle.html.in, 1.2,
	1.3 searchtitle.html.in, 1.2, 1.3
Message-ID: <200803062200.m26M0vwu017974@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	auth.html.in authroot.html.in authtitle.html.in 
	csearchtitle.html.in eduser.html greeting.html.in 
	index.html.in maintitle.html.in newentrytitle.html.in 
	searchtitle.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 &amp; 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: auth.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/es/auth.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- auth.html.in	29 Feb 2008 20:38:12 -0000	1.2
+++ auth.html.in	6 Mar 2008 22:00:24 -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>
 <TITLE>


Index: authroot.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/es/authroot.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- authroot.html.in	29 Feb 2008 20:38:12 -0000	1.2
+++ authroot.html.in	6 Mar 2008 22:00:24 -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>
 <TITLE>


Index: authtitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/es/authtitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- authtitle.html.in	29 Feb 2008 20:38:12 -0000	1.2
+++ authtitle.html.in	6 Mar 2008 22:00:24 -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>
 <TITLE>Directory Server</TITLE>


Index: csearchtitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/es/csearchtitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- csearchtitle.html.in	29 Feb 2008 20:38:12 -0000	1.2
+++ csearchtitle.html.in	6 Mar 2008 22:00:24 -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>
 <TITLE>Directory Server</TITLE>


Index: eduser.html
===================================================================
RCS file: /cvs/dirsec/dsgw/html/es/eduser.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- eduser.html	1 Jun 2006 19:43:48 -0000	1.1.1.1
+++ eduser.html	6 Mar 2008 22:00:24 -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,8 +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>Administraci&oacute;n de usuarios</TITLE></HEAD>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML><BODY bgcolor="#C0C0C0" link="#0000EE" vlink="#551A8B" alink="#FF0000">
 
 <center><table border=2 width=100%>


Index: greeting.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/es/greeting.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- greeting.html.in	29 Feb 2008 20:38:12 -0000	1.2
+++ greeting.html.in	6 Mar 2008 22:00:24 -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,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>
 <TITLE>Directory Server</TITLE>
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/javascript">
 <!-- Hide from non-JavaScript browsers
 function gotoURL(h) {
     top.location.href = h;


Index: index.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/es/index.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.html.in	29 Feb 2008 20:38:12 -0000	1.2
+++ index.html.in	6 Mar 2008 22:00:24 -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>
 <TITLE>Pasarela de Directory Server</TITLE>


Index: maintitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/es/maintitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maintitle.html.in	29 Feb 2008 20:38:12 -0000	1.2
+++ maintitle.html.in	6 Mar 2008 22:00:24 -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>
 <TITLE>Directory Server</TITLE>


Index: newentrytitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/es/newentrytitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- newentrytitle.html.in	29 Feb 2008 20:38:12 -0000	1.2
+++ newentrytitle.html.in	6 Mar 2008 22:00:24 -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>
 <TITLE>Directory Server</TITLE>


Index: searchtitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/es/searchtitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- searchtitle.html.in	29 Feb 2008 20:38:12 -0000	1.2
+++ searchtitle.html.in	6 Mar 2008 22:00:24 -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>
 <TITLE>Directory Server</TITLE>



From fedora-directory-commits at redhat.com  Thu Mar  6 22:00:34 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu,  6 Mar 2008 17:00:34 -0500
Subject: [Fedora-directory-commits] dsgw/html/fr auth.html.in, 1.2,
	1.3 authroot.html.in, 1.2, 1.3 authtitle.html.in, 1.2,
	1.3 csearchtitle.html.in, 1.2, 1.3 eduser.html, 1.1.1.1,
	1.2 greeting.html.in, 1.2, 1.3 index.html.in, 1.2,
	1.3 maintitle.html.in, 1.2, 1.3 newentrytitle.html.in, 1.2,
	1.3 searchtitle.html.in, 1.2, 1.3
Message-ID: <200803062201.m26M16Al023969@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	auth.html.in authroot.html.in authtitle.html.in 
	csearchtitle.html.in eduser.html greeting.html.in 
	index.html.in maintitle.html.in newentrytitle.html.in 
	searchtitle.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 &amp; 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: auth.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/fr/auth.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- auth.html.in	29 Feb 2008 20:38:14 -0000	1.2
+++ auth.html.in	6 Mar 2008 22:00:26 -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>
 <TITLE>


Index: authroot.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/fr/authroot.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- authroot.html.in	29 Feb 2008 20:38:14 -0000	1.2
+++ authroot.html.in	6 Mar 2008 22:00:26 -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>
 <TITLE>


Index: authtitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/fr/authtitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- authtitle.html.in	29 Feb 2008 20:38:14 -0000	1.2
+++ authtitle.html.in	6 Mar 2008 22:00:26 -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>
 <TITLE>Directory Server</TITLE>


Index: csearchtitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/fr/csearchtitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- csearchtitle.html.in	29 Feb 2008 20:38:14 -0000	1.2
+++ csearchtitle.html.in	6 Mar 2008 22:00:26 -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>
 <TITLE>Directory Server</TITLE>


Index: eduser.html
===================================================================
RCS file: /cvs/dirsec/dsgw/html/fr/eduser.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- eduser.html	1 Jun 2006 19:43:50 -0000	1.1.1.1
+++ eduser.html	6 Mar 2008 22:00:26 -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,8 +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>Gestion des utilisateurs</TITLE></HEAD>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML><BODY bgcolor="#C0C0C0" link="#0000EE" vlink="#551A8B" alink="#FF0000">
 
 <center><table border=2 width=100%%>


Index: greeting.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/fr/greeting.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- greeting.html.in	29 Feb 2008 20:38:14 -0000	1.2
+++ greeting.html.in	6 Mar 2008 22:00:26 -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,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>
 <TITLE>Directory Server</TITLE>
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/javascript">
 <!-- Hide from non-JavaScript browsers
 function gotoURL(h) {
     top.location.href = h;


Index: index.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/fr/index.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.html.in	29 Feb 2008 20:38:14 -0000	1.2
+++ index.html.in	6 Mar 2008 22:00:26 -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>
 <TITLE>Passerelle Directory Server</TITLE>


Index: maintitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/fr/maintitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maintitle.html.in	29 Feb 2008 20:38:14 -0000	1.2
+++ maintitle.html.in	6 Mar 2008 22:00:26 -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>
 <TITLE>Directory Server</TITLE>


Index: newentrytitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/fr/newentrytitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- newentrytitle.html.in	29 Feb 2008 20:38:14 -0000	1.2
+++ newentrytitle.html.in	6 Mar 2008 22:00:26 -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>
 <TITLE>Directory Server</TITLE>


Index: searchtitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/fr/searchtitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- searchtitle.html.in	29 Feb 2008 20:38:14 -0000	1.2
+++ searchtitle.html.in	6 Mar 2008 22:00:26 -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>
 <TITLE>Directory Server</TITLE>



From fedora-directory-commits at redhat.com  Thu Mar  6 22:00:38 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu,  6 Mar 2008 17:00:38 -0500
Subject: [Fedora-directory-commits] dsgw/html/info infonav.html,1.1,1.2
Message-ID: <200803062201.m26M18Ig024110@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	infonav.html 
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 &amp; 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: infonav.html
===================================================================
RCS file: /cvs/dirsec/dsgw/html/info/infonav.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- infonav.html	16 Jan 2008 22:56:02 -0000	1.1
+++ infonav.html	6 Mar 2008 22:00:32 -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,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 -->
 <TITLE>Info</TITLE>
 
 <BODY bgcolor="#808080">



From fedora-directory-commits at redhat.com  Thu Mar  6 22:00:40 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu,  6 Mar 2008 17:00:40 -0500
Subject: [Fedora-directory-commits] dsgw/html/ja auth.html.in, 1.2,
	1.3 authroot.html.in, 1.2, 1.3 authtitle.html.in, 1.2,
	1.3 csearchtitle.html.in, 1.2, 1.3 eduser.html, 1.1.1.1,
	1.2 greeting.html.in, 1.2, 1.3 index.html.in, 1.2,
	1.3 maintitle.html.in, 1.2, 1.3 newentrytitle.html.in, 1.2,
	1.3 searchtitle.html.in, 1.2, 1.3
Message-ID: <200803062201.m26M1ANF024477@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	auth.html.in authroot.html.in authtitle.html.in 
	csearchtitle.html.in eduser.html greeting.html.in 
	index.html.in maintitle.html.in newentrytitle.html.in 
	searchtitle.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 &amp; 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: auth.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/ja/auth.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- auth.html.in	29 Feb 2008 20:38:14 -0000	1.2
+++ auth.html.in	6 Mar 2008 22:00:36 -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>
 <TITLE>


Index: authroot.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/ja/authroot.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- authroot.html.in	29 Feb 2008 20:38:14 -0000	1.2
+++ authroot.html.in	6 Mar 2008 22:00:36 -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>
 <TITLE>


Index: authtitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/ja/authtitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- authtitle.html.in	29 Feb 2008 20:38:14 -0000	1.2
+++ authtitle.html.in	6 Mar 2008 22:00:36 -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>
 <TITLE>Directory Server</TITLE>


Index: csearchtitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/ja/csearchtitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- csearchtitle.html.in	29 Feb 2008 20:38:14 -0000	1.2
+++ csearchtitle.html.in	6 Mar 2008 22:00:36 -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>
 <TITLE>Directory Server</TITLE>


Index: eduser.html
===================================================================
RCS file: /cvs/dirsec/dsgw/html/ja/eduser.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- eduser.html	1 Jun 2006 19:43:49 -0000	1.1.1.1
+++ eduser.html	6 Mar 2008 22:00:36 -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,8 +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>???????????????</TITLE></HEAD>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
 <HTML><BODY bgcolor="#C0C0C0" link="#0000EE" vlink="#551A8B" alink="#FF0000">
 
 <center><table border=2 width=100%%>


Index: greeting.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/ja/greeting.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- greeting.html.in	29 Feb 2008 20:38:14 -0000	1.2
+++ greeting.html.in	6 Mar 2008 22:00:36 -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,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>
 <TITLE>Directory Server</TITLE>
-<SCRIPT LANGUAGE="JavaScript">
+<SCRIPT type="text/javascript">
 <!-- Hide from non-JavaScript browsers
 function gotoURL(h) {
     top.location.href = h;


Index: index.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/ja/index.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.html.in	29 Feb 2008 20:38:14 -0000	1.2
+++ index.html.in	6 Mar 2008 22:00:36 -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>
 <TITLE>Directory Server Gateway</TITLE>


Index: maintitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/ja/maintitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maintitle.html.in	29 Feb 2008 20:38:14 -0000	1.2
+++ maintitle.html.in	6 Mar 2008 22:00:36 -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>
 <TITLE>Directory Server</TITLE>


Index: newentrytitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/ja/newentrytitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- newentrytitle.html.in	29 Feb 2008 20:38:14 -0000	1.2
+++ newentrytitle.html.in	6 Mar 2008 22:00:36 -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>
 <TITLE>Directory Server</TITLE>


Index: searchtitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/ja/searchtitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- searchtitle.html.in	29 Feb 2008 20:38:14 -0000	1.2
+++ searchtitle.html.in	6 Mar 2008 22:00:36 -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>
 <TITLE>Directory Server</TITLE>



From fedora-directory-commits at redhat.com  Thu Mar 13 21:52:40 2008
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Thu, 13 Mar 2008 17:52:40 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts
	DSCreate.pm.in, 1.9, 1.10
Message-ID: <200803132152.m2DLqeeT003642@cvs-int.fedora.redhat.com>

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3612

Modified Files:
	DSCreate.pm.in 
Log Message:
Resolves: 436397
Summary: LDAPI: move default LDAPI UNIX socket from /var/run/dirsrv/slapd-ID.socket to /var/run/slapd-ID.socket



Index: DSCreate.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSCreate.pm.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DSCreate.pm.in	17 Dec 2007 20:08:46 -0000	1.9
+++ DSCreate.pm.in	13 Mar 2008 21:52:37 -0000	1.10
@@ -330,8 +330,9 @@
             $ent->setValues("nsslapd-ldapifilepath", $inf->{slapd}->{ldapifilepath});
             $ent->setValues("nsslapd-ldapilisten", "on");
         } else {
+            my $parent = dirname($inf->{slapd}->{run_dir});
             $ent->setValues("nsslapd-ldapifilepath",
-                            "$inf->{slapd}->{run_dir}/slapd-$inf->{slapd}->{ServerIdentifier}.socket");
+                            "$parent/slapd-$inf->{slapd}->{ServerIdentifier}.socket");
             $ent->setValues("nsslapd-ldapilisten", "off");
         }
         if ("@enable_autobind@") {



From fedora-directory-commits at redhat.com  Thu Mar 20 02:18:45 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 19 Mar 2008 22:18:45 -0400
Subject: [Fedora-directory-commits] dsgw/html/es auth.html.in, 1.3,
	1.4 authroot.html.in, 1.3, 1.4 index.html.in, 1.3, 1.4
Message-ID: <200803200218.m2K2IjsO031921@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/dsgw/html/es
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31631/dsgw/html/es

Modified Files:
	auth.html.in authroot.html.in index.html.in 
Log Message:
Resolves: bug 435230
Description: Clean up all HTML pages (Gateway, Org Tool, Phonebook, etc)
Fix Description: This is the second pass.  I focused mainly on the
dsgw pages.  Some of the fixes will apply to phonebook too.
I also moved the cgi bin directory to dsgw-cgi-bin - needs to be completely
separate from the admin server cgi bin directory.  There are changes to
dsgw-httpd.conf to reflect this as well as changes to other files.
The dsgw uses a path of dsgwcmd, instead of using cgi-bin directly.  This
is mapped in the dsgw-httpd.conf.
One problem that still remains - HTML Tidy does not like frames and framesets.
The only workaround suggested is to rewrite them using divs.  I'm not really
up to the task right now.
Platforms tested: RHEL5 x86_64
Flag day: Yes - autotool file changes.
Doc: none yet



Index: auth.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/es/auth.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- auth.html.in	6 Mar 2008 22:00:24 -0000	1.3
+++ auth.html.in	20 Mar 2008 02:18:43 -0000	1.4
@@ -44,7 +44,7 @@
 </TITLE>
 </HEAD>
 
-<FRAMESET ROWS=75,* BORDER=0>
+<FRAMESET ROWS="75,*" BORDER="0">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=authtitle.html" NAME="authTitleFrame" NORESIZE
 	    SCROLLING="NO">
     <FRAME SRC="@cgiuri@/auth?<!-- GCONTEXT -->" NAME="authFrame">


Index: authroot.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/es/authroot.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- authroot.html.in	6 Mar 2008 22:00:24 -0000	1.3
+++ authroot.html.in	20 Mar 2008 02:18:43 -0000	1.4
@@ -43,7 +43,7 @@
 Pasarela de Directory Server: Autenticar
 </TITLE>
 </HEAD>
-<FRAMESET ROWS=100,* BORDER=0>
+<FRAMESET ROWS="100,*" BORDER="0">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=authtitle.html" NAME="authTitleFrame" NORESIZE
 	    SCROLLING="NO">
     <FRAME SRC="@cgiuri@/auth?MANAGER&<!-- GCONTEXT -->" NAME="authFrame">


Index: index.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/es/index.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.html.in	6 Mar 2008 22:00:24 -0000	1.3
+++ index.html.in	20 Mar 2008 02:18:43 -0000	1.4
@@ -41,7 +41,7 @@
 <HEAD>
 <TITLE>Pasarela de Directory Server</TITLE>
 </HEAD>
-<FRAMESET ROWS=75,* BORDER=0>
+<FRAMESET ROWS="75,*" BORDER="0">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=maintitle.html" NAME="buttonBarFrame" NORESIZE
 	    SCROLLING="no">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=greeting.html" NAME="greetingFrame" NORESIZE>



From fedora-directory-commits at redhat.com  Thu Mar 20 02:18:45 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 19 Mar 2008 22:18:45 -0400
Subject: [Fedora-directory-commits] dsgw/html/fr auth.html.in, 1.3,
	1.4 authroot.html.in, 1.3, 1.4 index.html.in, 1.3, 1.4
Message-ID: <200803200218.m2K2IjIe031929@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/dsgw/html/fr
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31631/dsgw/html/fr

Modified Files:
	auth.html.in authroot.html.in index.html.in 
Log Message:
Resolves: bug 435230
Description: Clean up all HTML pages (Gateway, Org Tool, Phonebook, etc)
Fix Description: This is the second pass.  I focused mainly on the
dsgw pages.  Some of the fixes will apply to phonebook too.
I also moved the cgi bin directory to dsgw-cgi-bin - needs to be completely
separate from the admin server cgi bin directory.  There are changes to
dsgw-httpd.conf to reflect this as well as changes to other files.
The dsgw uses a path of dsgwcmd, instead of using cgi-bin directly.  This
is mapped in the dsgw-httpd.conf.
One problem that still remains - HTML Tidy does not like frames and framesets.
The only workaround suggested is to rewrite them using divs.  I'm not really
up to the task right now.
Platforms tested: RHEL5 x86_64
Flag day: Yes - autotool file changes.
Doc: none yet



Index: auth.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/fr/auth.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- auth.html.in	6 Mar 2008 22:00:26 -0000	1.3
+++ auth.html.in	20 Mar 2008 02:18:43 -0000	1.4
@@ -44,7 +44,7 @@
 </TITLE>
 </HEAD>
 
-<FRAMESET ROWS=100,* BORDER=2>
+<FRAMESET ROWS="100,*" BORDER="2">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=authtitle.html" NAME="authTitleFrame" NORESIZE
 	    SCROLLING="NO">
     <FRAME SRC="@cgiuri@/auth?<!-- GCONTEXT -->" NAME="authFrame">


Index: authroot.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/fr/authroot.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- authroot.html.in	6 Mar 2008 22:00:26 -0000	1.3
+++ authroot.html.in	20 Mar 2008 02:18:43 -0000	1.4
@@ -43,7 +43,7 @@
 Passerelle Directory Server : authentification
 </TITLE>
 </HEAD>
-<FRAMESET ROWS=100,* BORDER=2>
+<FRAMESET ROWS="100,*" BORDER="2">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=authtitle.html" NAME="authTitleFrame" NORESIZE
 	    SCROLLING="NO">
     <FRAME SRC="@cgiuri@/auth/MANAGER&<!-- GCONTEXT -->" NAME="authFrame">


Index: index.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/fr/index.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.html.in	6 Mar 2008 22:00:26 -0000	1.3
+++ index.html.in	20 Mar 2008 02:18:43 -0000	1.4
@@ -41,7 +41,7 @@
 <HEAD>
 <TITLE>Passerelle Directory Server</TITLE>
 </HEAD>
-<FRAMESET ROWS=100,*>
+<FRAMESET ROWS="100,*">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=maintitle.html" NAME="buttonBarFrame" NORESIZE
 	    SCROLLING="no">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=greeting.html" NAME="greetingFrame" NORESIZE>



From fedora-directory-commits at redhat.com  Thu Mar 20 02:18:45 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 19 Mar 2008 22:18:45 -0400
Subject: [Fedora-directory-commits] dsgw/html/ja auth.html.in, 1.3,
	1.4 authroot.html.in, 1.3, 1.4 index.html.in, 1.3, 1.4
Message-ID: <200803200218.m2K2IjLS031937@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/dsgw/html/ja
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31631/dsgw/html/ja

Modified Files:
	auth.html.in authroot.html.in index.html.in 
Log Message:
Resolves: bug 435230
Description: Clean up all HTML pages (Gateway, Org Tool, Phonebook, etc)
Fix Description: This is the second pass.  I focused mainly on the
dsgw pages.  Some of the fixes will apply to phonebook too.
I also moved the cgi bin directory to dsgw-cgi-bin - needs to be completely
separate from the admin server cgi bin directory.  There are changes to
dsgw-httpd.conf to reflect this as well as changes to other files.
The dsgw uses a path of dsgwcmd, instead of using cgi-bin directly.  This
is mapped in the dsgw-httpd.conf.
One problem that still remains - HTML Tidy does not like frames and framesets.
The only workaround suggested is to rewrite them using divs.  I'm not really
up to the task right now.
Platforms tested: RHEL5 x86_64
Flag day: Yes - autotool file changes.
Doc: none yet



Index: auth.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/ja/auth.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- auth.html.in	6 Mar 2008 22:00:36 -0000	1.3
+++ auth.html.in	20 Mar 2008 02:18:43 -0000	1.4
@@ -44,7 +44,7 @@
 </TITLE>
 </HEAD>
 
-<FRAMESET ROWS=100,* BORDER=2>
+<FRAMESET ROWS="100,*" BORDER="2">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=authtitle.html" NAME="authTitleFrame" NORESIZE
 	    SCROLLING="NO">
     <FRAME SRC="@cgiuri@/auth?<!-- GCONTEXT -->" NAME="authFrame">


Index: authroot.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/ja/authroot.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- authroot.html.in	6 Mar 2008 22:00:36 -0000	1.3
+++ authroot.html.in	20 Mar 2008 02:18:43 -0000	1.4
@@ -43,7 +43,7 @@
 Directory Server Gateway: ??????
 </TITLE>
 </HEAD>
-<FRAMESET ROWS=100,* BORDER=2>
+<FRAMESET ROWS="100,*" BORDER="2">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=authtitle.html" NAME="authTitleFrame" NORESIZE
 	    SCROLLING="NO">
     <FRAME SRC="@cgiuri@/auth/MANAGER&<!-- GCONTEXT -->" NAME="authFrame">


Index: index.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/ja/index.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.html.in	6 Mar 2008 22:00:36 -0000	1.3
+++ index.html.in	20 Mar 2008 02:18:43 -0000	1.4
@@ -41,7 +41,7 @@
 <HEAD>
 <TITLE>Directory Server Gateway</TITLE>
 </HEAD>
-<FRAMESET ROWS=100,*>
+<FRAMESET ROWS="100,*">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=maintitle.html" NAME="buttonBarFrame" NORESIZE
 	    SCROLLING="no">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=greeting.html" NAME="greetingFrame" NORESIZE>



From fedora-directory-commits at redhat.com  Thu Mar 20 02:18:46 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 19 Mar 2008 22:18:46 -0400
Subject: [Fedora-directory-commits] dsgw/orgbin myorg.in,1.3,1.4
Message-ID: <200803200218.m2K2IkiY031943@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	myorg.in 
Log Message:
Resolves: bug 435230
Description: Clean up all HTML pages (Gateway, Org Tool, Phonebook, etc)
Fix Description: This is the second pass.  I focused mainly on the
dsgw pages.  Some of the fixes will apply to phonebook too.
I also moved the cgi bin directory to dsgw-cgi-bin - needs to be completely
separate from the admin server cgi bin directory.  There are changes to
dsgw-httpd.conf to reflect this as well as changes to other files.
The dsgw uses a path of dsgwcmd, instead of using cgi-bin directly.  This
is mapped in the dsgw-httpd.conf.
One problem that still remains - HTML Tidy does not like frames and framesets.
The only workaround suggested is to rewrite them using divs.  I'm not really
up to the task right now.
Platforms tested: RHEL5 x86_64
Flag day: Yes - autotool file changes.
Doc: none yet



Index: myorg.in
===================================================================
RCS file: /cvs/dirsec/dsgw/orgbin/myorg.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- myorg.in	6 Mar 2008 22:00:39 -0000	1.3
+++ myorg.in	20 Mar 2008 02:18:43 -0000	1.4
@@ -159,7 +159,7 @@
 
 print "
 
-<body bgcolor=\"#FFFFFF\" leftmargin=0 topmargin=0 marginwidth=0 marginheight=0 onLoad=\"initValues()\">
+<body bgcolor=\"#FFFFFF\" style=\"leftmargin:0; topmargin:0; marginwidth:0; marginheight:0\" onLoad=\"initValues()\">
 <FORM name=\"customize\">
 
 



From fedora-directory-commits at redhat.com  Thu Mar 20 02:18:46 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 19 Mar 2008 22:18:46 -0400
Subject: [Fedora-directory-commits] dsgw/orghtml index.html,1.2,1.3
Message-ID: <200803200218.m2K2Ik1l031949@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	index.html 
Log Message:
Resolves: bug 435230
Description: Clean up all HTML pages (Gateway, Org Tool, Phonebook, etc)
Fix Description: This is the second pass.  I focused mainly on the
dsgw pages.  Some of the fixes will apply to phonebook too.
I also moved the cgi bin directory to dsgw-cgi-bin - needs to be completely
separate from the admin server cgi bin directory.  There are changes to
dsgw-httpd.conf to reflect this as well as changes to other files.
The dsgw uses a path of dsgwcmd, instead of using cgi-bin directly.  This
is mapped in the dsgw-httpd.conf.
One problem that still remains - HTML Tidy does not like frames and framesets.
The only workaround suggested is to rewrite them using divs.  I'm not really
up to the task right now.
Platforms tested: RHEL5 x86_64
Flag day: Yes - autotool file changes.
Doc: none yet



Index: index.html
===================================================================
RCS file: /cvs/dirsec/dsgw/orghtml/index.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.html	6 Mar 2008 22:00:39 -0000	1.2
+++ index.html	20 Mar 2008 02:18:44 -0000	1.3
@@ -61,8 +61,8 @@
 </HEAD>
 
 
-<frameset frameborder=no border=0 framespacing="0" ROWS="50,*">
-        <frame name="input_window" src="topframe.html" SCROLLING=NO noresize marginwidth="5" marginheight="5">
+<frameset frameborder="no" border="0" framespacing="0" ROWS="50,*">
+        <frame name="input_window" src="topframe.html" SCROLLING="NO" noresize marginwidth="5" marginheight="5">
         <frame name="output_window" src="botframe.html" marginwidth="10" marginheight="10">
 
 </frameset>



From fedora-directory-commits at redhat.com  Thu Mar 20 02:18:46 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 19 Mar 2008 22:18:46 -0400
Subject: [Fedora-directory-commits] dsgw/pbconfig edit-passwd.html.in, 1.2,
	1.3 list-Auth.html.in, 1.3, 1.4
Message-ID: <200803200218.m2K2Ikxb031956@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	edit-passwd.html.in list-Auth.html.in 
Log Message:
Resolves: bug 435230
Description: Clean up all HTML pages (Gateway, Org Tool, Phonebook, etc)
Fix Description: This is the second pass.  I focused mainly on the
dsgw pages.  Some of the fixes will apply to phonebook too.
I also moved the cgi bin directory to dsgw-cgi-bin - needs to be completely
separate from the admin server cgi bin directory.  There are changes to
dsgw-httpd.conf to reflect this as well as changes to other files.
The dsgw uses a path of dsgwcmd, instead of using cgi-bin directly.  This
is mapped in the dsgw-httpd.conf.
One problem that still remains - HTML Tidy does not like frames and framesets.
The only workaround suggested is to rewrite them using divs.  I'm not really
up to the task right now.
Platforms tested: RHEL5 x86_64
Flag day: Yes - autotool file changes.
Doc: none yet



Index: edit-passwd.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbconfig/edit-passwd.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- edit-passwd.html.in	6 Mar 2008 22:00:40 -0000	1.2
+++ edit-passwd.html.in	20 Mar 2008 02:18:44 -0000	1.3
@@ -118,7 +118,7 @@
 </TD></TR>
 </TABLE>
 
-<P>
+<br>
 
 <img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=pixel.gif" height="1" width="1" hspace="20" align="left" border="0">
 


Index: list-Auth.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbconfig/list-Auth.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- list-Auth.html.in	6 Mar 2008 22:00:40 -0000	1.3
+++ list-Auth.html.in	20 Mar 2008 02:18:44 -0000	1.4
@@ -60,7 +60,7 @@
 -->
 <LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 </head>
-<body bgcolor="#FFFFFF" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0">
+<body bgcolor="#FFFFFF" style="marginwidth:0; marginheight: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 -->&amp;file=clear.gif" width="10" height="45" border="0"></TD>
@@ -103,15 +103,15 @@
     </td>
     </tr>
 </TABLE>
-<P>
+<br>
 
 <CENTER>
 <!-- DS_SEARCHDESC "VERBOSE" -->
-<P>
+<p>
 <!-- IF "FoundEntries" -->
 Please click on the name of the entry you would like to use for authentication.
-</P>
-<P>
+</p>
+<br>
 
 <TABLE BORDER=1 CELLPADDING=4>
 <TR>



From fedora-directory-commits at redhat.com  Thu Mar 20 02:18:47 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 19 Mar 2008 22:18:47 -0400
Subject: [Fedora-directory-commits] dsgw/pbhtml modify.html.in, 1.2,
	1.3 phone.html.in, 1.2, 1.3
Message-ID: <200803200218.m2K2IlHa031963@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	modify.html.in phone.html.in 
Log Message:
Resolves: bug 435230
Description: Clean up all HTML pages (Gateway, Org Tool, Phonebook, etc)
Fix Description: This is the second pass.  I focused mainly on the
dsgw pages.  Some of the fixes will apply to phonebook too.
I also moved the cgi bin directory to dsgw-cgi-bin - needs to be completely
separate from the admin server cgi bin directory.  There are changes to
dsgw-httpd.conf to reflect this as well as changes to other files.
The dsgw uses a path of dsgwcmd, instead of using cgi-bin directly.  This
is mapped in the dsgw-httpd.conf.
One problem that still remains - HTML Tidy does not like frames and framesets.
The only workaround suggested is to rewrite them using divs.  I'm not really
up to the task right now.
Platforms tested: RHEL5 x86_64
Flag day: Yes - autotool file changes.
Doc: none yet



Index: modify.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbhtml/modify.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- modify.html.in	6 Mar 2008 22:00:40 -0000	1.2
+++ modify.html.in	20 Mar 2008 02:18:44 -0000	1.3
@@ -94,7 +94,7 @@
 	<TD>The conditions of your contract determine who gets your Email request.</TD>
 </TR>
 </TABLE>
-<P>
+<br>
 
 
 
@@ -196,8 +196,8 @@
 
 
 
-<P>
-<P>
+<br>
+<br>
 
 <TABLE BORDER BGCOLOR=#f2f2f2 WIDTH=575>
 <TR>
@@ -216,8 +216,8 @@
 <TD VALIGN="TOP" COLSPAN=3><B><A href="mailto:administrator at example.com?subject=Please update my physical location">Administrator</A></B></TD></TR>
 </TABLE>
 
-<P>
-<P>
+<br>
+<br>
 
 <TABLE BORDER BGCOLOR=#f2f2f2 WIDTH=575>
 <TR>
@@ -259,8 +259,8 @@
 </TABLE>
 
 
-<P>
-<P>
+<br>
+<br>
 <TABLE BORDER BGCOLOR=#f2f2f2 WIDTH=575>
 
 <TR>
@@ -280,8 +280,8 @@
 
 </TABLE>
 
-<P>
-<P>
+<br>
+<br>
 <TABLE BORDER BGCOLOR=#f2f2f2 WIDTH=575>
 <TR>
 <TD BGCOLOR=TEAL COLSPAN=4><FONT SIZE=+1 FACE=ARIAL,HELVETICA COLOR=WHITE>Mail Information</FONT></TD></TR>
@@ -313,8 +313,8 @@
 </TR>
 </TABLE>
 
-<P>
-<P>
+<br>
+<br>
 
 
 


Index: phone.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/pbhtml/phone.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- phone.html.in	6 Mar 2008 22:00:40 -0000	1.2
+++ phone.html.in	20 Mar 2008 02:18:44 -0000	1.3
@@ -57,7 +57,6 @@
 </head>
 
 <body class="Search" onLoad="fieldFocus();" style="marginwidth: 0; marginheight: 0; leftmargin: 0; topmargin: 0">
-<!-- <body class="Search" onLoad="fieldFocus();" marginwidth="0" marginheight="0" leftmargin="0" topmargin="0"> -->
 
 <form method="post" name="searchform" target="resultframe" action="@cgiuri@/dosearch" onSubmit="return checkForNullString()"> 
 



From fedora-directory-commits at redhat.com  Thu Mar 20 02:18:42 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 19 Mar 2008 22:18:42 -0400
Subject: [Fedora-directory-commits] dsgw configure.ac, 1.10, 1.11 csearch.c,
	1.6, 1.7 dbtdsgw.h, 1.5, 1.6 dnedit.c, 1.6,
	1.7 dsgw-httpd.conf.in, 1.5, 1.6 dsgwutil.c, 1.11,
	1.12 emitauth.c, 1.4, 1.5 entrydisplay.c, 1.9, 1.10 error.c,
	1.4, 1.5 htmlout.c, 1.5, 1.6 newentry.c, 1.4, 1.5 tutor.c, 1.4,
	1.5 unauth.c, 1.3, 1.4 aclocal.m4, 1.15, 1.16 configure, 1.18,
	1.19 missing, 1.14, 1.15 install-sh, 1.14, 1.15 Makefile.in,
	1.19, 1.20 depcomp, 1.14, 1.15 config.sub, 1.14,
	1.15 config.guess, 1.14, 1.15 compile, 1.14, 1.15
Message-ID: <200803200219.m2K2JC8K032067@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	configure.ac csearch.c dbtdsgw.h dnedit.c dsgw-httpd.conf.in 
	dsgwutil.c emitauth.c entrydisplay.c error.c htmlout.c 
	newentry.c tutor.c unauth.c aclocal.m4 configure missing 
	install-sh Makefile.in depcomp config.sub config.guess compile 
Log Message:
Resolves: bug 435230
Description: Clean up all HTML pages (Gateway, Org Tool, Phonebook, etc)
Fix Description: This is the second pass.  I focused mainly on the
dsgw pages.  Some of the fixes will apply to phonebook too.
I also moved the cgi bin directory to dsgw-cgi-bin - needs to be completely
separate from the admin server cgi bin directory.  There are changes to
dsgw-httpd.conf to reflect this as well as changes to other files.
The dsgw uses a path of dsgwcmd, instead of using cgi-bin directly.  This
is mapped in the dsgw-httpd.conf.
One problem that still remains - HTML Tidy does not like frames and framesets.
The only workaround suggested is to rewrite them using divs.  I'm not really
up to the task right now.
Platforms tested: RHEL5 x86_64
Flag day: Yes - autotool file changes.
Doc: none yet



Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/dsgw/configure.ac,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- configure.ac	1 Feb 2008 16:50:12 -0000	1.10
+++ configure.ac	20 Mar 2008 02:18:39 -0000	1.11
@@ -245,7 +245,7 @@
   manualsubdir=
   propertydir=/$PACKAGE_NAME/properties
   # relative to libdir
-  cgibindir=/$PACKAGE_NAME/cgi-bin
+  cgibindir=/$PACKAGE_NAME/dsgw-cgi-bin
   perldir=/$PACKAGE_NAME/perl
 elif test "$with_fhs_opt" = "yes"; then
   # relative to datadir
@@ -264,7 +264,7 @@
   # relative to libdir
   perldir=/perl
   # same as server's cgibindir
-  cgibindir=/cgi-bin
+  cgibindir=/dsgw-cgi-bin
 else
   # relative to datadir
   htmldir=/$PACKAGE_BASE_NAME/dsgw/html
@@ -282,7 +282,7 @@
   # relative to libdir
   perldir=/$PACKAGE_BASE_NAME/perl
   # CGI program directory
-  cgibindir=/$PACKAGE_BASE_NAME/cgi-bin
+  cgibindir=/$PACKAGE_BASE_NAME/dsgw-cgi-bin
 fi
 
 # relative to instconfigdir
@@ -291,7 +291,7 @@
 # relative to $localstatedir
 cookiedir=/run/$PACKAGE_BASE_NAME/dsgw/cookies
 # URIs
-cgiuri=/cgi-bin
+cgiuri=/dsgwcmd
 dsgwuri=/dsgw
 orguri=/org
 pburi=/pb


Index: csearch.c
===================================================================
RCS file: /cvs/dirsec/dsgw/csearch.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- csearch.c	6 Mar 2008 22:00:09 -0000	1.6
+++ csearch.c	20 Mar 2008 02:18:39 -0000	1.7
@@ -274,7 +274,7 @@
 		}
 
 	    } else if ( dsgw_directive_is( line, "DS_CSEARCH_MATCH_FORM" )) {
-		dsgw_form_begin ("searchMatchForm", NULL);
+		dsgw_form_begin ("searchMatchForm", "action=\"javascript:void();\"");
 		dsgw_emits("\n");
 
 	    } else if ( dsgw_directive_is( line, "DS_CSEARCH_STRING_FORM" )) {
@@ -295,7 +295,7 @@
 		dsgw_emitf ("<SELECT NAME=searchType "
 			    "onChange=\"parent.searchTypeSet(this.options[this.selectedIndex].value);"
 			    "this.form.submit();"
-			    "parent.searchMatchFrame.location='%s?context=%s&file=match&'+this.name+'='"
+			    "parent.searchMatchFrame.location='%s?context=%s&amp;file=match&amp;'+this.name+'='"
 			    "+escape(this.options[this.selectedIndex].value);\">\n", 
 			    dsgw_getvp( DSGW_CGINUM_CSEARCH), context);
 		dsgw_emit_options (&sop, NULL, NULL);


Index: dbtdsgw.h
===================================================================
RCS file: /cvs/dirsec/dsgw/dbtdsgw.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dbtdsgw.h	6 Mar 2008 22:00:09 -0000	1.5
+++ dbtdsgw.h	20 Mar 2008 02:18:39 -0000	1.6
@@ -257,7 +257,7 @@
 	ResDef( DBT_beforeYouCanEditOrAddEntriesYouM_, 206, "Before you can edit or add entries, you must authenticate\n(log in) to the directory.  This window will guide\nyou through the steps of the authentication\nprocess.\n" )/*extracted from emitauth.c*/
 	ResDef( DBT_fromThisScreenYouMayAuthenticate_, 207, "From this screen you may authenticate, or log in, \nto the directory.  You will need to authenticate\nbefore you can modify directory entries.  If you\nattempt to modify an entry without authenticating,\nyou will be asked to log in.\n" )/*extracted from emitauth.c*/
 	ResDef( DBT_authenticationStatus_, 208, "Authentication Status" )/*extracted from emitauth.c*/
-	ResDef( DBT_FormNyouAreCurrentlyAuthenticate_, 209, "<form>\nYou are currently authenticated to the directory as " )/*extracted from emitauth.c*/
+	ResDef( DBT_FormNyouAreCurrentlyAuthenticate_, 209, "<form action=\"javascript:void();\">\nYou are currently authenticated to the directory as " )/*extracted from emitauth.c*/
 	ResDef( DBT_NifYouWishToDiscardYourAuthentic_, 210, ".\nIf you wish to discard your authentication credentials and log out of the directory, click on the button below." )/*extracted from emitauth.c*/
 	ResDef( DBT_discardAuthenticationCredentials_2, 211, "Discard Authentication Credentials (log out)" )/*extracted from emitauth.c*/
 	ResDef( DBT_yourAuthenticationCredentialsFor_, 212, "Your authentication credentials for " )/*extracted from emitauth.c*/
@@ -347,9 +347,9 @@
 	ResDef( DBT_Adding_, 300, "Adding" )/*extracted from domodify.c*/
 	ResDef( DBT_Deleting_, 301, "Deleting" )/*extracted from domodify.c*/
 	ResDef( DBT_Renaming_, 302, "Renaming" )/*extracted from domodify.c*/
-	ResDef( DBT_noNameInTheList_, 303, "There are <B>no</B> names in the list." )/*extracted from dnedit.c*/
-	ResDef( DBT_oneNameInTheList_, 304, "There is <B>1</B> name in the list." )/*extracted from dnedit.c*/
-	ResDef( DBT_someNamesInTheList_, 305, "There are <B>%s</B> names in the list." )/*extracted from dnedit.c*/
+	ResDef( DBT_noNameInTheList_, 303, "There are <B>no<\\\\/B> names in the list." )/*extracted from dnedit.c*/
+	ResDef( DBT_oneNameInTheList_, 304, "There is <B>1<\\\\/B> name in the list." )/*extracted from dnedit.c*/
+	ResDef( DBT_someNamesInTheList_, 305, "There are <B>%s<\\/B> names in the list." )/*extracted from dnedit.c*/
 	ResDef( DBT_RemoveFromList_, 306, "Remove<BR>from<BR>list?        Name" )/*extracted from dnedit.c -- should be JavaScript syntax*/
 	ResDef( DBT_discardChanges_, 307, "Discard Changes?" ) /*extracted from dnedit.c */
 	ResDef( DBT_discardChangesWindow_, 308, "width=300,height=130,resizable" ) /*extracted from dnedit.c */


Index: dnedit.c
===================================================================
RCS file: /cvs/dirsec/dsgw/dnedit.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dnedit.c	6 Mar 2008 22:00:09 -0000	1.6
+++ dnedit.c	20 Mar 2008 02:18:39 -0000	1.7
@@ -95,7 +95,9 @@
 	
 
     /* Send the top-level document HTML */
-    dsgw_emits( "<HTML>\n"
+    dsgw_emits( "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\"\n" );
+    dsgw_emits( "    \"http://www.w3.org/TR/html4/frameset.dtd\">\n" );
+    dsgw_emits( "<HTML>\n<HEAD><TITLE>DN Edit</TITLE>\n"
 		"<SCRIPT type=\"text/javascript\">\n" );
     dsgw_emitf( "var emptyFrame = '';\n" );
     dsgw_emitf( "var attrname = '%s';\n", attrname );
@@ -221,28 +223,30 @@
 	"    var d = oframe.document;\n"
 	"\n"
 	"    d.open('text/html');\n"
-	"    d.writeln('<HTML>');\n" );
+	"    d.writeln('<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\"\\n');\n"
+	"    d.writeln('    \"http://www.w3.org/TR/html4/frameset.dtd\">\\n');\n"
+	"    d.writeln('<HTML>\\n<HEAD><TITLE>DN Edit<\\/TITLE><\\/HEAD>\\n');\n" );
 
     dsgw_emitf(
 	"    d.writeln('<BODY %s>');\n", dsgw_html_body_colors );
     dsgw_emits(
         "    d.writeln(");
     dsgw_quotation_begin (QUOTATION_JAVASCRIPT);
-    dsgw_form_begin (NULL, NULL);
+    dsgw_form_begin (NULL,  "action=\"javascript:void();\"");
     dsgw_quotation_end();
     dsgw_emits(      ");\n");
     dsgw_emits( 
 	"    d.writeln('<CENTER>');\n"
 	"    if (dnl.count == 0) {\n" );
 
-    dsgw_emits( "       d.write(" );
-    dsgw_quote_emits (QUOTATION_JAVASCRIPT, XP_GetClientStr (DBT_noNameInTheList_));
-    dsgw_emits( ");\n" );
+    dsgw_emits( "       d.write('" );
+    dsgw_fputn( stdout, XP_GetClientStr (DBT_noNameInTheList_), strlen(XP_GetClientStr (DBT_noNameInTheList_)) );
+    dsgw_emits( "');\n" );
 
     dsgw_emits( "    } else if (dnl.count == 1) {\n" );
-    dsgw_emits( "       d.write(" );
-    dsgw_quote_emits (QUOTATION_JAVASCRIPT, XP_GetClientStr (DBT_oneNameInTheList_));
-    dsgw_emits( ");\n" );
+    dsgw_emits( "       d.write('" );
+    dsgw_fputn( stdout, XP_GetClientStr (DBT_oneNameInTheList_), strlen(XP_GetClientStr (DBT_oneNameInTheList_)) );
+    dsgw_emits( "');\n" );
     dsgw_emits( "    } else {\n" );
     dsgw_emits( "       d.write('");
     dsgw_emitf( XP_GetClientStr( DBT_someNamesInTheList_ ), "' + dnl.count + '" );
@@ -251,16 +255,16 @@
     dsgw_emits( 
 	"    }\n"
 #ifdef NAV30_SORT_NO_LONGER_COREDUMPS
-	"    d.writeln('</FONT>\\n')\n"
-	"    d.writeln('<INPUT TYPE=\"button\" VALUE=\"Sort\" onClick=\"parent.sortEntries();\"></CENTER>\\n');\n"
+	"    d.writeln('\\n')\n"
+	"    d.writeln('<INPUT TYPE=\"button\" VALUE=\"Sort\" onClick=\"parent.sortEntries();\"><\\/CENTER>\\n');\n"
 #else
-	"    d.writeln('</FONT></CENTER>\\n');\n"
+	"    d.writeln('<\\/CENTER>\\n');\n"
 #endif
 	"    if (dnl.count > 0) {\n"
 	"	d.write('<PRE><B>');\n" );
 
     dsgw_emitf(
-	"	d.write('%s</B><HR>');\n",
+	"	d.write('%s<\\/B><\\/PRE><HR><PRE>');\n",
 		XP_GetClientStr( DBT_RemoveFromList_ ));
 
     dsgw_emits( 
@@ -270,9 +274,9 @@
 	"	    d.write('           ');\n"
 	"	    d.write(dnl[i].rdn + '\\n');\n"
 	"	}\n"
-	"	d.writeln('</PRE></FORM><HR>');\n"
+	"	d.writeln('<\\/PRE><\\/FORM><HR>');\n"
 	"    }\n"
-	"    d.writeln('</BODY>');\n"
+	"    d.writeln('<\\/BODY>');\n"
 	"    d.close();\n"
 	"}\n"
 	"\n"
@@ -384,19 +388,23 @@
 	"VALUE=\"");
     dsgw_emits(context);
     dsgw_emits("\">\\n');\n"
-	"    of.writeln('</FORM>\\n');\n"
+	"    of.writeln('<\\/FORM>\\n');\n"
 	"    of.close();\n"
 	"}\n"
 
 	"</SCRIPT>\n"
-	"\n"
-	"<FRAMESET BORDER=1 FRAMEBORDER=1 ROWS=230,*,0,0 "
+	"</HEAD>\n"
+	"<FRAMESET BORDER=\"1\" FRAMEBORDER=\"1\" ROWS=\"230,*,0,0\" "
 	"SCROLLING=\"NO\" NORESIZE onLoad=\"genOutputFrame"
 	"(this.outputFrame, this.dnlist);\">\n" );
     dsgw_emitf( "   <FRAME SRC=\"%s?tmplname=%s&amp;dn=%s&amp;context=%s&amp;DNATTR=%s&amp;"
 	     "DNDESC=%s\" NAME=\"controlFrame\" SCROLLING=\"no\">\n",
-	     dsgw_getvp( DSGW_CGINUM_EDIT ), tmplname, edn, context, attrname,
-	     attrdesc );
+	     dsgw_getvp( DSGW_CGINUM_EDIT ),
+	     dsgw_strdup_escaped(tmplname),
+	     edn,
+	     context,
+	     dsgw_strdup_escaped(attrname),
+	     dsgw_strdup_escaped(attrdesc) );
     dsgw_emitf( "   <FRAME SRC=\"javascript:parent.emptyFrame\" "
 	   "NAME=\"outputFrame\">\n"
 	    "   <FRAME SRC=\"javascript:parent.emptyFrame\" "


Index: dsgw-httpd.conf.in
===================================================================
RCS file: /cvs/dirsec/dsgw/dsgw-httpd.conf.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dsgw-httpd.conf.in	28 Jan 2008 21:22:47 -0000	1.5
+++ dsgw-httpd.conf.in	20 Mar 2008 02:18:39 -0000	1.6
@@ -83,9 +83,8 @@
 </Directory>
 
 # Allow access to the cgi programs
-<Directory "@cgibindir@">
-    AllowOverride None
+<Location "@cgiuri@">
     Options +ExecCGI
     Order allow,deny
     Allow from all
-</Directory>
+</Location>


Index: dsgwutil.c
===================================================================
RCS file: /cvs/dirsec/dsgw/dsgwutil.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dsgwutil.c	6 Mar 2008 22:00:09 -0000	1.11
+++ dsgwutil.c	20 Mar 2008 02:18:39 -0000	1.12
@@ -1082,7 +1082,7 @@
 	dsgw_emits( "</CENTER>\n" );
 	dsgw_emits( XP_GetClientStr( DBT_YourPasswordHasExpired_ ));
 	dsgw_emits( XP_GetClientStr( DBT_YouMustChangeYourPasswd_ ));
-	dsgw_emits( "<P>\n"
+	dsgw_emits( "<br>\n"
 	    "<TR>\n"
 	    "<SCRIPT type=\"text/javascript\">\n"
 	    "<!-- Hide from non-JavaScript browsers\n"


Index: emitauth.c
===================================================================
RCS file: /cvs/dirsec/dsgw/emitauth.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- emitauth.c	6 Mar 2008 22:00:09 -0000	1.4
+++ emitauth.c	20 Mar 2008 02:18:39 -0000	1.5
@@ -78,7 +78,7 @@
     dsgw_emitf( "<CENTER>\n"
 	"<FONT SIZE=+2>%s</FONT>\n"
 	"</CENTER>\n"
-	"<p>", XP_GetClientStr(DBT_authenticateLogInToTheDirectory_) );
+	"<br>", XP_GetClientStr(DBT_authenticateLogInToTheDirectory_) );
 
     if ( isPwForm ) {
 #ifdef NOTFORNOW
@@ -102,7 +102,7 @@
 	"<CENTER>\n"
 	"<FONT SIZE=+2>%s</FONT>\n"
 	"</CENTER>\n"
-	"<P>\n", XP_GetClientStr(DBT_authenticationStatus_) );
+	"<br>\n", XP_GetClientStr(DBT_authenticationStatus_) );
 
     if ( isauth ) {
 	auto char *ufn;
@@ -115,8 +115,8 @@
 	    "<INPUT TYPE=BUTTON "
 	    "VALUE=\"%s\""
 	    "onClick=\"doUnauth();\">\n"
-	    "</FORM>\n"
 	    "</CENTER>\n"
+	    "</FORM>\n"
 	    "<HR>\n",
 	    XP_GetClientStr(DBT_NifYouWishToDiscardYourAuthentic_),
 	    XP_GetClientStr(DBT_discardAuthenticationCredentials_2) );


Index: entrydisplay.c
===================================================================
RCS file: /cvs/dirsec/dsgw/entrydisplay.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- entrydisplay.c	6 Mar 2008 22:00:09 -0000	1.9
+++ entrydisplay.c	20 Mar 2008 02:18:39 -0000	1.10
@@ -544,7 +544,7 @@
 				 dsgw_getvp( DSGW_CGINUM_DOSEARCH ),
 				 "target=stagingFrame",
 				 "onSubmit=\"return parent.processSearch(searchForm);\"" );
-		dsgw_emitf( "\n<INPUT TYPE=\"hidden\" NAME=\"dn\" VALUE=\"%s\";>\n", encodeddn );
+		dsgw_emitf( "\n<INPUT TYPE=\"hidden\" NAME=\"dn\" VALUE=\"%s\">\n", encodeddn );
 
 	    } else if ( dsgw_directive_is( line, DRCT_DS_BEGIN_ENTRYFORM )) {
 		if ( editable ) {
@@ -692,10 +692,6 @@
 	output_prelude( tip );
     }
 
-    while ( dsgw_next_html_line( tip->dsti_fp, line )) {
-	output_nonentry_line( tip, line );
-    }
-
     /*
      * check for "completion_javascript" form var and
      * execute it if present.
@@ -706,6 +702,10 @@
 	dsgw_emit_completion_javascript(jscomp, dn ? dn : "");
     }
 
+    while ( dsgw_next_html_line( tip->dsti_fp, line )) {
+	output_nonentry_line( tip, line );
+    }
+
     fflush( stdout );
     fflush( stdout );
 


Index: error.c
===================================================================
RCS file: /cvs/dirsec/dsgw/error.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- error.c	6 Mar 2008 22:00:09 -0000	1.4
+++ error.c	20 Mar 2008 02:18:39 -0000	1.5
@@ -209,7 +209,7 @@
 #endif
     if ( ldaperr  != 0 ) {
 	msg = dsgw_ldaperr2longstring( ldaperr, options );
-	dsgw_emitf("<P>%s", msg );
+	dsgw_emitf("<br>%s", msg );
     }
 
     if (( options & DSGW_ERROPT_INLINE ) == 0 ) {
@@ -284,7 +284,7 @@
     if (gc->gc_mode == DSGW_MODE_EDIT || gc->gc_mode == DSGW_MODE_DOMODIFY) {
 
 	dsgw_emits( XP_GetClientStr(DBT_NPYouMustReAuthenticateBeforeCon_1) );
-	dsgw_emits( "<P>\n" );
+	dsgw_emits( "<br>\n" );
 	dsgw_form_begin( NULL, NULL );
 	dsgw_emits("\n<CENTER><TABLE border=2 width=\"100%\"><TR>\n" );
 	dsgw_emits( "<TD WIDTH=\"50%\" ALIGN=\"center\">\n" );


Index: htmlout.c
===================================================================
RCS file: /cvs/dirsec/dsgw/htmlout.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- htmlout.c	6 Mar 2008 22:00:09 -0000	1.5
+++ htmlout.c	20 Mar 2008 02:18:39 -0000	1.6
@@ -112,7 +112,7 @@
     if (( title != NULL ) && ( header_done || titleinbody )) {
 	dsgw_emitf( "<CENTER><TABLE BORDER=\"2\" CELLPADDING=\"10\" WIDTH=100%%>\n"
 		"<TR><TD ALIGN=\"center\" WIDTH=\"100%%\">\n<FONT SIZE=\"+2\">"
-		"<B>%s</B></FONT></TD></TR></TABLE></CENTER>\n<P>\n", title );
+		"<B>%s</B></FONT></TD></TR></TABLE></CENTER>\n<br>\n", title );
     }
 
     header_done = 1;
@@ -371,6 +371,9 @@
 	dsgw_emits (" ");
 	dsgw_emitfv (format, argl);
 	va_end (argl);
+    } else {
+	/* a form must have an action */
+	dsgw_emits (" action=\"javascript:void();\"");
     }
     dsgw_emits (">");
     dsgw_emitf("<INPUT type=hidden name=context value=\"%s\">", context);


Index: newentry.c
===================================================================
RCS file: /cvs/dirsec/dsgw/newentry.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- newentry.c	6 Mar 2008 22:00:09 -0000	1.4
+++ newentry.c	20 Mar 2008 02:18:39 -0000	1.5
@@ -154,7 +154,7 @@
 			    dsgw_html_body_colors );
 
 	    } else if ( dsgw_directive_is( line, "DS_NEWENTRY_TYPE_FORM" )) {
-		dsgw_form_begin ("typeForm", NULL);
+		dsgw_form_begin ("typeForm", "action=\"javascript:void();\"");
 		dsgw_emits ("\n");
 
 	    } else if ( dsgw_directive_is( line, "DS_NEWENTRY_TYPE_SELECT" )) {
@@ -332,11 +332,13 @@
     char* newurl = compute_newurl();
     if (client_is_authenticated()) {
 	/* Direct the client to GET newurl */
+	dsgw_emits( "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\"\n" );
+	dsgw_emits( "    \"http://www.w3.org/TR/html4/frameset.dtd\">\n" );
 	dsgw_emits ("<HTML>" );
 	dsgw_head_begin();
 	dsgw_emitf ("\n<TITLE>%s</TITLE>\n", XP_GetClientStr (DBT_titleNewEntry_));
 	dsgw_emits ("</HEAD>\n"
-		    "<FRAMESET ROWS=*,1>\n");
+		    "<FRAMESET ROWS=\"*,1\">\n");
 	dsgw_emitf ("    <FRAME SRC=\"%s\" NORESIZE>\n", newurl);
 	dsgw_emits ("</FRAMESET>\n"
 		    "</HTML>\n");


Index: tutor.c
===================================================================
RCS file: /cvs/dirsec/dsgw/tutor.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tutor.c	6 Mar 2008 22:00:09 -0000	1.4
+++ tutor.c	20 Mar 2008 02:18:39 -0000	1.5
@@ -219,11 +219,11 @@
         dsgw_send_header();
         dsgw_emits("<TITLE>Directory Server Gateway Help</TITLE>\n");
         dsgw_emits("\n"); 
-        dsgw_emits("<frameset BORDER=0 FRAMEBORDER=NO rows=\"57,*\" "
+        dsgw_emits("<frameset BORDER=\"0\" FRAMEBORDER=\"NO\" rows=\"57,*\" "
 		"onLoad=\"top.master=top.opener.top;top.master.helpwin=self;\" "
 		"onUnload=\"if (top.master) { top.master.helpwin=0; }\">\n" );
-        dsgw_emitf("<frame src=\"%s?file=%s/infonav.html&amp;context=%s\" scrolling=no "
-		   "marginwidth=0 marginheight=0 "
+        dsgw_emitf("<frame src=\"%s?file=%s/infonav.html&amp;context=%s\" scrolling=\"no\" "
+		   "marginwidth=\"0\" marginheight=\"0\" "
 		   "name=\"infobuttons\">\n", dsgw_getvp(DSGW_CGINUM_LANG), DSGW_MANUALSHORTCUT,
 		   context);
         dsgw_emitf("<frame src=\"%s?tutor=!%s&amp;context=%s\" "


Index: unauth.c
===================================================================
RCS file: /cvs/dirsec/dsgw/unauth.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- unauth.c	6 Mar 2008 22:00:09 -0000	1.3
+++ unauth.c	20 Mar 2008 02:18:39 -0000	1.4
@@ -98,7 +98,7 @@
 	"%s"
 	"</FONT>\n"
 	"</CENTER>\n"
-	"<P>\n"
+	"<br>\n"
 	"%s",
 	XP_GetClientStr( DBT_Success_ ),
 	XP_GetClientStr( DBT_YouAreNoLongerAuthenticated_ ));




Index: configure
===================================================================
RCS file: /cvs/dirsec/dsgw/configure,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- configure	6 Mar 2008 22:00:09 -0000	1.18
+++ configure	20 Mar 2008 02:18:39 -0000	1.19
@@ -21394,7 +21394,7 @@
   manualsubdir=
   propertydir=/$PACKAGE_NAME/properties
   # relative to libdir
-  cgibindir=/$PACKAGE_NAME/cgi-bin
+  cgibindir=/$PACKAGE_NAME/dsgw-cgi-bin
   perldir=/$PACKAGE_NAME/perl
 elif test "$with_fhs_opt" = "yes"; then
   # relative to datadir
@@ -21413,7 +21413,7 @@
   # relative to libdir
   perldir=/perl
   # same as server's cgibindir
-  cgibindir=/cgi-bin
+  cgibindir=/dsgw-cgi-bin
 else
   # relative to datadir
   htmldir=/$PACKAGE_BASE_NAME/dsgw/html
@@ -21431,7 +21431,7 @@
   # relative to libdir
   perldir=/$PACKAGE_BASE_NAME/perl
   # CGI program directory
-  cgibindir=/$PACKAGE_BASE_NAME/cgi-bin
+  cgibindir=/$PACKAGE_BASE_NAME/dsgw-cgi-bin
 fi
 
 # relative to instconfigdir
@@ -21440,7 +21440,7 @@
 # relative to $localstatedir
 cookiedir=/run/$PACKAGE_BASE_NAME/dsgw/cookies
 # URIs
-cgiuri=/cgi-bin
+cgiuri=/dsgwcmd
 dsgwuri=/dsgw
 orguri=/org
 pburi=/pb

















From fedora-directory-commits at redhat.com  Thu Mar 20 02:18:42 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 19 Mar 2008 22:18:42 -0400
Subject: [Fedora-directory-commits] dsgw/config/de newentry.html.in, 1.3,
	1.4 search.html.in, 1.3, 1.4
Message-ID: <200803200219.m2K2JC1R032121@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	newentry.html.in search.html.in 
Log Message:
Resolves: bug 435230
Description: Clean up all HTML pages (Gateway, Org Tool, Phonebook, etc)
Fix Description: This is the second pass.  I focused mainly on the
dsgw pages.  Some of the fixes will apply to phonebook too.
I also moved the cgi bin directory to dsgw-cgi-bin - needs to be completely
separate from the admin server cgi bin directory.  There are changes to
dsgw-httpd.conf to reflect this as well as changes to other files.
The dsgw uses a path of dsgwcmd, instead of using cgi-bin directly.  This
is mapped in the dsgw-httpd.conf.
One problem that still remains - HTML Tidy does not like frames and framesets.
The only workaround suggested is to rewrite them using divs.  I'm not really
up to the task right now.
Platforms tested: RHEL5 x86_64
Flag day: Yes - autotool file changes.
Doc: none yet



Index: newentry.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/newentry.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- newentry.html.in	6 Mar 2008 22:00:11 -0000	1.3
+++ newentry.html.in	20 Mar 2008 02:18:40 -0000	1.4
@@ -43,7 +43,7 @@
 <TITLE>Directory Server Gateway Neuer Eintrag</TITLE>
 <!-- DS_NEWENTRY_SCRIPT -->
 </HEAD>
-<FRAMESET ROWS=75,70,* BORDER=0 onLoad="init()">
+<FRAMESET ROWS="75,70,*" BORDER="0" onLoad="init()">
     <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"


Index: search.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/de/search.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- search.html.in	6 Mar 2008 22:00:11 -0000	1.3
+++ search.html.in	20 Mar 2008 02:18:40 -0000	1.4
@@ -43,7 +43,7 @@
 <TITLE>Directory Server Gateway: Standardsuche</TITLE>
 <!-- DS_SEARCH_SCRIPT -->
 </HEAD>
-<FRAMESET ROWS=75,100,* BORDER=0 onLoad="init()">
+<FRAMESET ROWS="75,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>



From fedora-directory-commits at redhat.com  Thu Mar 20 02:18:42 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 19 Mar 2008 22:18:42 -0400
Subject: [Fedora-directory-commits] dsgw/config authPassword.html.in, 1.2,
	1.3 authSearch.html.in, 1.2, 1.3 csearch.html.in, 1.3,
	1.4 csearchAttr.html.in, 1.2, 1.3 csearchBase.html.in, 1.2,
	1.3 csearchMatch.html.in, 1.2, 1.3 csearchString.html.in, 1.2,
	1.3 csearchType.html.in, 1.2, 1.3 display-dc.html.in, 1.2,
	1.3 display-dnedit.html.in, 1.3,
	1.4 display-dneditpeople.html.in, 1.3,
	1.4 display-group.html.in, 1.2, 1.3 display-groupun.html.in,
	1.2, 1.3 display-ntgroup.html.in, 1.2,
	1.3 display-ntperson.html.in, 1.2, 1.3 display-org.html.in,
	1.2, 1.3 display-orgperson.html.in, 1.2,
	1.3 display-orgunit.html.in, 1.2, 1.3 display-person.html.in,
	1.2, 1.3 edit-passwd.html, 1.2, 1.3 list-Anything.html.in, 1.2,
	1.3 list-Auth.html.in, 1.3, 1.4 list-fa-Groups.html.in, 1.2,
	1.3 list-fa-People.html.in, 1.2, 1.3 newentry.html.in, 1.3,
	1.4 newentryName.html.in, 1.2, 1.3 newentryType.html.in, 1.2,
	1.3 search.html.in, 1.3, 1.4 searchString.html.in, 1.2, 1.3
Message-ID: <200803200219.m2K2JCUB032091@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/dsgw/config
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31631/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-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 
	edit-passwd.html list-Anything.html.in list-Auth.html.in 
	list-fa-Groups.html.in list-fa-People.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 the second pass.  I focused mainly on the
dsgw pages.  Some of the fixes will apply to phonebook too.
I also moved the cgi bin directory to dsgw-cgi-bin - needs to be completely
separate from the admin server cgi bin directory.  There are changes to
dsgw-httpd.conf to reflect this as well as changes to other files.
The dsgw uses a path of dsgwcmd, instead of using cgi-bin directly.  This
is mapped in the dsgw-httpd.conf.
One problem that still remains - HTML Tidy does not like frames and framesets.
The only workaround suggested is to rewrite them using divs.  I'm not really
up to the task right now.
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- authPassword.html.in	6 Mar 2008 22:00:10 -0000	1.2
+++ authPassword.html.in	20 Mar 2008 02:18:40 -0000	1.3
@@ -48,16 +48,17 @@
 <!-- DS_AUTH_PASSWORD_BODY -->
 <!-- DS_AUTH_PASSWORD_INFO -->
 <!-- DS_AUTH_PASSWORD_FORM -->
-<P>
+<BR>
 Password for <b>
 <!-- DS_AUTH_PASSWORD_NAME -->
 </b>: <INPUT NAME="password" TYPE="password" SIZE=16>
-<P>
+<BR>
 <CENTER>
 <TABLE BORDER=2 WIDTH=100%>
 <TR>
 <!-- DS_AUTH_PASSWORD_BUTTONS -->
 </TABLE>
+</CENTER>
 </FORM>
 </BODY>
 </HTML>


Index: authSearch.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/authSearch.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- authSearch.html.in	6 Mar 2008 22:00:10 -0000	1.2
+++ authSearch.html.in	20 Mar 2008 02:18:40 -0000	1.3
@@ -50,19 +50,22 @@
 The first step in authenticating to the directory is identifying
 yourself.<br>Please type your name:
 <!-- DS_AUTH_SEARCH_NAME -->
-<P>
+<BR>
 <CENTER>
 <TABLE BORDER=1 WIDTH=100%%>
 <TR>
 <!-- DS_AUTH_SEARCH_BUTTONS -->
 </TABLE>
+</CENTER>
 </FORM>
-<P>
+<BR>
+<CENTER>
 <!-- DS_AUTH_AS_ROOT_FORM -->
 <INPUT TYPE="submit" VALUE="Authenticate as directory manager">&nbsp;(only available to Directory Administrators)
 <INPUT TYPE="hidden" NAME="ldapsizelimit" VALUE="1000">
 <INPUT TYPE="hidden" NAME="ldaptimelimit" VALUE="180">
 <!-- PCONTEXT -->
 </FORM>
+</CENTER>
 </BODY>
 </HTML>


Index: csearch.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/csearch.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- csearch.html.in	6 Mar 2008 22:00:10 -0000	1.3
+++ csearch.html.in	20 Mar 2008 02:18:40 -0000	1.4
@@ -43,13 +43,13 @@
 <TITLE>Directory Server Gateway: Advanced Search</TITLE>
 <!-- DS_CSEARCH_SCRIPT -->
 </HEAD>
-<FRAMESET ROWS=130,40,55,* BORDER=0 onLoad="init()">
+<FRAMESET ROWS="130,40,55,*" BORDER="0" onLoad="init()">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=csearchtitle.html" SCROLLING="NO" NORESIZE>
-    <FRAMESET COLS="25%,75%" BORDER=0>
+    <FRAMESET COLS="25%,75%" BORDER="0">
 	<FRAME SRC="@cgiuri@/csearch?<!-- GCONTEXT -->&amp;file=type" NAME="searchTypeFrame" NORESIZE SCROLLING="NO">
         <FRAME SRC="@cgiuri@/csearch?<!-- GCONTEXT -->&amp;file=base" NAME="searchBaseFrame" NORESIZE SCROLLING="NO">
      </FRAMESET>
-     <FRAMESET COLS="25%, 15%, 60%" BORDER=0>
+     <FRAMESET COLS="25%, 15%, 60%" BORDER="0">
         <FRAME SRC="@cgiuri@/csearch?<!-- GCONTEXT -->&amp;file=attr" NAME="searchAttrFrame" NORESIZE SCROLLING="NO">
 	<FRAME SRC="@cgiuri@/csearch?<!-- GCONTEXT -->&amp;file=match" NAME="searchMatchFrame" NORESIZE SCROLLING="NO">
         <FRAME SRC="@cgiuri@/csearch?<!-- GCONTEXT -->&amp;file=string" NAME="searchStringFrame" SCROLLING="NO">


Index: csearchAttr.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/csearchAttr.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- csearchAttr.html.in	6 Mar 2008 22:00:10 -0000	1.2
+++ csearchAttr.html.in	20 Mar 2008 02:18:40 -0000	1.3
@@ -41,6 +41,7 @@
 <!-- HEAD -->
 <!--csearchAttr.html-->
 <LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
+<TITLE>Advanced Search</TITLE>
 </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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- csearchBase.html.in	6 Mar 2008 22:00:10 -0000	1.2
+++ csearchBase.html.in	20 Mar 2008 02:18:40 -0000	1.3
@@ -41,6 +41,7 @@
 <!-- HEAD -->
 <!--csearchBase.html-->
 <LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
+<TITLE>Advanced Search</TITLE>
 </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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- csearchMatch.html.in	6 Mar 2008 22:00:10 -0000	1.2
+++ csearchMatch.html.in	20 Mar 2008 02:18:40 -0000	1.3
@@ -41,6 +41,7 @@
 <!-- HEAD -->
 <!--csearchMatch.html-->
 <LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
+<TITLE>Advanced Search</TITLE>
 </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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- csearchString.html.in	6 Mar 2008 22:00:10 -0000	1.2
+++ csearchString.html.in	20 Mar 2008 02:18:40 -0000	1.3
@@ -41,16 +41,17 @@
 <!-- HEAD -->
 <!--csearchString.html-->
 <LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
+<TITLE>Advanced Search</TITLE>
 </HEAD>
 <!-- DS_CSEARCH_STRING_BODY -->
 <!-- DS_CSEARCH_STRING_FORM "target=outputFrame" -->
 <TABLE> <TR>
 <TD ALIGN="left"> <INPUT NAME="searchstring" SIZE=20> </TD>
 <TD>
-<NOBR>
-<INPUT TYPE="SUBMIT" VALUE="Search" WIDTH=72>  
+<span style="white-space: nowrap;">
+<INPUT TYPE="SUBMIT" VALUE="Search" style="width:72">  
 <!-- DS_HELP_BUTTON "ASEARCH" -->
-</NOBR> </TD>
+</span> </TD>
 </TR></TABLE>
 <INPUT TYPE="hidden" NAME="ldapsizelimit" VALUE="1000">
 <INPUT TYPE="hidden" NAME="ldaptimelimit" VALUE="180">


Index: csearchType.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/csearchType.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- csearchType.html.in	6 Mar 2008 22:00:10 -0000	1.2
+++ csearchType.html.in	20 Mar 2008 02:18:40 -0000	1.3
@@ -41,6 +41,7 @@
 <!-- HEAD -->
 <!--csearchType.html-->
 <LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
+<TITLE>Advanced Search</TITLE>
 </HEAD>
 <!-- DS_CSEARCH_TYPE_BODY -->
 <!-- DS_CSEARCH_TYPE_FORM -->


Index: display-dc.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/display-dc.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- display-dc.html.in	6 Mar 2008 22:00:10 -0000	1.2
+++ display-dc.html.in	20 Mar 2008 02:18:40 -0000	1.3
@@ -40,7 +40,6 @@
 <HTML>
 <!-- HEAD -->
 <LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
-</head>
 <!-- DS_OBJECTCLASS "value=domain" -->
 
 <!-- DS_ENTRYBEGIN -->
@@ -53,9 +52,9 @@
 </TITLE></HEAD>
 
 <!-- IF "!Displaying" -->
-<body bgcolor="#FFFFFF" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0">
+<body bgcolor="#FFFFFF" style="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">
+<tr style="width:100%" class="bgColor1">
 <TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif" width="10" height="45" border="0"></TD>
 <TD valign="middle" align="left" class="text15" width="100%">Domaincomponent Entry</td>
 </tr>


Index: display-dnedit.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/display-dnedit.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- display-dnedit.html.in	6 Mar 2008 22:00:10 -0000	1.3
+++ display-dnedit.html.in	20 Mar 2008 02:18:40 -0000	1.4
@@ -47,9 +47,9 @@
 </TITLE>
 <LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 </HEAD>
-<body bgcolor="#FFFFFF" "onLoad='document.searchForm.searchstring.focus();'" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0">
+<body bgcolor="#FFFFFF" onLoad="'document.searchForm.searchstring.focus();'" style="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">
+<tr style="width:100%" class="bgColor1">
 <TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif" width="10" height="45" border="0"></TD>
 <TD valign="middle" align="left" class="text15" width="100%">
 Edit
@@ -99,7 +99,7 @@
 </TR>
 </TABLE>
 
-<P>
+<br>
 <TABLE BORDER="2" WIDTH="100%">
 <TR>
 <TD WIDTH="33%" ALIGN="center">


Index: display-dneditpeople.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/display-dneditpeople.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- display-dneditpeople.html.in	6 Mar 2008 22:00:10 -0000	1.3
+++ display-dneditpeople.html.in	20 Mar 2008 02:18:40 -0000	1.4
@@ -48,9 +48,9 @@
 <LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 </HEAD>
 
-<body bgcolor="#FFFFFF" "onLoad='document.searchForm.searchstring.focus();'" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0">
+<body bgcolor="#FFFFFF" onLoad="'document.searchForm.searchstring.focus();'" style="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">
+<tr style="width: 100%" class="bgColor1">
 <TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif" width="10" height="45" border="0"></TD>
 <TD valign="middle" align="left" class="text15" width="100%">
 Edit
@@ -97,7 +97,7 @@
 </TR>
 </TABLE>
 
-<P>
+<BR>
 <TABLE BORDER="2" WIDTH="100%">
 <TR>
 <TD WIDTH="33%" ALIGN="center">


Index: display-group.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/display-group.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- display-group.html.in	6 Mar 2008 22:00:10 -0000	1.2
+++ display-group.html.in	20 Mar 2008 02:18:40 -0000	1.3
@@ -53,9 +53,9 @@
 </HEAD>
 
 <!-- IF "!Displaying" -->
-<body bgcolor="#FFFFFF" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0">
+<body bgcolor="#FFFFFF" style="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">
+<tr style="width:100%" class="bgColor1">
 <TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif" width="10" height="45" border="0"></TD>
 <TD valign="middle" align="left" class="text15" width="100%">Group Entry</td>
 </tr>


Index: display-groupun.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/display-groupun.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- display-groupun.html.in	6 Mar 2008 22:00:10 -0000	1.2
+++ display-groupun.html.in	20 Mar 2008 02:18:40 -0000	1.3
@@ -53,9 +53,9 @@
 </HEAD>
 
 <!-- IF "!Displaying" -->
-<body bgcolor="#FFFFFF" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0">
+<body bgcolor="#FFFFFF" style="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">
+<tr style="width:100%" class="bgColor1">
 <TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif" width="10" height="45" border="0"></TD>
 <TD valign="middle" align="left" class="text15" width="100%">Group Entry</td>
 </tr>


Index: display-ntgroup.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/display-ntgroup.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- display-ntgroup.html.in	6 Mar 2008 22:00:10 -0000	1.2
+++ display-ntgroup.html.in	20 Mar 2008 02:18:40 -0000	1.3
@@ -53,9 +53,9 @@
 </HEAD>
 
 <!-- IF "!Displaying" -->
-<body bgcolor="#FFFFFF" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0">
+<body bgcolor="#FFFFFF" style="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">
+<tr style="width:100%" class="bgColor1">
 <TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif" width="10" height="45" border="0"></TD>
 <TD valign="middle" align="left" class="text15" width="100%">NT Group Entry</td>
 </tr>
@@ -229,7 +229,7 @@
 <TD VALIGN="TOP" NOWRAP>
 <!-- DS_ATTRIBUTE "syntax=bool" "type=radio" "true=Yes" "false=No" "defaultvalue=FALSE" "attr=nTGroupDeleteGroup" -->
 </TD><TD></TD>
-</TD></TR>
+</TR>
 
 <!-- IF "Adding" -->
 <TR>


Index: display-ntperson.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/display-ntperson.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- display-ntperson.html.in	6 Mar 2008 22:00:10 -0000	1.2
+++ display-ntperson.html.in	20 Mar 2008 02:18:40 -0000	1.3
@@ -55,7 +55,7 @@
 <!-- Hide from non-JavaScript-capable browsers
 function showVCard()
 {
-<!-- DS_ATTRIBUTE "attr=_vcard" "options=link" "mimetype=text/x-vcard" "prefix=var cardurl=" "suffix=";" -->
+<!-- DS_ATTRIBUTE "attr=_vcard" "options=link,entities" "mimetype=text/x-vcard" "prefix=var cardurl=" "suffix=";" -->
 
     document.location.href = cardurl;
 }
@@ -87,9 +87,9 @@
 </HEAD>
 
 <!-- IF "!Displaying" -->
-<body bgcolor="#FFFFFF" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0">
+<body bgcolor="#FFFFFF" style="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">
+<tr style="width:100%" class="bgColor1">
 <TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif" width="10" height="45" border="0"></TD>
 <TD valign="middle" align="left" class="text15" width="100%">NT Person Entry</td>
 </tr>
@@ -195,8 +195,12 @@
 <INPUT TYPE="hidden" NAME="add_objectClass" VALUE="nsaimpresence">
 <!-- ENDIF // Adding -->
 
+<INPUT TYPE="hidden" NAME="desc_uid" VALUE="user id">
+<!-- PCONTEXT -->
 <INPUT TYPE="hidden" NAME="quiet" VALUE="true">
 <!-- PCONTEXT -->
+<INPUT TYPE="hidden" NAME="desc_uid" VALUE="user id">
+<!-- PCONTEXT -->
 <!-- DS_STD_COMPLETION_JS -->
 
 <!-- IF "!Displaying" -->
@@ -307,8 +311,6 @@
 <TD VALIGN="TOP" NOWRAP>
 <!-- DS_ATTRIBUTE "attr=uid" "cols=>16" "options=unique" -->
 </TD></TR>
-<INPUT TYPE="hidden" NAME="desc_uid" VALUE="user id">
-<!-- PCONTEXT -->
 
 <TR>
 <TD VALIGN="TOP" NOWRAP
@@ -354,8 +356,6 @@
 <!-- DS_ATTRIBUTE "attr=nTUserDomainId" "syntax=ntuserid" "cols=>16" -->
 <!-- ENDIF // Adding -->
 </TD></TR>
-<INPUT TYPE="hidden" NAME="desc_uid" VALUE="user id">
-<!-- PCONTEXT -->
 
 <TR>
 <TD VALIGN="TOP" NOWRAP
@@ -548,7 +548,7 @@
     class="bold"
 <!-- ENDIF -->
 >Room Number:</TD>
-<TD VALIGN="TOP" NOWRAP">
+<TD VALIGN="TOP" NOWRAP>
 <!-- DS_ATTRIBUTE "attr=roomNumber" "cols=>8" -->
 </TD>
 <TD VALIGN="TOP"


Index: display-org.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/display-org.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- display-org.html.in	6 Mar 2008 22:00:10 -0000	1.2
+++ display-org.html.in	20 Mar 2008 02:18:40 -0000	1.3
@@ -53,9 +53,9 @@
 </HEAD>
 
 <!-- IF "!Displaying" -->
-<body bgcolor="#FFFFFF" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0">
+<body bgcolor="#FFFFFF" style="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">
+<tr style="width:100%" class="bgColor1">
 <TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif" width="10" height="45" border="0"></TD>
 <TD valign="middle" align="left" class="text15" width="100%">Organization Entry</td>
 </tr>


Index: display-orgperson.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/display-orgperson.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- display-orgperson.html.in	6 Mar 2008 22:00:10 -0000	1.2
+++ display-orgperson.html.in	20 Mar 2008 02:18:40 -0000	1.3
@@ -55,7 +55,7 @@
 <!-- Hide from non-JavaScript-capable browsers
 function showVCard()
 {
-<!-- DS_ATTRIBUTE "attr=_vcard" "options=link" "mimetype=text/x-vcard" "prefix=var cardurl=" "suffix=";" -->
+<!-- DS_ATTRIBUTE "attr=_vcard" "options=link,entities" "mimetype=text/x-vcard" "prefix=var cardurl=" "suffix=";" -->
 
     document.location.href = cardurl;
 }
@@ -89,9 +89,9 @@
 </HEAD>
 
 <!-- IF "!Displaying" -->
-<body bgcolor="#FFFFFF" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0">
+<body bgcolor="#FFFFFF" style="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">
+<tr style="width: 100%" class="bgColor1">
 <TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif" width="10" height="45" border="0"></TD>
 <TD valign="middle" align="left" class="text15" width="100%">Person Entry</td>
 </tr>
@@ -188,6 +188,8 @@
 
 </TR></TABLE>
 
+<INPUT TYPE="hidden" NAME="desc_uid" VALUE="user id">
+<!-- PCONTEXT -->
 <!-- IF "Adding" -->
 <INPUT TYPE="hidden" NAME="add_objectClass" VALUE="top">
 <INPUT TYPE="hidden" NAME="add_objectClass" VALUE="person">
@@ -309,8 +311,6 @@
 <TD VALIGN="TOP" NOWRAP>
 <!-- DS_ATTRIBUTE "attr=uid" "cols=>16" "options=unique" -->
 </TD></TR>
-<INPUT TYPE="hidden" NAME="desc_uid" VALUE="user id">
-<!-- PCONTEXT -->
 
 <TR>
 <TD VALIGN="TOP" NOWRAP
@@ -389,7 +389,7 @@
     class="bold"
 <!-- ENDIF -->
 >Room Number:</TD>
-<TD VALIGN="TOP" NOWRAP">
+<TD VALIGN="TOP" NOWRAP>
 <!-- DS_ATTRIBUTE "attr=roomNumber" "cols=>8" -->
 </TD>
 <TD VALIGN="TOP"


Index: display-orgunit.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/display-orgunit.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- display-orgunit.html.in	6 Mar 2008 22:00:10 -0000	1.2
+++ display-orgunit.html.in	20 Mar 2008 02:18:40 -0000	1.3
@@ -53,9 +53,9 @@
 </HEAD>
 
 <!-- IF "!Displaying" -->
-<body bgcolor="#FFFFFF" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0">
+<body bgcolor="#FFFFFF" style="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">
+<tr style="width:100%" class="bgColor1">
 <TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif" width="10" height="45" border="0"></TD>
 <TD valign="middle" align="left" class="text15" width="100%">Organizational Unit Entry</td>
 </tr>


Index: display-person.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/display-person.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- display-person.html.in	6 Mar 2008 22:00:10 -0000	1.2
+++ display-person.html.in	20 Mar 2008 02:18:40 -0000	1.3
@@ -55,7 +55,7 @@
 <!-- Hide from non-JavaScript-capable browsers
 function showVCard()
 {
-<!-- DS_ATTRIBUTE "attr=_vcard" "options=link" "mimetype=text/x-vcard" "prefix=var cardurl=" "suffix=";" -->
+<!-- DS_ATTRIBUTE "attr=_vcard" "options=link,entities" "mimetype=text/x-vcard" "prefix=var cardurl=" "suffix=";" -->
 
     document.location.href = cardurl;
 }
@@ -89,9 +89,9 @@
 </HEAD>
 
 <!-- IF "!Displaying" -->
-<body bgcolor="#FFFFFF" marginheight=0 marginwidth=0 leftmargin="0" topmargin="0" rightmargin="0">
+<body bgcolor="#FFFFFF" style="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">
+<tr style="width:100%" class="bgColor1">
 <TD valign="top" class="bgColor1"><IMG src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif" width="10" height="45" border="0"></TD>
 <TD valign="middle" align="left" class="text15" width="100%">Person Entry</td>
 </tr>


Index: edit-passwd.html
===================================================================
RCS file: /cvs/dirsec/dsgw/config/edit-passwd.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- edit-passwd.html	6 Mar 2008 22:00:10 -0000	1.2
+++ edit-passwd.html	20 Mar 2008 02:18:40 -0000	1.3
@@ -51,13 +51,13 @@
 
 <!-- DS_BEGIN_ENTRYFORM -->
 
-<H2><CENTER>Change password for
+<CENTER><H2>Change password for
 <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
 </H2></CENTER>
 
 <HR>
 
-<P>
+<BR>
 <TABLE>
 
 <!-- IF "BoundAsThisEntry" -->
@@ -91,7 +91,7 @@
 </TD></TR>
 </TABLE>
 
-<P>
+<BR>
 
 <TABLE BORDER=2 WIDTH="100%">
 <TR>


Index: list-Anything.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/list-Anything.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- list-Anything.html.in	6 Mar 2008 22:00:10 -0000	1.2
+++ list-Anything.html.in	20 Mar 2008 02:18:40 -0000	1.3
@@ -35,12 +35,19 @@
  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 -->
 <TITLE>Search for Anything</TITLE>
 <LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
+<SCRIPT type="text/javascript"></SCRIPT> <!-- having this empty script element here allows the code to put all of the javascript here rather than intermingled in the table elements -->
 </head>
 <BODY BGCOLOR="white">
 
+<!-- single-pixel gif to enforce left alignment -->
+<img src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=pixel.gif" height="1" width="1" hspace="20" align="left" border="0">
+
 <!-- IF "FoundEntries" -->
 
 <table width="85%" border="0" cellpadding="0" cellspacing="0" class="bgColor4" align="center">
@@ -148,4 +155,3 @@
 <!-- ENDIF -->
 
 <!-- ENDHTML -->
-


Index: list-Auth.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/list-Auth.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- list-Auth.html.in	6 Mar 2008 22:00:10 -0000	1.3
+++ list-Auth.html.in	20 Mar 2008 02:18:40 -0000	1.4
@@ -78,7 +78,7 @@
 <!-- IF "FoundEntries" -->
 Please click on the name of the entry you would like to use for authentication.
 </P>
-<P>
+<br>
 
 <TABLE BORDER=1 CELLPADDING=4>
 <TR>


Index: list-fa-Groups.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/list-fa-Groups.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- list-fa-Groups.html.in	6 Mar 2008 22:00:10 -0000	1.2
+++ list-fa-Groups.html.in	20 Mar 2008 02:18:40 -0000	1.3
@@ -1,6 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
-    "http://www.w3.org/TR/html4/strict.dtd">
-<html>
 <!-- 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
@@ -38,22 +35,24 @@
  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 -->
 <LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
-<TITLE>Search for People</TITLE>
+<TITLE>Search for Groups</TITLE>
+<!--list-fa-Groups.html-->
 </head>
-</body>
+<body>
 <!-- IF "FoundEntries" -->
 
 <!-- DS_BEGIN_ENTRYFORM -->
-<FORM>
 <!-- DS_ENTRYBEGIN -->
 
 <!-- DS_ENTRYEND -->
 <!-- DS_END_ENTRYFORM -->
-</FORM>
 
 <!-- ELSE -->
 <!-- DS_ALERT_NOENTRIES -->
 <!-- ENDIF -->
-</body>
 <!-- ENDHTML -->


Index: list-fa-People.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/list-fa-People.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- list-fa-People.html.in	6 Mar 2008 22:00:10 -0000	1.2
+++ list-fa-People.html.in	20 Mar 2008 02:18:40 -0000	1.3
@@ -1,6 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
-    "http://www.w3.org/TR/html4/strict.dtd">
-<html>
 <!-- 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
@@ -38,22 +35,24 @@
  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 -->
 <LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 <TITLE>Search for People</TITLE>
+<!--list-fa-People.html-->
 </head>
-</body>
+<body>
 <!-- IF "FoundEntries" -->
 
 <!-- DS_BEGIN_ENTRYFORM -->
-<FORM>
 <!-- DS_ENTRYBEGIN -->
 
 <!-- DS_ENTRYEND -->
 <!-- DS_END_ENTRYFORM -->
-</FORM>
 
 <!-- ELSE -->
 <!-- DS_ALERT_NOENTRIES -->
 <!-- ENDIF -->
-</body>
 <!-- ENDHTML -->


Index: newentry.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/newentry.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- newentry.html.in	6 Mar 2008 22:00:10 -0000	1.3
+++ newentry.html.in	20 Mar 2008 02:18:40 -0000	1.4
@@ -43,7 +43,7 @@
 <TITLE>Directory Server Gateway: New Entry</TITLE>
 <!-- DS_NEWENTRY_SCRIPT -->
 </HEAD>
-<FRAMESET ROWS=130,70,* BORDER=0 onLoad="init()">
+<FRAMESET ROWS="130,70,*" BORDER="0" onLoad="init()">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=newentrytitle.html" NORESIZE SCROLLING="NO">
     <FRAME SRC="@cgiuri@/newentry?<!-- GCONTEXT -->&amp;file=type"
          NAME="newentryTypeFrame" SCROLLING="NO"> 


Index: newentryName.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/newentryName.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- newentryName.html.in	6 Mar 2008 22:00:10 -0000	1.2
+++ newentryName.html.in	20 Mar 2008 02:18:40 -0000	1.3
@@ -41,9 +41,10 @@
 <!-- HEAD -->
 <!--newentryName.html-->
 <LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
+<title>New Entry Name</title>
 </HEAD>
 <!-- DS_NEWENTRY_NAME_BODY -->
-<p>
+<br>
 <!-- DS_NEWENTRY_NAME_FORM -->
 <CENTER> <TABLE WIDTH="85%" CELLPADDING=3 CELLSPACING=3 BORDER=0> <TR> <TD>
 <B>Step 2.</B> Provide a name for the new
@@ -54,7 +55,7 @@
 :
 
 <INPUT TYPE="text" NAME="entryname" SIZE="40">
-<P>
+<br>
 
 <B>Step 3.</B>
 
@@ -63,7 +64,7 @@
 <!-- EVALUATE "entType.fullname" -->
 , or select Other and enter the complete 
 distinguished name where this entry should be added.
-<p>
+<br>
 <!-- DS_NEWENTRY_LOCATION_SELECT -->
 <OPTION VALUE="">Other</OPTION>
 </SELECT>
@@ -72,9 +73,9 @@
 <!--
 <INPUT TYPE="text" NAME="dnsuffix" SIZE="70" onFocus="parent.dnsuffixFocus(this.form)">
 -->
-<TEXTAREA NAME="dnsuffix" ROWS=2 COLS=40 WRAP="soft" onFocus="parent.dnsuffixFocus(this.form)">
+<TEXTAREA NAME="dnsuffix" ROWS=2 COLS=40 onFocus="parent.dnsuffixFocus(this.form)">
 </TEXTAREA>
-<P>
+<br>
 
 <B>Step 4.</B>
 <!-- DS_NEWENTRY_LOCATION_END -->
@@ -82,11 +83,11 @@
 Click Continue.  You will be presented with an editable view 
 of the entry.  When you are done filling in information, 
 save the entry.
-<P>
+<br>
 
-</TD> </TR> <TR> <TD BGCOLOR="#CCCCCC" ALIGN="middle">
+</TD> </TR> <TR> <TD BGCOLOR="#CCCCCC" ALIGN="center">
 
-<INPUT TYPE="submit" VALUE="Continue" WIDTH=72>
+<INPUT TYPE="submit" VALUE="Continue" style="width:72">
 <!-- DS_HELP_BUTTON "ADDING" -->
 <TD> </TR>
 </TABLE> </CENTER>


Index: newentryType.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/newentryType.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- newentryType.html.in	6 Mar 2008 22:00:10 -0000	1.2
+++ newentryType.html.in	20 Mar 2008 02:18:40 -0000	1.3
@@ -41,6 +41,7 @@
 <!-- HEAD -->
 <LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 <!--newentryType.html-->
+<title>New Entry Type</title>
 </head>
 <!-- DS_NEWENTRY_TYPE_BODY -->
 <!-- DS_NEWENTRY_TYPE_FORM -->


Index: search.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/search.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- search.html.in	6 Mar 2008 22:00:10 -0000	1.3
+++ search.html.in	20 Mar 2008 02:18:40 -0000	1.4
@@ -43,7 +43,7 @@
 <TITLE>Directory Server Gateway: Standard Search</TITLE>
 <!-- DS_SEARCH_SCRIPT -->
 </HEAD>
-<FRAMESET ROWS=130,100,* BORDER=0 onLoad="init()">
+<FRAMESET ROWS="130,100,*" BORDER="0" onLoad="init()">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=searchtitle.html" SCROLLING="NO">
     <FRAME SRC="@cgiuri@/search?<!-- GCONTEXT -->&amp;file=string" NAME=searchFrame NORESIZE SCROLLING="NO">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=greeting.html" NAME=outputFrame>


Index: searchString.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/searchString.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- searchString.html.in	6 Mar 2008 22:00:10 -0000	1.2
+++ searchString.html.in	20 Mar 2008 02:18:40 -0000	1.3
@@ -40,6 +40,7 @@
 <HTML>
 <!-- HEAD -->
 <!-- searchString.html -->
+<TITLE>Simple Search</TITLE>
 <LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 </HEAD>
 <!-- DS_SEARCH_BODY -->
@@ -62,7 +63,7 @@
 <TD COLSPAN=3>
 <INPUT NAME="searchstring" SIZE=30>
 
-<INPUT TYPE="SUBMIT" VALUE="Search" WIDTH="72">
+<INPUT TYPE="SUBMIT" VALUE="Search" style="width: 72">
 <!-- DS_HELP_BUTTON "SMARTSEARCH" -->
  </TD>
 </TR> </TABLE>



From fedora-directory-commits at redhat.com  Thu Mar 20 02:18:43 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 19 Mar 2008 22:18:43 -0400
Subject: [Fedora-directory-commits] dsgw/config/es csearch.html.in, 1.3,
	1.4 newentry.html.in, 1.3, 1.4 search.html.in, 1.3, 1.4
Message-ID: <200803200219.m2K2JDFf032126@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	csearch.html.in newentry.html.in search.html.in 
Log Message:
Resolves: bug 435230
Description: Clean up all HTML pages (Gateway, Org Tool, Phonebook, etc)
Fix Description: This is the second pass.  I focused mainly on the
dsgw pages.  Some of the fixes will apply to phonebook too.
I also moved the cgi bin directory to dsgw-cgi-bin - needs to be completely
separate from the admin server cgi bin directory.  There are changes to
dsgw-httpd.conf to reflect this as well as changes to other files.
The dsgw uses a path of dsgwcmd, instead of using cgi-bin directly.  This
is mapped in the dsgw-httpd.conf.
One problem that still remains - HTML Tidy does not like frames and framesets.
The only workaround suggested is to rewrite them using divs.  I'm not really
up to the task right now.
Platforms tested: RHEL5 x86_64
Flag day: Yes - autotool file changes.
Doc: none yet



Index: csearch.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/csearch.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- csearch.html.in	6 Mar 2008 22:00:14 -0000	1.3
+++ csearch.html.in	20 Mar 2008 02:18:40 -0000	1.4
@@ -43,7 +43,7 @@
 <TITLE>Directory Server Gateway : Advanced Search </TITLE>
 <!-- DS_CSEARCH_SCRIPT -->
 </HEAD>
-<FRAMESET ROWS="75,70,70,*" BORDER=0 onLoad="init()">
+<FRAMESET ROWS="75,70,70,*" BORDER="0" onLoad="init()">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=csearchtitle.html" SCROLLING="NO">
     <FRAMESET COLS="35%,42%,*" BORDER=0>
 	<FRAME SRC="@cgiuri@/csearch?<!-- GCONTEXT -->&file=type" NAME="searchTypeFrame" NORESIZE SCROLLING="NO">


Index: newentry.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/newentry.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- newentry.html.in	6 Mar 2008 22:00:14 -0000	1.3
+++ newentry.html.in	20 Mar 2008 02:18:40 -0000	1.4
@@ -43,7 +43,7 @@
 <TITLE>Pasarela de Directory Server: Nueva entrada</TITLE>
 <!-- DS_NEWENTRY_SCRIPT -->
 </HEAD>
-<FRAMESET ROWS=75,70,* BORDER=0 onLoad="init()">
+<FRAMESET ROWS="75,70,*" BORDER="0" onLoad="init()">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=newentrytitle.html" NORESIZE SCROLLING="NO">
     <FRAME SRC="@cgiuri@/newentry?<!-- GCONTEXT -->&file=type"
          NAME="newentryTypeFrame" SCROLLING="NO"> 


Index: search.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/es/search.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- search.html.in	6 Mar 2008 22:00:14 -0000	1.3
+++ search.html.in	20 Mar 2008 02:18:40 -0000	1.4
@@ -43,7 +43,7 @@
 <TITLE>Pasarela de Directory Server: Standard Search</TITLE>
 <!-- DS_SEARCH_SCRIPT -->
 </HEAD>
-<FRAMESET ROWS=75,100,* BORDER=0 onLoad="init()">
+<FRAMESET ROWS="75,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>



From fedora-directory-commits at redhat.com  Thu Mar 20 02:18:43 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 19 Mar 2008 22:18:43 -0400
Subject: [Fedora-directory-commits] dsgw/config/fr csearch.html.in, 1.3,
	1.4 newentry.html.in, 1.3, 1.4 search.html.in, 1.3, 1.4
Message-ID: <200803200219.m2K2JDhH032131@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	csearch.html.in newentry.html.in search.html.in 
Log Message:
Resolves: bug 435230
Description: Clean up all HTML pages (Gateway, Org Tool, Phonebook, etc)
Fix Description: This is the second pass.  I focused mainly on the
dsgw pages.  Some of the fixes will apply to phonebook too.
I also moved the cgi bin directory to dsgw-cgi-bin - needs to be completely
separate from the admin server cgi bin directory.  There are changes to
dsgw-httpd.conf to reflect this as well as changes to other files.
The dsgw uses a path of dsgwcmd, instead of using cgi-bin directly.  This
is mapped in the dsgw-httpd.conf.
One problem that still remains - HTML Tidy does not like frames and framesets.
The only workaround suggested is to rewrite them using divs.  I'm not really
up to the task right now.
Platforms tested: RHEL5 x86_64
Flag day: Yes - autotool file changes.
Doc: none yet



Index: csearch.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/csearch.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- csearch.html.in	6 Mar 2008 22:00:14 -0000	1.3
+++ csearch.html.in	20 Mar 2008 02:18:41 -0000	1.4
@@ -43,9 +43,9 @@
 <TITLE>Directory Server Gateway : Advanced Search </TITLE>
 <!-- DS_CSEARCH_SCRIPT -->
 </HEAD>
-<FRAMESET ROWS=75,70,70,* BORDER=0 onLoad="init()">
+<FRAMESET ROWS="75,70,70,*" BORDER="0" onLoad="init()">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=csearchtitle.html" SCROLLING="NO">
-    <FRAMESET COLS="35%,42%,*" BORDER=0>
+    <FRAMESET COLS="35%,42%,*" BORDER="0">
 	<FRAME SRC="@cgiuri@/csearch?<!-- GCONTEXT -->&file=type" NAME="searchTypeFrame" NORESIZE 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">


Index: newentry.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/newentry.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- newentry.html.in	6 Mar 2008 22:00:14 -0000	1.3
+++ newentry.html.in	20 Mar 2008 02:18:41 -0000	1.4
@@ -43,7 +43,7 @@
 <TITLE>Passerelle Directory Server : New Entry </TITLE>
 <!-- DS_NEWENTRY_SCRIPT -->
 </HEAD>
-<FRAMESET ROWS=75,70,* BORDER=0 onLoad="init()">
+<FRAMESET ROWS="75,70,*" BORDER="0" onLoad="init()">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=newentrytitle.html" NORESIZE SCROLLING="NO">
     <FRAME SRC="@cgiuri@/newentry?<!-- GCONTEXT -->&file=type"
          NAME="newentryTypeFrame" SCROLLING="NO">


Index: search.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/fr/search.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- search.html.in	6 Mar 2008 22:00:14 -0000	1.3
+++ search.html.in	20 Mar 2008 02:18:41 -0000	1.4
@@ -43,7 +43,7 @@
 <TITLE>Passerelle Directory Server : Standard Search</TITLE>
 <!-- DS_SEARCH_SCRIPT -->
 </HEAD>
-<FRAMESET ROWS=75,100,* BORDER=0 onLoad="init()">
+<FRAMESET ROWS="75,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>



From fedora-directory-commits at redhat.com  Thu Mar 20 02:18:43 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 19 Mar 2008 22:18:43 -0400
Subject: [Fedora-directory-commits] dsgw/config/ja csearch.html.in, 1.3,
	1.4 newentry.html.in, 1.3, 1.4 search.html.in, 1.3, 1.4
Message-ID: <200803200219.m2K2JDk4032136@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	csearch.html.in newentry.html.in search.html.in 
Log Message:
Resolves: bug 435230
Description: Clean up all HTML pages (Gateway, Org Tool, Phonebook, etc)
Fix Description: This is the second pass.  I focused mainly on the
dsgw pages.  Some of the fixes will apply to phonebook too.
I also moved the cgi bin directory to dsgw-cgi-bin - needs to be completely
separate from the admin server cgi bin directory.  There are changes to
dsgw-httpd.conf to reflect this as well as changes to other files.
The dsgw uses a path of dsgwcmd, instead of using cgi-bin directly.  This
is mapped in the dsgw-httpd.conf.
One problem that still remains - HTML Tidy does not like frames and framesets.
The only workaround suggested is to rewrite them using divs.  I'm not really
up to the task right now.
Platforms tested: RHEL5 x86_64
Flag day: Yes - autotool file changes.
Doc: none yet



Index: csearch.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/csearch.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- csearch.html.in	6 Mar 2008 22:00:15 -0000	1.3
+++ csearch.html.in	20 Mar 2008 02:18:41 -0000	1.4
@@ -43,9 +43,9 @@
 <TITLE>Directory Server Gateway: Advanced Search</TITLE>
 <!-- DS_CSEARCH_SCRIPT -->
 </HEAD>
-<FRAMESET ROWS="75,70,70,*" BORDER=0 onLoad="init()">
+<FRAMESET ROWS="75,70,70,*" BORDER="0" onLoad="init()">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=csearchtitle.html" SCROLLING="NO">
-    <FRAMESET COLS="33%,33%,*" BORDER=0>
+    <FRAMESET COLS="33%,33%,*" BORDER="0">
 	<FRAME SRC="@cgiuri@/csearch?<!-- GCONTEXT -->&file=type" NAME="searchTypeFrame" NORESIZE 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">


Index: newentry.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/newentry.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- newentry.html.in	6 Mar 2008 22:00:15 -0000	1.3
+++ newentry.html.in	20 Mar 2008 02:18:41 -0000	1.4
@@ -43,7 +43,7 @@
 <TITLE>Directory Server Gateway: New Entry </TITLE>
 <!-- DS_NEWENTRY_SCRIPT -->
 </HEAD>
-<FRAMESET ROWS=75,70,* BORDER=0 onLoad="init()">
+<FRAMESET ROWS="75,70,*" BORDER="0" onLoad="init()">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=newentrytitle.html" NORESIZE SCROLLING="NO">
     <FRAME SRC="@cgiuri@/newentry?<!-- GCONTEXT -->&file=type"
          NAME="newentryTypeFrame" SCROLLING="NO">


Index: search.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config/ja/search.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- search.html.in	6 Mar 2008 22:00:15 -0000	1.3
+++ search.html.in	20 Mar 2008 02:18:41 -0000	1.4
@@ -43,7 +43,7 @@
 <TITLE>Directory Server Gateway: Standard Search </TITLE>
 <!-- DS_SEARCH_SCRIPT -->
 </HEAD>
-<FRAMESET ROWS=75,100,* BORDER=0 onLoad="init()">
+<FRAMESET ROWS="75,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>



From fedora-directory-commits at redhat.com  Thu Mar 20 02:18:43 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 19 Mar 2008 22:18:43 -0400
Subject: [Fedora-directory-commits] dsgw/html auth.html.in, 1.2,
	1.3 authroot.html.in, 1.2, 1.3 authtitle.html.in, 1.2,
	1.3 csearchtitle.html.in, 1.2, 1.3 eduser.html, 1.3,
	1.4 emptyFrame.html, 1.2, 1.3 greeting.html.in, 1.2,
	1.3 index.html.in, 1.2, 1.3 maintitle.html.in, 1.2,
	1.3 newentrytitle.html.in, 1.2, 1.3 searchtitle.html.in, 1.2, 1.3
Message-ID: <200803200219.m2K2JDRZ032142@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	auth.html.in authroot.html.in authtitle.html.in 
	csearchtitle.html.in eduser.html emptyFrame.html 
	greeting.html.in index.html.in maintitle.html.in 
	newentrytitle.html.in searchtitle.html.in 
Log Message:
Resolves: bug 435230
Description: Clean up all HTML pages (Gateway, Org Tool, Phonebook, etc)
Fix Description: This is the second pass.  I focused mainly on the
dsgw pages.  Some of the fixes will apply to phonebook too.
I also moved the cgi bin directory to dsgw-cgi-bin - needs to be completely
separate from the admin server cgi bin directory.  There are changes to
dsgw-httpd.conf to reflect this as well as changes to other files.
The dsgw uses a path of dsgwcmd, instead of using cgi-bin directly.  This
is mapped in the dsgw-httpd.conf.
One problem that still remains - HTML Tidy does not like frames and framesets.
The only workaround suggested is to rewrite them using divs.  I'm not really
up to the task right now.
Platforms tested: RHEL5 x86_64
Flag day: Yes - autotool file changes.
Doc: none yet



Index: auth.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/auth.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- auth.html.in	6 Mar 2008 22:00:17 -0000	1.2
+++ auth.html.in	20 Mar 2008 02:18:41 -0000	1.3
@@ -44,7 +44,7 @@
 </TITLE>
 </HEAD>
 
-<FRAMESET ROWS=130,* BORDER=0>
+<FRAMESET ROWS="130,*" BORDER="0">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=authtitle.html" NAME="authTitleFrame" NORESIZE
 	    SCROLLING="NO">
     <FRAME SRC="@cgiuri@/auth?<!-- GCONTEXT -->" NAME="authFrame" SCROLLING="auto">


Index: authroot.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/authroot.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- authroot.html.in	6 Mar 2008 22:00:17 -0000	1.2
+++ authroot.html.in	20 Mar 2008 02:18:41 -0000	1.3
@@ -43,11 +43,11 @@
 Directory Server Gateway: Authenticate
 </TITLE>
 </HEAD>
-<FRAMESET ROWS=130,* BORDER=0>
+<FRAMESET ROWS="130,*" BORDER="0">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=authtitle.html" NAME="authTitleFrame" NORESIZE
-	    SCROLLING="NO" MARGINHEIGHT=6 MARGINWIDTH=8>
+	    SCROLLING="NO" MARGINHEIGHT="6" MARGINWIDTH="8">
     <FRAME SRC="@cgiuri@/auth?<!-- GCONTEXT -->" NAME="authFrame" 
-NORESIZE SCROLLING="auto" MARGINHEIGHT=8 MARGINWIDTH=8>
+NORESIZE SCROLLING="auto" MARGINHEIGHT="8" MARGINWIDTH="8">
 </FRAMESET>
 <NOFRAMES>
 <H3>Frames-capable browser required</H3>


Index: authtitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/authtitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- authtitle.html.in	6 Mar 2008 22:00:17 -0000	1.2
+++ authtitle.html.in	20 Mar 2008 02:18:41 -0000	1.3
@@ -43,7 +43,7 @@
 <LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 </HEAD>
 
-<body bgcolor="#FFFFFF" marginwidth="0" marginheight="0" leftmargin="0" topmargin="0">
+<body bgcolor="#FFFFFF" style="marginwidth:0; marginheight:0; leftmargin:0; topmargin:0">
 
 <TABLE width="100%" cellspacing="0" cellpadding="0" border="0" class="bgColor4">
   <TR>
@@ -82,7 +82,7 @@
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/search?<!-- GCONTEXT -->" 
                TARGET="_top" onMouseOver="self.status='Standard Search'; return true;"
                onMouseOut="self.status=''; return true;"
-               TITLE="Standard Search" ALT="Standard Search">Standard Search</a></td>
+               TITLE="Standard Search">Standard Search</a></td>
              </tr>
              <tr>
                <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
@@ -105,7 +105,7 @@
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/csearch?<!-- GCONTEXT -->" 
                TARGET="_top" onMouseOver="self.status='Advanced Search'; return true;"
                onMouseOut="self.status=''; return true;"
-               TITLE="Advanced Search" ALT="Advanced Search">Advanced Search</a></td>
+               TITLE="Advanced Search">Advanced Search</a></td>
              </tr>
              <tr>
                <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
@@ -128,7 +128,7 @@
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/newentry?<!-- GCONTEXT -->" 
                 TARGET="_top" onMouseOver="self.status='New Entry'; return true;"
                 onMouseOut="self.status=''; return true;"
-                TITLE="New Entry" ALT="New Entry">New Entry</a></td>
+                TITLE="New Entry">New Entry</a></td>
              </tr>
              <tr>
                <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
@@ -151,7 +151,7 @@
                <td nowrap="true"><A HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=auth.html" 
                 TARGET="_top" onMouseOver="self.status='Authentication'; return true;" 
                 onMouseOut="self.status=''; return true;" TITLE="Authentication" 
-                ALT="Authentication" class="link7">Authentication</a></td>
+                class="link7">Authentication</a></td>
              </tr>
              <tr>
                <td><img border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_bottom.gif"></td>


Index: csearchtitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/csearchtitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- csearchtitle.html.in	6 Mar 2008 22:00:17 -0000	1.2
+++ csearchtitle.html.in	20 Mar 2008 02:18:41 -0000	1.3
@@ -43,7 +43,7 @@
 <LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 </HEAD>
 
-<body bgcolor="#FFFFFF" marginwidth="0" marginheight="0" leftmargin="0" topmargin="0">
+<body bgcolor="#FFFFFF" style="marginwidth:0; marginheight:0; leftmargin:0; topmargin:0">
 
 <TABLE width="100%" cellspacing="0" cellpadding="0" border="0" class="bgColor4">
   <TR>
@@ -82,7 +82,7 @@
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/search?<!-- GCONTEXT -->" 
                TARGET="_top" onMouseOver="self.status='Standard Search'; return true;"
                onMouseOut="self.status=''; return true;"
-               TITLE="Standard Search" ALT="Standard Search">Standard Search</a></td>
+               TITLE="Standard Search">Standard Search</a></td>
              </tr>
              <tr>
                <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
@@ -105,7 +105,7 @@
                <td nowrap="true"><A HREF="@cgiuri@/csearch?<!-- GCONTEXT -->" 
                 TARGET="_top" onMouseOver="self.status='Advanced Search'; return true;" 
                 onMouseOut="self.status=''; return true;" TITLE="Advanced Search" 
-                ALT="Advanced Search" class="link7">Advanced Search</a></td>
+                class="link7">Advanced Search</a></td>
              </tr>
              <tr>
                <td><img border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_bottom.gif"></td>
@@ -130,7 +130,7 @@
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/newentry?<!-- GCONTEXT -->" 
                TARGET="_top" onMouseOver="self.status='New Entry'; return true;"
                onMouseOut="self.status=''; return true;"
-               TITLE="New Entry" ALT="New Entry">New Entry</a></td>
+               TITLE="New Entry">New Entry</a></td>
              </tr>
              <tr>
                <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
@@ -153,7 +153,7 @@
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=auth.html" 
                 TARGET="_top" onMouseOver="self.status='Authentication'; return true;"
                 onMouseOut="self.status=''; return true;"
-                TITLE="Authentication" ALT="Authentication">Authentication</a></td>
+                TITLE="Authentication">Authentication</a></td>
              </tr>
              <tr>
                <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>


Index: eduser.html
===================================================================
RCS file: /cvs/dirsec/dsgw/html/eduser.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eduser.html	6 Mar 2008 22:00:17 -0000	1.3
+++ eduser.html	20 Mar 2008 02:18:41 -0000	1.4
@@ -52,7 +52,7 @@
 
 <b>Edit the user named: </b><INPUT type="text" name="searchstring" value="" size=20>
 </pre>
-<p>
+<br>
 
 <center><table border=2 width=100%>
 <tr>


Index: emptyFrame.html
===================================================================
RCS file: /cvs/dirsec/dsgw/html/emptyFrame.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- emptyFrame.html	6 Mar 2008 22:00:17 -0000	1.2
+++ emptyFrame.html	20 Mar 2008 02:18:41 -0000	1.3
@@ -37,4 +37,4 @@
   END COPYRIGHT BLOCK -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
     "http://www.w3.org/TR/html4/strict.dtd">
-<HTML><BODY BGCOLOR="white"></BODY></HTML>
+<HTML><head><title>Empty Frame</title></head><BODY BGCOLOR="white"></BODY></HTML>


Index: greeting.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/greeting.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- greeting.html.in	6 Mar 2008 22:00:17 -0000	1.2
+++ greeting.html.in	20 Mar 2008 02:18:41 -0000	1.3
@@ -57,7 +57,7 @@
 <TR> <TD COLSPAN=2>
 You are using the Directory Server Gateway.  This interface can be
 used to search for, modify, and create entries that are stored in the Directory Server.
-<P>
+<br>
 You are currently viewing the Standard Search screen, which provides an
 easy and convenient way to search the directory.  Standard Search
 examines what you type and automatically selects one or more methods
@@ -66,7 +66,7 @@
 Search button to quickly locate directory entries.  Click the Help
 button if you need additional assistance.
 
-<P>
+<br>
 The toolbar you see at the top of this window is always available when you
 are using the Directory Server Gateway.  In addition to Standard Search,
 you can click the other buttons to perform a variety of tasks.


Index: index.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/index.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.html.in	6 Mar 2008 22:00:17 -0000	1.2
+++ index.html.in	20 Mar 2008 02:18:41 -0000	1.3
@@ -41,7 +41,7 @@
 <HEAD>
 <TITLE>Directory Server Gateway</TITLE>
 </HEAD>
-<FRAMESET ROWS=130,* BORDER=0>
+<FRAMESET ROWS="130,*" BORDER="0">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=maintitle.html" NAME="buttonBarFrame" NORESIZE
 	    SCROLLING="no">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=greeting.html" NAME="greetingFrame" 


Index: maintitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/maintitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maintitle.html.in	6 Mar 2008 22:00:17 -0000	1.2
+++ maintitle.html.in	20 Mar 2008 02:18:41 -0000	1.3
@@ -43,7 +43,7 @@
 <LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 </HEAD>
 
-<body bgcolor="#FFFFFF" marginwidth="0" marginheight="0" leftmargin="0" topmargin="0">
+<body bgcolor="#FFFFFF" style="marginwidth:0; marginheight:0; leftmargin:0; topmargin:0">
 
 <TABLE width="100%" cellspacing="0" cellpadding="0" border="0" class="bgColor4">
   <TR>
@@ -82,7 +82,7 @@
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/search?<!-- GCONTEXT -->" 
                TARGET="_top" onMouseOver="self.status='Standard Search'; return true;"
                onMouseOut="self.status=''; return true;"
-               TITLE="Standard Search" ALT="Standard Search">Standard Search</a></td>
+               TITLE="Standard Search">Standard Search</a></td>
              </tr>
              <tr>
                <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
@@ -105,7 +105,7 @@
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/csearch?<!-- GCONTEXT -->" 
                TARGET="_top" onMouseOver="self.status='Advanced Search'; return true;"
                onMouseOut="self.status=''; return true;"
-               TITLE="Advanced Search" ALT="Advanced Search">Advanced Search</a></td>
+               TITLE="Advanced Search">Advanced Search</a></td>
              </tr>
              <tr>
                <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
@@ -128,7 +128,7 @@
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/newentry?<!-- GCONTEXT -->" 
                TARGET="_top" onMouseOver="self.status='New Entry'; return true;"
                onMouseOut="self.status=''; return true;"
-               TITLE="New Entry" ALT="New Entry">New Entry</a></td>
+               TITLE="New Entry">New Entry</a></td>
              </tr>
              <tr>
                <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
@@ -151,7 +151,7 @@
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=auth.html" 
                 TARGET="_top" onMouseOver="self.status='Authentication'; return true;"
                 onMouseOut="self.status=''; return true;"
-                TITLE="Authentication" ALT="Authentication">Authentication</a></td>
+                TITLE="Authentication">Authentication</a></td>
              </tr>
              <tr>
                <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>


Index: newentrytitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/newentrytitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- newentrytitle.html.in	6 Mar 2008 22:00:17 -0000	1.2
+++ newentrytitle.html.in	20 Mar 2008 02:18:41 -0000	1.3
@@ -43,7 +43,7 @@
 <LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 </HEAD>
 
-<body bgcolor="#FFFFFF" marginwidth="0" marginheight="0" leftmargin="0" topmargin="0">
+<body bgcolor="#FFFFFF" style="marginwidth:0; marginheight:0; leftmargin:0; topmargin:0">
 
 <TABLE width="100%" cellspacing="0" cellpadding="0" border="0" class="bgColor4">
   <TR>
@@ -82,7 +82,7 @@
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/search?<!-- GCONTEXT -->" 
                TARGET="_top" onMouseOver="self.status='Standard Search'; return true;"
                onMouseOut="self.status=''; return true;"
-               TITLE="Standard Search" ALT="Standard Search">Standard Search</a></td>
+               TITLE="Standard Search">Standard Search</a></td>
              </tr>
              <tr>
                <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
@@ -105,7 +105,7 @@
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/csearch?<!-- GCONTEXT -->" 
                TARGET="_top" onMouseOver="self.status='Advanced Search'; return true;"
                onMouseOut="self.status=''; return true;"
-               TITLE="Advanced Search" ALT="Advanced Search">Advanced Search</a></td>
+               TITLE="Advanced Search">Advanced Search</a></td>
              </tr>
              <tr>
                <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
@@ -128,7 +128,7 @@
                <td nowrap="true"><A HREF="@cgiuri@/newentry?<!-- GCONTEXT -->" 
                 TARGET="_top" onMouseOver="self.status='New Entry'; return true;" 
                 onMouseOut="self.status=''; return true;" TITLE="New Entry" 
-                ALT="New Entry" class="link7">New Entry</a></td>
+                class="link7">New Entry</a></td>
              </tr>
              <tr>
                <td><img border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_bottom.gif"></td>
@@ -153,7 +153,7 @@
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=auth.html" 
                 TARGET="_top" onMouseOver="self.status='Authentication'; return true;"
                 onMouseOut="self.status=''; return true;"
-                TITLE="Authentication" ALT="Authentication">Authentication</a></td>
+                TITLE="Authentication">Authentication</a></td>
              </tr>
              <tr>
                <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>


Index: searchtitle.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/searchtitle.html.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- searchtitle.html.in	6 Mar 2008 22:00:17 -0000	1.2
+++ searchtitle.html.in	20 Mar 2008 02:18:41 -0000	1.3
@@ -43,7 +43,7 @@
 <LINK REL=stylesheet TYPE="text/css" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=style.css">
 </HEAD>
 
-<body bgcolor="#FFFFFF" marginwidth="0" marginheight="0" leftmargin="0" topmargin="0">
+<body bgcolor="#FFFFFF" style="marginwidth:0; marginheight:0; leftmargin:0; topmargin:0">
 
 <TABLE width="100%" cellspacing="0" cellpadding="0" border="0" class="bgColor4">
   <TR>
@@ -82,7 +82,7 @@
                <td nowrap="true"><A HREF="@cgiuri@/search?<!-- GCONTEXT -->" 
                 TARGET="_top" onMouseOver="self.status='Standard Search'; return true;" 
                 onMouseOut="self.status=''; return true;" TITLE="Standard Search" 
-                ALT="Standard Search" class="link7">Standard Search</a></td>
+                class="link7">Standard Search</a></td>
              </tr>
              <tr>
                <td><img border="0" height="1" width="7" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=left_bottom.gif"></td>
@@ -107,7 +107,7 @@
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/csearch?<!-- GCONTEXT -->" 
                TARGET="_top" onMouseOver="self.status='Advanced Search'; return true;"
                onMouseOut="self.status=''; return true;"
-               TITLE="Advanced Search" ALT="Advanced Search">Advanced Search</a></td>
+               TITLE="Advanced Search">Advanced Search</a></td>
              </tr>
              <tr>
                <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
@@ -130,7 +130,7 @@
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/newentry?<!-- GCONTEXT -->" 
                TARGET="_top" onMouseOver="self.status='New Entry'; return true;"
                onMouseOut="self.status=''; return true;"
-               TITLE="New Entry" ALT="New Entry">New Entry</a></td>
+               TITLE="New Entry">New Entry</a></td>
              </tr>
              <tr>
                <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>
@@ -153,7 +153,7 @@
                <td nowrap="true"><a class="link6" HREF="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=auth.html" 
                 TARGET="_top" onMouseOver="self.status='Authentication'; return true;"
                 onMouseOut="self.status=''; return true;"
-                TITLE="Authentication" ALT="Authentication">Authentication</a></td>
+                TITLE="Authentication">Authentication</a></td>
              </tr>
              <tr>
                <td class="bgColor1" colspan="4"><img border="0" height="1" width="4" src="@cgiuri@/lang?<!-- GCONTEXT -->&amp;file=clear.gif"></td>



From fedora-directory-commits at redhat.com  Thu Mar 20 02:18:45 2008
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 19 Mar 2008 22:18:45 -0400
Subject: [Fedora-directory-commits] dsgw/html/de auth.html.in, 1.3,
	1.4 authroot.html.in, 1.3, 1.4 index.html.in, 1.3, 1.4
Message-ID: <200803200219.m2K2JFTs032156@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/dsgw/html/de
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31631/dsgw/html/de

Modified Files:
	auth.html.in authroot.html.in index.html.in 
Log Message:
Resolves: bug 435230
Description: Clean up all HTML pages (Gateway, Org Tool, Phonebook, etc)
Fix Description: This is the second pass.  I focused mainly on the
dsgw pages.  Some of the fixes will apply to phonebook too.
I also moved the cgi bin directory to dsgw-cgi-bin - needs to be completely
separate from the admin server cgi bin directory.  There are changes to
dsgw-httpd.conf to reflect this as well as changes to other files.
The dsgw uses a path of dsgwcmd, instead of using cgi-bin directly.  This
is mapped in the dsgw-httpd.conf.
One problem that still remains - HTML Tidy does not like frames and framesets.
The only workaround suggested is to rewrite them using divs.  I'm not really
up to the task right now.
Platforms tested: RHEL5 x86_64
Flag day: Yes - autotool file changes.
Doc: none yet



Index: auth.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/de/auth.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- auth.html.in	6 Mar 2008 22:00:22 -0000	1.3
+++ auth.html.in	20 Mar 2008 02:18:41 -0000	1.4
@@ -44,7 +44,7 @@
 </TITLE>
 </HEAD>
 
-<FRAMESET ROWS=100,* BORDER=2>
+<FRAMESET ROWS="100,*" BORDER="2">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=authtitle.html" NAME="authTitleFrame" NORESIZE
 	    SCROLLING="NO">
     <FRAME SRC="@cgiuri@/auth?<!-- GCONTEXT -->" NAME="authFrame">


Index: authroot.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/de/authroot.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- authroot.html.in	6 Mar 2008 22:00:22 -0000	1.3
+++ authroot.html.in	20 Mar 2008 02:18:41 -0000	1.4
@@ -43,7 +43,7 @@
 Directory Server Gateway: Beglaubigen
 </TITLE>
 </HEAD>
-<FRAMESET ROWS=100,* BORDER=2>
+<FRAMESET ROWS="100,*" BORDER="2">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=authtitle.html" NAME="authTitleFrame" NORESIZE
 	    SCROLLING="NO">
     <FRAME SRC="@cgiuri@/auth?MANAGER&<!-- GCONTEXT -->" NAME="authFrame">


Index: index.html.in
===================================================================
RCS file: /cvs/dirsec/dsgw/html/de/index.html.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.html.in	6 Mar 2008 22:00:22 -0000	1.3
+++ index.html.in	20 Mar 2008 02:18:41 -0000	1.4
@@ -41,7 +41,7 @@
 <HEAD>
 <TITLE>Directory Server Gateway</TITLE>
 </HEAD>
-<FRAMESET ROWS=100,*>
+<FRAMESET ROWS="100,*">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=maintitle.html" NAME="buttonBarFrame" NORESIZE
 	    SCROLLING="no">
     <FRAME SRC="@cgiuri@/lang?<!-- GCONTEXT -->&file=greeting.html" NAME="greetingFrame" NORESIZE>



From fedora-directory-commits at redhat.com  Wed Mar 26 22:25:51 2008
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 26 Mar 2008 18:25:51 -0400
Subject: [Fedora-directory-commits] 
	ldapserver/ldap/servers/plugins/memberof memberof.c, 1.1, 1.2
Message-ID: <200803262225.m2QMPpEC031609@cvs-int.fedora.redhat.com>

Author: nkinder

Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31579

Modified Files:
	memberof.c 
Log Message:
Resolves: 438891
Summary: Handle updates of memberOf attributes for indirect members when a group is renamed.



Index: memberof.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof/memberof.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- memberof.c	19 Feb 2008 06:04:56 -0000	1.1
+++ memberof.c	26 Mar 2008 22:25:49 -0000	1.2
@@ -1177,7 +1177,17 @@
 
 		strncpy(dn_str, bv->bv_val, (size_t)bv->bv_len);
 
-		memberof_modop_one_r(pb, mod, group_dn, op_this, dn_str, stack);
+		/* If we're doing a replace (as we would in the MODRDN case), we need
+		 * to specify the new group DN value */
+		if(mod == LDAP_MOD_REPLACE)
+		{
+			memberof_modop_one_replace_r(pb, mod, group_dn, op_this, group_dn,
+					dn_str, stack);
+		}
+		else
+		{
+			memberof_modop_one_r(pb, mod, group_dn, op_this, dn_str, stack);
+		}
 
 		hint = slapi_attr_next_value(attr, hint, &val);
 	}



From fedora-directory-commits at redhat.com  Fri Mar 28 20:45:24 2008
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Fri, 28 Mar 2008 16:45:24 -0400
Subject: [Fedora-directory-commits] 
	ldapserver/ldap/servers/plugins/memberof memberof.c, 1.2, 1.3
Message-ID: <200803282045.m2SKjOWK017001@cvs-int.fedora.redhat.com>

Author: nkinder

Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16910

Modified Files:
	memberof.c 
Log Message:
Resolves: 439097
Summary: Handle delete modify of all present member values.  When doing a delete modify, we should treat it the same as a replace when no deletion values are specified.



Index: memberof.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof/memberof.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- memberof.c	26 Mar 2008 22:25:49 -0000	1.2
+++ memberof.c	28 Mar 2008 20:45:22 -0000	1.3
@@ -654,8 +654,19 @@
 				
 				case LDAP_MOD_DELETE:
 					{
-						/* remove group DN from targets */
-						memberof_del_smod_list(pb, dn, smod);
+						/* If there are no values in the smod, we should
+						 * just do a replace instead.  The  user is just
+						 * trying to delete all members from this this
+						 * entry, which the replace code deals with. */
+						if (slapi_mod_get_num_values(smod) == 0)
+						{
+							memberof_replace_list(pb, dn);
+						}
+						else
+						{
+							/* remove group DN from target values in smod*/
+							memberof_del_smod_list(pb, dn, smod);
+						}
 						break;
 					}
 



From fedora-directory-commits at redhat.com  Fri Mar 28 21:45:54 2008
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Fri, 28 Mar 2008 17:45:54 -0400
Subject: [Fedora-directory-commits] 
	ldapserver/ldap/servers/plugins/memberof memberof.c, 1.3, 1.4
Message-ID: <200803282145.m2SLjsic024921@cvs-int.fedora.redhat.com>

Author: nkinder

Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24900

Modified Files:
	memberof.c 
Log Message:
Summary: Avoid adding a group as a memberOf itself.
Resolves: 439450



Index: memberof.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof/memberof.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- memberof.c	28 Mar 2008 20:45:22 -0000	1.3
+++ memberof.c	28 Mar 2008 21:45:52 -0000	1.4
@@ -946,6 +946,27 @@
 	}
 	/* continue with operation */
 	{
+		Slapi_Value *to_dn_val = slapi_value_new_string(op_to);
+		Slapi_Value *this_dn_val = slapi_value_new_string(op_this);
+
+		/* We want to avoid listing a group as a memberOf itself
+		 * in case someone set up a circular grouping.
+		 */
+		if (0 == memberof_compare(&this_dn_val, &to_dn_val))
+		{
+			slapi_log_error( SLAPI_LOG_PLUGIN,
+				MEMBEROF_PLUGIN_SUBSYSTEM,
+				"memberof_modop_one_r: not processing memberOf "
+				"operations  on self entry: %s\n", this_dn_val);
+			slapi_value_free(&to_dn_val);
+			slapi_value_free(&this_dn_val);     
+			goto bail;
+		}
+
+		/* We don't need the Slapi_Value copies of the DN's anymore */
+		slapi_value_free(&to_dn_val);
+		slapi_value_free(&this_dn_val);
+
 		if(stack && LDAP_MOD_DELETE == mod_op)
 		{
 			if(memberof_is_legit_member(pb, group_dn, 
@@ -1012,20 +1033,12 @@
 
 		if(LDAP_MOD_ADD == mod_op)
 		{
-			Slapi_Value *to_dn_val = slapi_value_new_string(op_to);
-			Slapi_Value *this_dn_val = slapi_value_new_string(op_this);
-
 			/* If we failed to update memberOf for op_to, we shouldn't
-			 * try to fix up membership for parent groups.  We also want
-			 * to avoid going into an endless loop if we've hit a
-			 * circular grouping. */
-			if ((rc == 0) && (0 != memberof_compare(&this_dn_val, &to_dn_val))) {
+			 * try to fix up membership for parent groups. */
+			if (rc == 0) {
 				/* fix up membership for groups that are now in scope */
 				memberof_add_membership(pb, op_this, op_to);
 			}
-
-			slapi_value_free(&to_dn_val);
-			slapi_value_free(&this_dn_val);
 		}
 	}