admserv/cfgstuff/httpd-2.2.conf.in | 2 -
admserv/cfgstuff/httpd.conf.in | 2 -
admserv/cgi-src40/head.html | 1
admserv/cgi-src40/help.c | 2 -
admserv/cgi-src40/htmladmin.c | 2 +
admserv/cgi-src40/htmladmin.properties | 42 +++++++++++++++----------------
admserv/cgi-src40/repl-monitor-cgi.pl.in | 37 ++++++++++++++++++---------
admserv/cgi-src40/viewdata.properties | 2 -
admserv/cgi-src40/viewlog.c | 7 ++++-
admserv/cgi-src40/viewlog.properties | 6 ++--
admserv/html/admserv.html.in | 11 ++++----
admserv/html/htmladmin.html.in | 13 ++-------
admserv/html/monreplication.html | 20 ++++++++++----
admserv/html/viewdata.html | 6 +---
admserv/html/viewlog.html | 14 ++--------
include/libadmin/libadmin.h | 2 -
include/libdsa/dsalib.h | 2 -
lib/libadmin/referer.c | 4 +-
lib/libadmin/template.c | 29 ++++++++-------------
lib/libadmin/util.c | 3 --
mod_restartd/mod_restartd-2.2.c | 2 -
21 files changed, 111 insertions(+), 98 deletions(-)
New commits:
commit 95916e3cfbc1f3e30b3f43464456135e9b437712
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Fri Feb 25 17:06:41 2011 -0800
Bug 211296 - Clean up all HTML pages (Admin Express, Repl Monitor, etc)
https://bugzilla.redhat.com/show_bug.cgi?id=211296
Description:
1) Using HTML Validator, reviewed html pages (static as well as
the generated ones) and fixed the errors and warnings.
2) To allow execute perl cgi script repl-monitor-cgi.pl, enabled
AddHandler cgi-script for the extention .pl.
3) repl-monitor-cgi.pl did not pass the parameters sent from
the caller cgi monreplication. This patch fixes the bug.
diff --git a/admserv/cfgstuff/httpd-2.2.conf.in b/admserv/cfgstuff/httpd-2.2.conf.in
index 4561f0b..c9ef421 100644
--- a/admserv/cfgstuff/httpd-2.2.conf.in
+++ b/admserv/cfgstuff/httpd-2.2.conf.in
@@ -551,7 +551,7 @@ AddType application/x-gzip .gz .tgz
# To use CGI scripts outside of ScriptAliased directories:
# (You will also need to add "ExecCGI" to the "Options" directive.)
#
-#AddHandler cgi-script .cgi
+AddHandler cgi-script .pl
#
# For files that include their own HTTP headers:
diff --git a/admserv/cfgstuff/httpd.conf.in b/admserv/cfgstuff/httpd.conf.in
index 197eead..a66eb21 100644
--- a/admserv/cfgstuff/httpd.conf.in
+++ b/admserv/cfgstuff/httpd.conf.in
@@ -561,7 +561,7 @@ AddType application/x-gzip .gz .tgz
# To use CGI scripts outside of ScriptAliased directories:
# (You will also need to add "ExecCGI" to the "Options" directive.)
#
-#AddHandler cgi-script .cgi
+AddHandler cgi-script .pl
#
# For files that include their own HTTP headers:
diff --git a/admserv/cgi-src40/head.html b/admserv/cgi-src40/head.html
index b5a72da..5ae12fc 100644
--- a/admserv/cgi-src40/head.html
+++ b/admserv/cgi-src40/head.html
@@ -1,3 +1,4 @@
+<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\">
<html>
<!--
BEGIN COPYRIGHT BLOCK
diff --git a/admserv/cgi-src40/help.c b/admserv/cgi-src40/help.c
index 4b51d4b..f673492 100644
--- a/admserv/cgi-src40/help.c
+++ b/admserv/cgi-src40/help.c
@@ -425,7 +425,7 @@ oldhelp(char *name[], char *val[], int cnt, char *product, char
*content,
while (p < f + strlen(HEAD_BLOCK))
putchar(*(p++));
- printf("<script language=\"JavaScript1.1\">\n");
+ printf("<script type=\"text/javascript\">\n");
printf("%s=\"%s\";\n", DIR_VAR, product); /* HelpProduct =
product name */
printf("%s=window;\n", HELPWIN_VAR); /* top.helpwin = window */
printf("</script>\n");
diff --git a/admserv/cgi-src40/htmladmin.c b/admserv/cgi-src40/htmladmin.c
index 71e1437..8ed69bf 100644
--- a/admserv/cgi-src40/htmladmin.c
+++ b/admserv/cgi-src40/htmladmin.c
@@ -1708,8 +1708,10 @@ int main(int argc, char *argv[])
ldapInfo = get_adm_ldapinfo(configdir, secdir);
+ /* Fixing html warning: <HEAD> is already emitted.
fprintf(stdout, getResourceString(DBT_MAIN_TOPOLOGY_HEADER),
get_topology_refresh_rate(ldapInfo), view ? viewparam : "");
+ */
if(!get_bindinfo(&binddn, &bindpw))
exit(0);
diff --git a/admserv/cgi-src40/htmladmin.properties
b/admserv/cgi-src40/htmladmin.properties
index 9a93ac0..0b663fc 100644
--- a/admserv/cgi-src40/htmladmin.properties
+++ b/admserv/cgi-src40/htmladmin.properties
@@ -30,13 +30,13 @@ htmladmin3 { "Stopping the Directory Server may impact\\nother
servers that depe
//#/* html resource string - main()*/
htmladmin10 { "Content-type: text/html;charset=utf-8\n\n" }
-htmladmin11 { "<HTML>\n<HEAD>\n<META
HTTP-EQUIV=\"Expires\"CONTENT=\"Tue, 20 Jul 1971 00:00:00
GMT\">\n<META HTTP-EQUIV=\"Content-type\"
CONTENT=\"text/html;charset=utf-8\">\n<TITLE>%s Administration
Express</TITLE>\n</HEAD>\n" }
-htmladmin12 { "<frameset rows=\"62,1*,0\" frameborder=\"NO\"
border=\"0\" cols=\"*\">\n<frame
src=\"HTMLAdmin?op=topframepaint\" frameborder=\"NO\" noresize
scrolling=\"NO\" marginwidth=\"0\" marginheight=0
name=\"top\">\n <frame src=\"HTMLAdmin?op=framepaint" }
-htmladmin13 { "\" name=\"main\" frameborder=\"NO\"
scrolling=\"auto\" marginheight=\"0\"
marginwidth=\"0\">\n<frame src=\"HTMLAdmin?op=empty\"
name=\"messagewin\" frameborder=\"NO\"
scrolling=\"NO\">\n</frameset>\n<BODY
bgcolor=\"#FFFFFF\">\n</BODY>\n\"" }
+htmladmin11 { "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML
4.01//EN\"><HTML>\n<HEAD>\n<META
HTTP-EQUIV=\"Expires\"CONTENT=\"Tue, 20 Jul 1971 00:00:00
GMT\">\n<META HTTP-EQUIV=\"Content-type\"
CONTENT=\"text/html;charset=utf-8\">\n<TITLE>%s Administration
Express</TITLE>\n</HEAD>\n" }
+htmladmin12 { "<frameset rows=\"62,1*,0\"
cols=\"*\">\n<frame src=\"HTMLAdmin?op=topframepaint\"
frameborder=0 noresize scrolling=\"NO\" marginwidth=\"0\"
marginheight=0 name=\"top\">\n <frame
src=\"HTMLAdmin?op=framepaint" }
+htmladmin13 { "\" name=\"main\" frameborder=0
scrolling=\"auto\" marginheight=\"0\"
marginwidth=\"0\">\n<frame src=\"HTMLAdmin?op=empty\"
name=\"messagewin\" frameborder=0
scrolling=\"NO\">\n</frameset>\n<BODY
bgcolor=\"#FFFFFF\">\n</BODY>\n\"" }
htmladmin14 { "<BODY bgcolor = #FFFFFF>\n</BODY>\n" }
-htmladmin15 { "<frameset rows=\"40,1*\" border=\"0\"
cols=\"*\">\n<frame src=\"HTMLAdmin?op=viewselect" }
-htmladmin16 { "\" name=\"custom\" frameborder=\"NO\"
scrolling=\"NO\" marginheight=\"0\"
marginwidth=\"0\">\n<frame src=\"HTMLAdmin?op=status" }
-htmladmin17 { "\" scrolling=\"auto\" name=\"topology\"
marginheight=\"0\" marginwidth=\"0\">\n</frameset>\n <BODY
bgcolor=\"#FFFFFF\">\n </BODY>\n" }
+htmladmin15 { "<frameset rows=\"40,1*\"
cols=\"*\">\n<frame src=\"HTMLAdmin?op=viewselect" }
+htmladmin16 { "\" name=\"custom\" frameborder=0
scrolling=\"NO\" marginheight=\"0\"
marginwidth=\"0\">\n<frame src=\"HTMLAdmin?op=status" }
+htmladmin17 { "\" frameborder=0 scrolling=\"auto\"
name=\"topology\" marginheight=\"0\"
marginwidth=\"0\">\n</frameset>\n <BODY
bgcolor=\"#FFFFFF\">\n </BODY>\n" }
htmladmin18 { "<BODY bgcolor=\"#cccccc\" link=\"black\"
vlink=\"black\" alink=\"#333366\"
text=\"black\">\n<form method=GET action=\"HTMLAdmin\"
target=\"_top\">\n<table border=\"0\"
cellspacing=\"0\"
cellpadding=\"0\">\n<tr>\n<td>\n<font size=\"2\"
FACE=\"Helvetica, Arial,
Sans-serif\"> View: \n<select name=view
onChange=\"form.submit()\">\n" }
htmladmin19 { "<option value=\"%s\"%s>%s</option>\n" }
htmladmin20 { " selected" }
@@ -62,47 +62,47 @@ htmladmin51 { "POST /%s/tasks/operation/Start HTTP/1.0\nHost:
%s:%d\nAuthorizati
htmladmin52 { "GET /%s/tasks/operation/Start HTTP/1.0\nAuthorization: Basic
%s\n\n" }
htmladmin53 { "<H2>Server Error</H2>\n<p>The server could not be
started. Please reload the page and check the error logs for more details." }
//#/* html resource string - output_topology() */
-htmladmin60 { "<SCRIPT LANGUAGE=JavaScript>\n<!--\nfunction confirm_stop()
{\n if(confirm('%s'))\n return true;\n else\n return false;\n}\n\nfunction
confirm_admin_stop() {\n if(confirm('%s'))\n return true;\n else\n return
false;\n}\nfunction confirm_directory_stop() {\n if(confirm('%s'))\n return
true;\n else\n return false;\n}\n//-->\n</SCRIPT>\n\n" }
-htmladmin61 { "<table border=0 cellpadding=0 cellspacing=0 cols=2 width=100%%
bgcolor=\"#CCCCCC\">\n" }
+htmladmin60 { "<SCRIPT type=\"text/javascript\">\n<!--\nfunction
confirm_stop() {\n if(confirm('%s'))\n return true;\n else\n return
false;\n}\n\nfunction confirm_admin_stop() {\n if(confirm('%s'))\n return
true;\n else\n return false;\n}\nfunction confirm_directory_stop() {\n
if(confirm('%s'))\n return true;\n else\n return
false;\n}\n//-->\n</SCRIPT>\n\n" }
+htmladmin61 { "<table border=0 cellpadding=0 cellspacing=0 width=100%%
bgcolor=\"#CCCCCC\"><colgroup><col><col
span=\"2\"></colgroup>\n" }
htmladmin62 { "<tr>\n<td colspan=2 BGCOLOR=\"#666699\"><img
src=\"/icons/domain16.gif\" BORDER=0 height=16 width=16><font
face=\"Helvetica, Arial, Sans-serif\"><font
color=\"#FFFFFF\"><font
size=-1> %s</font></font></font></td>\n</tr>\n\n"
}
htmladmin63 { "<tr>\n<td colspan=2 BGCOLOR=\"#999999\"><img
src=\"/icons/host.gif\" BORDER=0 height=16 width=16><font
face=\"Helvetica, Arial, Sans-serif\"><font
color=\"#FFFFFF\"><font
size=-1> %s</font></font></font></td>\n</tr>\n\n"
}
htmladmin64 { "<tr>\n<td colspan=2><img
src=\"/icons/16space.gif\" BORDER=0 height=16 width=16><img
src=\"/icons/group2.gif\" BORDER=0 height=16 width=16><font
face=\"Helvetica, Arial, Sans-serif\"><font
color=\"#000000\"><font
size=-1> %s</font></font></font></td>\n</tr>\n\n"
}
htmladmin65 { "<tr>\n<td colspan=2><img
src=\"/icons/16space.gif\" BORDER=0 height=16 width=32><img
src=\"/icons/%s\" BORDER=0 height=16 width=16><font face=\"Helvetica,
Arial, Sans-serif\"><font
size=-1> %s%s</font></font></td>\n</tr>\n\n" }
htmladmin66 { "<tr>\n<td><img src=\"/icons/16space.gif\"
BORDER=0 height=16 width=48>\n<font face=\"Helvetica, Arial,
Sans-serif\"><font size=-1><b><font
color=\"#666699\">*</font></b> <b>%s</b></font></font></td>\n<td><font
face=\"Helvetica, Arial, Sans-serif\"><font size=-1> <A
HREF=\"%s\" target=_new>Server
Manager</A></font></font></td>\n</tr>\n\n\"" }
htmladmin67 { "<tr>\n<td><img src=\"/icons/16space.gif\"
BORDER=0 height=16 width=48>\n<font face=\"Helvetica, Arial,
Sans-serif\"><font size=-1><b><font
color=\"#666699\">*</font></b> <b>%s</b></font></font></td>\n\n<td>\n<p
align=\"right\">\n\n" }
-htmladmin68 { " <A
HREF=\"%s/admin-serv/tasks/operation/Stop?return_format=html\"
onclick=\"return confirm_admin_stop()\"><IMG
SRC=\"/icons/togon.gif\" border=0 align=ABSCENTER></A>" }
-htmladmin69 { " <A
HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return
confirm_admin_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0
align=ABSCENTER></A>" }
+htmladmin68 { " <A
HREF=\"%s/admin-serv/tasks/operation/Stop?return_format=html\"
onclick=\"return confirm_admin_stop()\"><IMG
SRC=\"/icons/togon.gif\" border=0 style=\"vertical-align:
center;\"></A>" }
+htmladmin69 { " <A
HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return
confirm_admin_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0
style=\"vertical-align: center;\"></A>" }
htmladmin70 { "<A
HREF=\"%s/admin-serv/tasks/configuration/ViewData?sie=%s\"
target=\"main\">Server Info</A> <font
color=\"#FFFFFF\">|</font>\n" }
htmladmin71 { "<A
HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s\"
target=\"main\">Logs</A> <font
color=\"#FFFFFF\">|</font>\n" }
htmladmin72 { "<font face=\"Helvetica, Arial, Sans-serif\"><font
size=-1>%s%s Status=<b>%s</b>%s</font></font>\n\n"
}
htmladmin73 { "On" }
htmladmin74 { "Off" }
htmladmin75 { "Unknown" }
-htmladmin76 { " <A
HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return
confirm_directory_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0
align=ABSCENTER></A>" }
-htmladmin77 { " <A
HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG
SRC=\"/icons/togoff.gif\" border=0 align=ABSCENTER></A>" }
+htmladmin76 { " <A
HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return
confirm_directory_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0
style=\"vertical-align: center;\"></A>" }
+htmladmin77 { " <A
HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG
SRC=\"/icons/togoff.gif\" border=0 style=\"vertical-align:
center;\"></A>" }
htmladmin78 { "<A
HREF=\"%s/admin-serv/tasks/configuration/ViewData?sie=%s\"
target=\"main\">Server Info</A> <font
color=\"#FFFFFF\">|</font>\n" }
htmladmin79 { "<A
HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s\"
target=\"main\">Logs</A> <font
color=\"#FFFFFF\">|</font>\n" }
htmladmin80 { "<A
HREF=\"%s/admin-serv/tasks/configuration/ViewData?sie=%s\"
target=\"main\">Server Info</A> <font
color=\"#FFFFFF\">|</font>\n" }
htmladmin81 { "<A
HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s\"
target=\"main\">Logs</A>\n" }
htmladmin82 { "<font face=\"Helvetica, Arial, Sans-serif\"><font
size=-1>%s%s</font></font>\n\n" }
htmladmin83 { "<tr>\n<td>\n<table BORDER=0 CELLSPACING=0
CELLPADDING=0>\n<tr>\n<td><img src=\"/icons/16space.gif\"
BORDER=0 height=16 width=64></td>\n\n<td>\n<table BORDER=0 CELLSPACING=0
CELLPADDING=0 COLS=1 WIDTH=\"100%%\">\n<tr>\n<td><font
face=\"Helvetica, Arial, Sans-serif\"><font size=-1><b><font
color=\"#666699\">*</font></b>b <b>%s</b></font></font></td>\n</tr>\n</table>\n</td>\n\n"
}
-htmladmin84 { " <A
HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return
confirm_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0
align=ABSCENTER></A>" }
-htmladmin85 { " <A
HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG
SRC=\"/icons/togoff.gif\" border=0 align=ABSCENTER></A>" }
+htmladmin84 { " <A
HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return
confirm_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0
style=\"vertical-align: center;\"></A>" }
+htmladmin85 { " <A
HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG
SRC=\"/icons/togoff.gif\" border=0 style=\"vertical-align:
center;\"></A>" }
htmladmin86 { "<font face=\"Helvetica, Arial, Sans-serif\"><font
size=-1> Status=<b>%s</b>%s</font></font>\n\n" }
-htmladmin87 { " <A
HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return
confirm_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0
align=ABSCENTER></A>" }
-htmladmin88 { " <A
HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG
SRC=\"/icons/togoff.gif\" border=0 align=ABSCENTER></A>" }
+htmladmin87 { " <A
HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return
confirm_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0
style=\"vertical-align: center;\"></A>" }
+htmladmin88 { " <A
HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG
SRC=\"/icons/togoff.gif\" border=0 style=\"vertical-align:
center;\"></A>" }
htmladmin89 { "<A
HREF=\"%s/admin-serv/tasks/configuration/ViewData?sie=%s\"
target=\"main\">Server Info</A> <font
color=\"#FFFFFF\">|</font>\n" }
htmladmin90 { "<A
HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s\"
target=\"main\">Logs</A> <font
color=\"#FFFFFF\">|</font>\n" }
-htmladmin91 { " <A
HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return
confirm_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0
align=ABSCENTER></A>" }
-htmladmin92 { " <A
HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG
SRC=\"/icons/togoff.gif\" border=0 align=ABSCENTER></A>" }
+htmladmin91 { " <A
HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return
confirm_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0
style=\"vertical-align: center;\"></A>" }
+htmladmin92 { " <A
HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG
SRC=\"/icons/togoff.gif\" border=0 style=\"vertical-align:
center;\"></A>" }
htmladmin93 { "<A
HREF=\"%s/admin-serv/tasks/configuration/ViewData?sie=%s\"
target=\"main\">Server Info</A> <font
color=\"#FFFFFF\">|</font>\n" }
htmladmin94 { "<A
HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s\"
target=\"main\">Logs</A> <font
color=\"#FFFFFF\">|</font>\n" }
-htmladmin95 { " <A
HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return
confirm_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0
align=ABSCENTER></A>" }
-htmladmin96 { " <A
HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG
SRC=\"/icons/togoff.gif\" border=0 align=ABSCENTER></A>" }
+htmladmin95 { " <A
HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return
confirm_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0
style=\"vertical-align: center;\"></A>" }
+htmladmin96 { " <A
HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG
SRC=\"/icons/togoff.gif\" border=0 style=\"vertical-align:
center;\"></A>" }
htmladmin97 { "<td><font face=\"Helvetica, Arial,
Sans-serif\"><font size=-1><A
HREF=\"%s/admin-serv/tasks/configuration/ViewData?sie=%s\"
target=\"main\">Server Info</A> <font
color=\"#FFFFFF\">|</font></font></font></td>\n"
}
htmladmin98 { "<td><font face=\"Helvetica, Arial,
Sans-serif\"><font size=-1><A
HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s\"
target=\"main\">Logs</A> <font
color=\"#FFFFFF\">|</font></font></font></td>\n"
}
htmladmin99 { "</p>\n</td>\n</tr>\n\n" }
htmladmin100 { "<font face=\"Helvetica, Arial, Sans-serif\"><font
size=-1>%s%s%s Status=<b>%s</b>%s</font></font>\n\n"
}
-htmladmin101 { "<A
HREF=\"%s/admin-serv/tasks/configuration/MonReplication?servhost=%s&servport=%d&admurl=%s\"
target=\"main\">Replication Status</A> <font
color=\"#FFFFFF\">|</font>\n" }
+htmladmin101 { "<A
HREF=\"%s/admin-serv/tasks/configuration/MonReplication?servhost=%s&servport=%d&admurl=%s\"
target=\"main\">Replication Status</A> <font
color=\"#FFFFFF\">|</font>\n" }
}
diff --git a/admserv/cgi-src40/repl-monitor-cgi.pl.in
b/admserv/cgi-src40/repl-monitor-cgi.pl.in
index b379ab6..5529454 100755
--- a/admserv/cgi-src40/repl-monitor-cgi.pl.in
+++ b/admserv/cgi-src40/repl-monitor-cgi.pl.in
@@ -43,24 +43,37 @@ use CGI;
my $query = CGI->new;
@ARGV = (); # clear it out
-my $configfile;
-if ($ENV{DS_CONFIG_DIR} and -d $ENV{DS_CONFIG_DIR}) {
- $configfile = "$ENV{DS_CONFIG_DIR}/@instancename(a)/replmon.conf";
-} elsif ("@instconfigdir@" and -d "@instconfigdir@") {
- $configfile = "@instconfigdir(a)/replmon.conf";
+if ( $query->url_param('configfile') eq "" ) {
+ my $configfile;
+ if ($ENV{DS_CONFIG_DIR} and -d $ENV{DS_CONFIG_DIR}) {
+ $configfile = "$ENV{DS_CONFIG_DIR}/@instancename(a)/replmon.conf";
+ } elsif ("@instconfigdir@" and -d "@instconfigdir@") {
+ $configfile = "@instconfigdir(a)/replmon.conf";
+ }
+ push @ARGV, '-f', $configfile;
+} else {
+ push @ARGV, '-f', $query->url_param('configfile');
}
-push @ARGV, '-f', $configfile;
-
my $refreshinterval = $query->url_param('refreshinterval') ?
int($query->url_param('refreshinterval')) : "300";
push @ARGV, '-t', $refreshinterval;
-my $admurl = "http://";
-if ($ENV{HTTPS} and (lc($ENV{HTTPS}) eq "on")) {
- $admurl = "https://";
+if ( $query->url_param('admurl') eq "" ) {
+ my $admurl = "http://";
+ if ($ENV{HTTPS} and (lc($ENV{HTTPS}) eq "on")) {
+ $admurl = "https://";
+ }
+ $admurl .= $ENV{HTTP_HOST} . $ENV{SCRIPT_NAME} .
"?refreshinterval=$refreshinterval";
+ push @ARGV, '-u', $admurl;
+} else {
+ push @ARGV, '-u', $query->url_param('admurl');
+}
+if ( $query->url_param('servhost') ne "" ) {
+ push @ARGV, '-h', $query->url_param('servhost');
+}
+if ( $query->url_param('servport') ne "" ) {
+ push @ARGV, '-p', $query->url_param('servport');
}
-$admurl .= $ENV{HTTP_HOST} . $ENV{SCRIPT_NAME} .
"?refreshinterval=$refreshinterval";
-push @ARGV, '-u', $admurl;
# Now the real work
require "@bindir(a)/repl-monitor.pl";
diff --git a/admserv/cgi-src40/viewdata.properties
b/admserv/cgi-src40/viewdata.properties
index fd1a57e..d04742f 100644
--- a/admserv/cgi-src40/viewdata.properties
+++ b/admserv/cgi-src40/viewdata.properties
@@ -37,7 +37,7 @@ viewdata29 { "<tr>\n<td>\n<div
align=right><font face=\"helvetica, arial, sans-s
viewdata30 { "<tr>\n<td>\n<div align=right><font
face=\"helvetica, arial, sans-serif\"><font
size=-1>Description:</font></font></div>\n</td>\n<td><font
face=\"helvetica, arial, sans-serif\"><font
size=-1>%s</font></font></td>\n</tr>\n" }
viewdata31 { "<table BORDER=0 CELLSPACING=6 CELLPADDING=0>\n" }
viewdata32 { "</table>\n" }
-viewdata33 { "<tr>\n<td><font size=+1 font face=\"helvetica,
arial,
sans-serif\"><b>%s</b></font></td>\n</tr>\n<tr>\n<td
BACKGROUND=\"/icons/hr.gif\"><font
face=\"Verdana\"> </font></td>\n</tr>\n<tr><td>"
}
+viewdata33 { "<tr>\n<td><font size=+1 face=\"helvetica, arial,
sans-serif\"><b>%s</b></font></td>\n</tr>\n<tr>\n<td
style=\"background-image:url(/icons/hr.gif)\"><font
face=\"Verdana\"> </font></td>\n</tr>\n<tr><td>"
}
viewdata34 { "<font face=\"helvetica, arial, sans-serif\"><font
size=-1><A HREF=\"%s\" target=\"new\">Upgrade
Available</A></font></font>\n" }
viewdata35 { "<font face=\"helvetica, arial, sans-serif\"><font
size=-1>No Upgrade Available</font></font>\n" }
viewdata36 { "<font face=\"helvetica, arial, sans-serif\"><font
size=-1><A HREF=\"%s\"
target=\"new\">%s</A></font></font>\n" }
diff --git a/admserv/cgi-src40/viewlog.c b/admserv/cgi-src40/viewlog.c
index 6ec93f2..2eff9c2 100644
--- a/admserv/cgi-src40/viewlog.c
+++ b/admserv/cgi-src40/viewlog.c
@@ -84,6 +84,8 @@
#define DBT_MAIN_ID_TITLE resource_key(RESOURCE_FILE, "26")
#define DBT_MAIN_WIDTH resource_key(RESOURCE_FILE, "27")
#define DBT_MAIN_TABLE resource_key(RESOURCE_FILE, "28")
+#define DBT_MAIN_TABLE_FONT resource_key(RESOURCE_FILE, "29")
+#define DBT_MAIN_TABLE_FONT_CLOSE resource_key(RESOURCE_FILE, "30")
static char *acceptLanguage = (char*)"en";
static Resource *i18nResource = NULL;
@@ -442,13 +444,16 @@ int main(int argc, char *argv[])
fprintf(stdout, (const char*)getResourceString(DBT_MAIN_TABLE),
tmp);
+ fprintf(stdout, getResourceString(DBT_MAIN_TABLE_FONT));
/* begin search */
if(cmd) {
search_file(cmd, atoi(num), str);
fclose(cmd);
}
- } else
+ fprintf(stdout, getResourceString(DBT_MAIN_TABLE_FONT_CLOSE));
+ } else {
fputs(line, stdout);
+ }
}
}
} else {
diff --git a/admserv/cgi-src40/viewlog.properties b/admserv/cgi-src40/viewlog.properties
index 6409d12..da77cc4 100644
--- a/admserv/cgi-src40/viewlog.properties
+++ b/admserv/cgi-src40/viewlog.properties
@@ -42,8 +42,10 @@ viewlog22 { "<option value=%s>%s\n" }
viewlog23 { "<option value=No log files>No log files\n" }
viewlog24 { "</select>" }
viewlog25 { "<input type=\"hidden\" name=\"id\"
value=\"%s\">\n" }
-viewlog26 { "<table BORDER=0 CELLSPACING=2 CELLPADDING=2
WIDTH=\"100%%\">\n<tr>\n<td><font size=+1 font
face=\"helvetica, arial, sans-serif\"><b>%s
Logs</b></font></td>\n</tr>\n<tr>\n<td
BACKGROUND=\"/icons/hr.gif\"> </td>\n</tr>\n<tr><td></table>\n"
}
+viewlog26 { "<table BORDER=0 CELLSPACING=2 CELLPADDING=2
WIDTH=\"100%%\">\n<tr>\n<td><font size=+1
face=\"helvetica, arial, sans-serif\"><b>%s
Logs</b></font></td>\n</tr>\n<tr>\n<td
style=\"background-image:url(/icons/hr.gif)\"> </td>\n</tr>\n<tr><td></table>\n"
}
viewlog27 { "<hr width=50%%>\n" }
-viewlog28 { "<table border=1
width=100%%><tr><th>%s</th></tr></table>\n" }
+viewlog28 { "<table border=1 width=100%%><tr><th><font
face=\"PrimaSans BT, Verdana,
sans-serif\">%s</font></th></tr></table>\n" }
+viewlog29 { "<pre><font face=\"PrimaSans BT, Verdana,
sans-serif\" size=-1>\n" }
+viewlog30 { "</font></pre>\n" }
}
diff --git a/admserv/html/admserv.html.in b/admserv/html/admserv.html.in
index f01bf17..6b4ecdd 100644
--- a/admserv/html/admserv.html.in
+++ b/admserv/html/admserv.html.in
@@ -20,10 +20,11 @@
END COPYRIGHT BLOCK
-->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html>
<head>
<title>@capbrand@ Management Console</title>
-<meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html;
charset=utf-8">
</head>
<body bgcolor="#FFFFFF" link="#666699" vlink="#666699"
alink="#333366">
@@ -73,8 +74,8 @@
<tr valign="TOP">
<td><img src="/icons/goto.gif" width="10"
height="15"> </td>
<td><font face="Verdana, sans-serif"><a
href='@vendorurl@'>@vendor@ Home Page</a></font><font
size="-1" face="Verdana, sans-serif"><br>
- Check for upgrades and information about @capbrand@ server
products.</font><font size="-1" face="Verdana,
sans-serif">
- </font></td>
+ Check for upgrades and information about @capbrand@ server
products.</font>
+ </td>
</tr>
<tr valign="TOP">
<td> </td>
@@ -84,8 +85,8 @@
<td><img src="/icons/goto.gif" width="10"
height="15"> </td>
<td><font face="Verdana, sans-serif"><a
href='/admin-serv/tasks/configuration/HTMLAdmin?op=index'>@capbrand@
Administration Express</a></font><font size="-1"
face="Verdana, sans-serif"><br>
- View server status and configuration/log data.</font><font
size="-1" face="Verdana, sans-serif">
- </font></td>
+ View server status and configuration/log data.</font>
+ </td>
</tr>
<tr valign="TOP">
<td> </td>
diff --git a/admserv/html/htmladmin.html.in b/admserv/html/htmladmin.html.in
index 95822b6..42dc57b 100644
--- a/admserv/html/htmladmin.html.in
+++ b/admserv/html/htmladmin.html.in
@@ -20,11 +20,8 @@
END COPYRIGHT BLOCK
-->
-<html>
-<head>
-<title></title>
-</head>
-<SCRIPT language="javascript">
+<body text="#FFFFFF" bgcolor="#666699" link="#FFFFFF"
vlink="#FFFFFF" alink="#333366">
+<SCRIPT TYPE="text/javascript">
<!--
function home_onMouseDown(evt)
{
@@ -50,7 +47,6 @@ function home_onMouseDown(evt)
//-->
</SCRIPT>
-<body text="#FFFFFF" bgcolor="#666699" link="#FFFFFF"
vlink="#FFFFFF" alink="#333366">
<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%"
BGCOLOR="#666699" >
<tr>
<td WIDTH="100%">
@@ -65,7 +61,7 @@ function home_onMouseDown(evt)
Express</font></font></b></td>
<td ALIGN=RIGHT NOWRAP>
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 COLS=1 WIDTH="100%" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 STYLE="COLS: 1"
WIDTH="100%" >
<tr>
<td ALIGN=RIGHT WIDTH="100"></td>
</tr>
@@ -80,10 +76,9 @@ Express</font></font></b></td>
<td>
<!-- HELPLINK -->
-<img SRC="/icons/help.gif" height=25 width=27 align=TEXTTOP
border=0><br><font face="PrimaSans BT, Verdana,
sans-serif"><font size=-1>Help</A></font></font>
+<img SRC="/icons/help.gif" height=25 width=27 border=0><br><font
face="PrimaSans BT, Verdana, sans-serif"><font
size=-1>Help</font></font></A>
</td>
</tr>
</table>
</body>
-</html>
diff --git a/admserv/html/monreplication.html b/admserv/html/monreplication.html
index e69c53c..cfc4fe9 100644
--- a/admserv/html/monreplication.html
+++ b/admserv/html/monreplication.html
@@ -20,8 +20,10 @@
END COPYRIGHT BLOCK
-->
+<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\">
<HTML>
<HEAD>
+<TITLE>monreplication</TITLE>
<META HTTP-EQUIV="Content-type"
CONTENT="text/html;charset=utf-8">
</HEAD>
<body text="#000000" bgcolor="#FFFFFF" link="#666699"
vlink="#666699" alink="#333366">
@@ -32,25 +34,31 @@
</font>
<form method=GET action=repl-monitor-cgi.pl>
+<table border="0" cellpadding="3" cellspacing="2">
+<tr>
+<td width=15% nowrap>
<font face="PrimaSans BT, Verdana, sans-serif" size=-1>
-<table border="0" cellpadding="3" cellspacing="2"
cols="2">
-<tr><td width=15% nowrap>
<!-- ELEM txt="Configuration file: " -->
+</font>
<td nowrap>
+<font face="PrimaSans BT, Verdana, sans-serif" size=-1>
<!-- CONFIGFILE -->
-<tr><td width=15% nowrap>
+</font>
+<tr>
+<td width=15% nowrap>
+<font face="PrimaSans BT, Verdana, sans-serif" size=-1>
<!-- ELEM txt="Refresh interval (seconds): " -->
+</font>
<td>
+<font face="PrimaSans BT, Verdana, sans-serif" size=-1>
<!-- REFRESHINTERVAL -->
+</font>
</table>
-<p>
<!-- SERVHOST -->
<!-- SERVPORT -->
<!-- ADMURL -->
<!-- SITEROOT -->
<!-- SUBMIT -->
-</font>
-</form>
</body>
</HTML>
diff --git a/admserv/html/viewdata.html b/admserv/html/viewdata.html
index f1e564f..2780de6 100644
--- a/admserv/html/viewdata.html
+++ b/admserv/html/viewdata.html
@@ -20,8 +20,10 @@
END COPYRIGHT BLOCK
-->
+<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\">
<HTML>
<HEAD>
+<TITLE>viewdata</TITLE>
<META HTTP-EQUIV="Content-type"
CONTENT="text/html;charset=utf-8">
</HEAD>
<body text="#000000" bgcolor="#FFFFFF" link="#666699"
vlink="#666699" alink="#333366">
@@ -29,13 +31,9 @@
<br>
<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
<!-- ID_TITLE -->
-<p>
<!-- SHOW_DATA -->
-<p>
<font face="PrimaSans BT, Verdana, sans-serif"><font
size=-1>Additional Information:</font></font>
-<p>
<!-- CHECK_UPGRADE -->
-<p>
<!-- SHOW_URL -->
</table>
diff --git a/admserv/html/viewlog.html b/admserv/html/viewlog.html
index da56144..b161f55 100644
--- a/admserv/html/viewlog.html
+++ b/admserv/html/viewlog.html
@@ -20,40 +20,34 @@
END COPYRIGHT BLOCK
-->
+<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\">
<HTML>
<HEAD>
+<TITLE>viewlog</TITLE>
<META HTTP-EQUIV="Content-type"
CONTENT="text/html;charset=utf-8">
</HEAD>
<body text="#000000" bgcolor="#FFFFFF" link="#666699"
vlink="#666699" alink="#333366">
<br>
-<font face="PrimaSans BT, Verdana, sans-serif">
<!-- ID_TITLE -->
-</font>
<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
<tr>
<td>
<form method=GET action=ViewLog>
-<font face="PrimaSans BT, Verdana, sans-serif"><font size=-1>
<!-- BEGINELEM -->
+<font face="PrimaSans BT, Verdana, sans-serif" size=-1>
<!-- ELEM txt="Log to view: " -->
<!-- LOG_TO_VIEW -->
<!-- ELEM txt="Number of entries: " -->
<!-- NUM_TO_VIEW -->
<!-- ELEMADD txt="Only show entries with: " -->
<!-- STRING_TO_VIEW -->
+</font>
<!-- ENDELEM -->
<!-- HIDDEN_ID -->
<!-- SUBMIT -->
-</font></font>
-</form>
-
-<font face="PrimaSans BT, Verdana, sans-serif"><font size=-1>
-<pre>
<!-- ACCESS_LOG -->
-</pre>
-</font></font>
</td>
</tr>
diff --git a/include/libadmin/libadmin.h b/include/libadmin/libadmin.h
index a29c2fe..7a47f95 100644
--- a/include/libadmin/libadmin.h
+++ b/include/libadmin/libadmin.h
@@ -189,7 +189,7 @@ NSAPI_PUBLIC char *GetQueryNT(void);
#define HTML_ERRCOLOR "#AA0000"
-#define MOCHA_NAME "JavaScript"
+#define MOCHA_NAME "javascript"
/* Internationalization stuffs. If we define MSG_RETURN, then create a
* function which will return a string of the given identifier. If we
diff --git a/include/libdsa/dsalib.h b/include/libdsa/dsalib.h
index d6ffc80..de97b95 100644
--- a/include/libdsa/dsalib.h
+++ b/include/libdsa/dsalib.h
@@ -131,7 +131,7 @@
#define SLAPD_NAME "ns-slapd"
#endif
-#define MOCHA_NAME "JavaScript"
+#define MOCHA_NAME "javascript"
/*
* Return values from ds_get_updown_status()
diff --git a/lib/libadmin/referer.c b/lib/libadmin/referer.c
index 35380b3..ef120f2 100644
--- a/lib/libadmin/referer.c
+++ b/lib/libadmin/referer.c
@@ -70,7 +70,7 @@ redirect_to_referer( char *addition )
url = fixAddition(ref, addition );
fprintf( stderr, "Content-type: text/html\n\n"
- "<SCRIPT language="MOCHA_NAME">\n"
+ "<SCRIPT type=\"text/"MOCHA_NAME"\">\n"
"window.location='%s';\n"
"</SCRIPT>\n", url );
FREE( url );
@@ -84,7 +84,7 @@ js_open_referer( void )
ref = cookieValue( REFER_VAR, NULL );
fprintf( stdout,
- "<SCRIPT language="MOCHA_NAME">\n"
+ "<SCRIPT type=\"text/"MOCHA_NAME"\">\n"
"window.location='%s'\n"
"</SCRIPT>\n", ref );
}
diff --git a/lib/libadmin/template.c b/lib/libadmin/template.c
index 49e478d..4cf61bd 100644
--- a/lib/libadmin/template.c
+++ b/lib/libadmin/template.c
@@ -382,7 +382,7 @@ NSAPI_PUBLIC char *helpJavaScriptForTopic( char *topic )
* URL changed to add new "mapfile" parameter for 5.0 help system - Adam
*/
util_snprintf( line, sizeof(line),
-
"window.open('%s/manual/help/help?helpdir=admin&token=%s&mapfile=tokens.map',
'"
+
"window.open('%s/manual/help/help?helpdir=admin&token=%s&mapfile=tokens.map',
'"
INFO_IDX_NAME"_%s', "
HELP_WIN_OPTIONS");",
getenv("SERVER_URL"), topic,
@@ -411,7 +411,7 @@ void submit(int verify, char **vars)
char outline[BIG_LINE];
if(verify) {
- util_snprintf(line, sizeof(line), "<SCRIPT
language="MOCHA_NAME">\n"
+ util_snprintf(line, sizeof(line), "<SCRIPT
type=\"text/"MOCHA_NAME"\">\n"
"function verify(form) {\n"
" if(confirm('Do you really want to %s?'))\n"
" form.submit();\n"
@@ -453,9 +453,6 @@ void submit(int verify, char **vars)
output("</tr></table></center>\n");
output("</form>\n");
-
- output("<SCRIPT language="MOCHA_NAME">\n");
- output("</SCRIPT>\n");
}
@@ -488,12 +485,12 @@ void helplink()
*/
util_snprintf( line, sizeof(line),
"<A HREF=\"javascript:"
- "if ( top.helpwin ) {"
- " top.helpwin.focus();"
- "
top.helpwin.infotopic.location='%s/manual/help/help?helpdir=admin&token=%s&mapfile=tokens.map';"
- "} else {"
- "
window.open('%s/manual/help/help?helpdir=admin&token=%s&mapfile=tokens.map',
'"
- INFO_IDX_NAME"_%s', "
+ "if(top.helpwin){"
+ "top.helpwin.focus();"
+
"top.helpwin.infotopic.location='%s/manual/help/help?helpdir=admin&token=%s&mapfile=tokens.map';"
+ "}else{"
+
"window.open('%s/manual/help/help?helpdir=admin&token=%s&mapfile=tokens.map','"
+ INFO_IDX_NAME"_%s',"
HELP_WIN_OPTIONS");}"
"\" target=\"messagewin\">",
getenv("SERVER_URL"), sn,
@@ -505,12 +502,10 @@ void helplink()
void helpbutton(char *topic)
{
- output("<form><p><div align=right><table width=33%%
border=2>"
+ output("<div align=right><table width=33%% border=2>"
"<tr><td align=center>");
output(_get_help_button(topic));
- output("</td></tr></table></div></form>\n");
- output("<SCRIPT language="MOCHA_NAME">\n");
- output("</SCRIPT>\n");
+ output("</td></tr></table></div>\n");
}
void dialogsubmit(char *topic)
@@ -543,7 +538,7 @@ void dialogsubmit(char *topic)
output("</form>\n");
- output("<SCRIPT language="MOCHA_NAME">\n");
+ output("<SCRIPT type=\"text/"MOCHA_NAME"\">\n");
output("</SCRIPT>\n");
}
@@ -551,7 +546,7 @@ void link_referer(char **input, char **vars)
{
char line[BIG_LINE];
- PR_snprintf(line, sizeof(line), "<SCRIPT
language="MOCHA_NAME">\n"
+ PR_snprintf(line, sizeof(line), "<SCRIPT
type=\"text/"MOCHA_NAME"\">\n"
"document.writeln( '%s'.link( '%s' ) );\n"
"</SCRIPT>\n", ( vars[0] ? vars[0] : getenv( "SCRIPT_NAME"
) ),
cookieValue( "adminReferer", NULL ) );
diff --git a/lib/libadmin/util.c b/lib/libadmin/util.c
index 91bfb43..4b8f326 100644
--- a/lib/libadmin/util.c
+++ b/lib/libadmin/util.c
@@ -1875,9 +1875,8 @@ util_ldap_init(
(rc = ldapssl_set_option(myld, SSL_ENABLE_SSL2, PR_FALSE)) ||
(rc = ldapssl_set_option(myld, SSL_ENABLE_SSL3, PR_TRUE)) ||
(rc = ldapssl_set_option(myld, SSL_ENABLE_TLS, PR_TRUE))) {
- int prerr = PR_GetError();
-
#ifdef DEBUG
+ int prerr = PR_GetError();
fprintf(stderr, "util_ldap_init: "
"failed: unable to set SSL options ("
"error %d - %s)\n",
diff --git a/mod_restartd/mod_restartd-2.2.c b/mod_restartd/mod_restartd-2.2.c
index 67a96d5..a4e73fb 100644
--- a/mod_restartd/mod_restartd-2.2.c
+++ b/mod_restartd/mod_restartd-2.2.c
@@ -1376,7 +1376,7 @@ static int cgid_handler(request_rec *r)
return DECLINED;
/* One final check. We only want to run Start/Stop/Restart */
- if ((ap_regexec(&uriPat, r->uri, 0, NULL,0) != 0)) {
+ if ((rv = ap_regexec(&uriPat, r->uri, 0, NULL,0)) != 0) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
"mod_restartd: attempt to run unknown program at %s. Bailing
out.", r->uri);
return DECLINED;