Reorganized RA templates and scripts.

The templates, JS, and CGI scripts for RA have been reorganized into
the RA core package.

Ticket #407

10 files changed, 0 insertions, 1091 deletions

diff --git a/base/ra/forms/agent/cert/index.cgi b/base/ra/forms/agent/cert/index.cgi
deleted file mode 100755
index 46e5b8c2c..000000000
--- a/base/ra/forms/agent/cert/index.cgi
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/usr/bin/perl
-#
-# --- BEGIN COPYRIGHT BLOCK ---
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Copyright (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# --- END COPYRIGHT BLOCK ---
-#
-#
-#
-#
-
-package op;
-
-use lib $ENV{DOCUMENT_ROOT} . "/../lib/perl";
-
-use DBI;
-use CGI;
-use Template::Velocity;
-use PKI::RA::GlobalVar;
-use PKI::Base::Conf;
-use PKI::Base::Util;
-use PKI::Base::Registry;
-use PKI::Base::CertStore;
-
-use vars qw (@ISA);
-use PKI::Service::Op;
-@ISA = qw(PKI::Service::Op);
-
-sub new {
-  my $self = {};
-  bless ($self);
-  return $self;
-}
-
-sub process()
-{
-  my $self = shift;
-  my $q = CGI->new();
-
-  my $util = PKI::Base::Util->new();
-  my $docroot = PKI::Base::Registry->get_docroot();
-  my $parser = PKI::Base::Registry->get_parser();
-  my $cfg = PKI::Base::Registry->get_config();
-
-  $self->debug_params($cfg, $q);
-
-  if (!$self->agent_auth($cfg)) {
-    print $q->redirect("/agent/error.cgi");
-    return;
-  }
-  my $uid = $self->get_current_uid($cfg);
-
-  my %context;
-  $context{uid} = $util->html_encode($uid);
-
-  my @roles = $self->get_current_roles($cfg);
-  my $r = join(",",@roles);
-
-  my $sp = $util->get_alphanum_val($q->param('sp'));
-  if ($sp eq "") {
-    $sp = "0";
-  }
-  $context{sp} = $sp;
-  my $mc = $util->get_alphanum_val($q->param('mc'));
-  if ($mc eq "") {
-    $mc = "20";
-  }
-  $context{mc} = $mc;
-  $context{pp} = $sp - $mc; # previous pos (for paging)
-  $context{np} = $sp + $mc; # next pos (for paging)
-
-  my $cs = PKI::Base::CertStore->new();
-  $cs->open($cfg);
-  my @certs = $cs->list_certs_by_approver($uid, $sp, $mc);
-  $cs->close();
-
-  my @r;
-  my $i = 0;
-  foreach my $cert (@certs) {
-    $r[$i] = new PKI::RA::GlobalVar(
-                    getReqId => sub { return $util->html_encode($cert->{'rid'}) },
-                    getSerialno => sub { return $util->html_encode($cert->{'serialno'}) },
-                    getSubjectDN => sub { return $util->html_encode($cert->{'subject_dn'}) },
-                    getCertificate => sub { return $util->html_encode($cert->{'certificate'}) },
-                    getApprovedBy => sub { return $util->html_encode($cert->{'approved_by'}) },
-                    getCreatedAt => sub { return $util->html_encode($cert->{'created_at'}); },
-                   );
-    $i++;
-  }
-  $context{rows} = \@r;
-
-  my $result = $parser->execute_file_with_context("agent/cert/index.vm", 
-                       \%context);
-
-  my $xml = $q->param('xml');
-  if ($xml eq "true") {
-    print "Content-Type: text/xml\n\n";
-    print $self->xml_output(\%context);
-  } else {
-    print "Content-Type: text/html\n\n";
-    print "$result";
-  }
-}
-
-my $op = op->new();
-$op->execute();
diff --git a/base/ra/forms/agent/cert/read.cgi b/base/ra/forms/agent/cert/read.cgi
deleted file mode 100755
index f434baedb..000000000
--- a/base/ra/forms/agent/cert/read.cgi
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/usr/bin/perl
-#
-# --- BEGIN COPYRIGHT BLOCK ---
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Copyright (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# --- END COPYRIGHT BLOCK ---
-#
-#
-#
-#
-
-package op;
-
-use lib $ENV{DOCUMENT_ROOT} . "/../lib/perl";
-
-use DBI;
-use CGI;
-use Template::Velocity;
-use PKI::Base::Conf;
-use PKI::Base::Util;
-use PKI::Base::Registry;
-use PKI::Conn::CA;
-use Encode;
-use vars qw (@ISA);
-use PKI::Service::Op;
-
-@ISA = qw(PKI::Service::Op);
-
-sub new {
-  my $self = {};
-  bless ($self);
-  return $self;
-}
-
-sub process()
-{
-  my $self = shift;
-  my $q = CGI->new();
-
-  my $util = PKI::Base::Util->new();
-  my $docroot = PKI::Base::Registry->get_docroot();
-  my $parser = PKI::Base::Registry->get_parser();
-  my $cfg = PKI::Base::Registry->get_config();
-  $self->debug_params($cfg, $q);
-
-  if (!$self->agent_auth($cfg)) {
-    print $q->redirect("/agent/error.cgi");
-    return;
-  }
-  my $uid = $self->get_current_uid($cfg);
-
-  my %context;
-  $context{uid} = $util->html_encode($uid);
-
-  my $serialno = $util->get_alphanum_val($q->param('serialno'));
-
-  my $cs = PKI::Base::CertStore->new();
-  $cs->open($cfg);
-  my $ref = $cs->read_certificate_by_approver($uid, $serialno);
-  $cs->close();
-
-  my $ca = PKI::Conn::CA->new();
-  $ca->open($cfg);
-  my $certStatus = $ca->getCertStatus("ca1", $serialno);
-  $ca->close();
-
-
-  $context{certificate} = $util->breakline($util->html_encode($ref->{'certificate'}), 40);
-
-  $context{serialno} = $util->html_encode($ref->{'serialno'});
-  $context{subject_dn} = $util->html_encode(Encode::decode('UTF-8', $ref->{'subject_dn'}));
-  $context{created_at} = $util->html_encode($ref->{'created_at'});
-  $context{approved_by} = $util->html_encode($ref->{'approved_by'});
-  $context{rid} = $util->html_encode($ref->{'rid'});
-  $context{certStatus} = $util->html_encode($certStatus);
-
-  my $result = $parser->execute_file_with_context("agent/cert/read.vm",
-                   \%context);
-
-  my $xml = $q->param('xml');
-  if ($xml eq "true") {
-    print "Content-Type: text/xml\n\n";
-    print $self->xml_output(\%context);
-  } else {
-    print "Content-Type: text/html\n\n";
-    print "$result";
-  }
-}
-
-my $op = op->new();
-$op->execute();
diff --git a/base/ra/forms/agent/cert/revoke.cgi b/base/ra/forms/agent/cert/revoke.cgi
deleted file mode 100755
index 1e483aea0..000000000
--- a/base/ra/forms/agent/cert/revoke.cgi
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/perl
-#
-# --- BEGIN COPYRIGHT BLOCK ---
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Copyright (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# --- END COPYRIGHT BLOCK ---
-#
-#
-#
-#
-
-package op;
-
-use lib $ENV{DOCUMENT_ROOT} . "/../lib/perl";
-
-use DBI;
-use CGI;
-use Template::Velocity;
-use PKI::Base::Conf;
-use PKI::Base::Registry;
-use PKI::Base::Util;
-use Encode;
-
-use vars qw (@ISA);
-use PKI::Service::Op;
-@ISA = qw(PKI::Service::Op);
-
-sub new {
-  my $self = {};
-  bless ($self);
-  return $self;
-}
-
-sub process()
-{
-  my $self = shift;
-  my $q = CGI->new();
-
-  my $util = PKI::Base::Util->new();
-  my $docroot = PKI::Base::Registry->get_docroot();
-  my $parser = PKI::Base::Registry->get_parser();
-  my $cfg = PKI::Base::Registry->get_config();
-  $self->debug_params($cfg, $q);
-
-  if (!$self->agent_auth($cfg)) {
-    print $q->redirect("/agent/error.cgi");
-    return;
-  }
-  my $uid = $self->get_current_uid($cfg);
-
-  my %context;
-  $context{uid} = $util->html_encode($uid);
-
-  my $serialno = $util->get_alphanum_val($q->param('serialno'));
-  my $subject_dn = $util->get_val($q->param('subject_dn'));
-  my $rid = $util->get_alphanum_val($q->param('rid'));
-
-  $context{serialno} = $util->html_encode($serialno);
-  $context{subject_dn} = $util->html_encode(Encode::decode('UTF-8',$subject_dn));
-  $context{rid} = $util->html_encode($rid);
- 
-  my $result = $parser->execute_file_with_context("agent/cert/revoke.vm",
-                   \%context);
-
-  my $xml = $q->param('xml');
-  if ($xml eq "true") {
-    print "Content-Type: text/xml\n\n";
-    print $self->xml_output(\%context);
-  } else {
-    print "Content-Type: text/html\n\n";
-    print "$result";
-  }
-}
-
-my $op = op->new();
-$op->execute();
diff --git a/base/ra/forms/agent/cert/submit.cgi b/base/ra/forms/agent/cert/submit.cgi
deleted file mode 100755
index 571385f3a..000000000
--- a/base/ra/forms/agent/cert/submit.cgi
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/usr/bin/perl
-#
-# --- BEGIN COPYRIGHT BLOCK ---
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Copyright (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# --- END COPYRIGHT BLOCK ---
-#
-#
-#
-#
-
-package op;
-
-use lib $ENV{DOCUMENT_ROOT} . "/../lib/perl";
-
-use DBI;
-use CGI;
-use Template::Velocity;
-use PKI::Base::Conf;
-use PKI::Base::Util;
-use PKI::Base::Registry;
-use PKI::Conn::CA;
-use Encode;
-
-use vars qw (@ISA);
-use PKI::Service::Op;
-@ISA = qw(PKI::Service::Op);
-
-sub new {
-  my $self = {};
-  bless ($self);
-  return $self;
-}
-
-sub process()
-{
-  my $self = shift;
-  my $q = CGI->new();
-
-  my $util = PKI::Base::Util->new();
-  my $docroot = PKI::Base::Registry->get_docroot();
-  my $parser = PKI::Base::Registry->get_parser();
-  my $cfg = PKI::Base::Registry->get_config();
-
-  $self->debug_params($cfg, $q);
-
-  if (!$self->agent_auth($cfg)) {
-    print $q->redirect("/agent/error.cgi");
-    return;
-  }
-  my $uid = $self->get_current_uid($cfg);
-
-  my %context;
-  $context{uid} = $util->html_encode($uid);
-
-  my $serialno = $util->get_alphanum_val($q->param('serialno'));
-  my $subject_dn = $util->get_val($q->param('subject_dn'));
-  my $reason = $util->get_alphanum_val($q->param('reason'));
-  my $rid = $util->get_alphanum_val($q->param('rid'));
-
-  my $ca = PKI::Conn::CA->new();
-  $ca->open($cfg);
-  $ca->revoke($rid, "ca1", $serialno, $reason);
-  $ca->close();
-
-  my $queue = PKI::Request::Queue->new();
-  $queue->open($cfg);
-
-  my $ref = $queue->read_request($rid);
-  $context{errorString} = $util->html_encode($ref->{'errorString'});
-  $queue->close();
-
-  $context{rid} = $util->html_encode($rid);
-  $context{serialno} = $util->html_encode($serialno);
-  $context{subject_dn} = $util->html_encode(Encode::decode('UTF-8', $subject_dn));
-
-  my $result = $parser->execute_file_with_context("agent/cert/submit.vm",
-                   \%context);
-
-  my $xml = $q->param('xml');
-  if ($xml eq "true") {
-    print "Content-Type: text/xml\n\n";
-    print $self->xml_output(\%context);
-  } else {
-    print "Content-Type: text/html\n\n";
-    print "$result";
-  }
-}
-
-my $op = op->new();
-$op->execute();
diff --git a/base/ra/forms/agent/error.cgi b/base/ra/forms/agent/error.cgi
deleted file mode 100755
index fa13365a7..000000000
--- a/base/ra/forms/agent/error.cgi
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/perl
-#
-# --- BEGIN COPYRIGHT BLOCK ---
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Copyright (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# --- END COPYRIGHT BLOCK ---
-#
-#
-#
-#
-
-package op;
-
-use lib $ENV{DOCUMENT_ROOT} . "/../lib/perl";
-
-use CGI;
-use Template::Velocity;
-use PKI::Base::Conf;
-use PKI::Base::UserStore;
-use PKI::Base::Util;
-use PKI::Base::Registry;
-
-use vars qw (@ISA);
-use PKI::Service::Op;
-@ISA = qw(PKI::Service::Op);
-
-sub new {
-  my $self = {};
-  bless ($self);
-  return $self;
-}
-
-sub process()
-{
-  my $self = shift;
-
-  my $q = CGI->new();
-
-  my $docroot = PKI::Base::Registry->get_docroot();
-  my $parser = PKI::Base::Registry->get_parser();
-  my $cfg = PKI::Base::Registry->get_config();
-
-  $self->debug_params($cfg, $q);
-
-  my $util = PKI::Base::Util->new();
-
-  my $error = $util->get_val($q->param('error'));
-
-  my %context;
-  if ($error ne "") {
-    $context{has_error} = 1;
-    $context{'error'} = $util->html_encode($error);
-  }
-
-  my $result = $parser->execute_file_with_context("agent/error.vm", \%context);
-
-  my $xml = $q->param('xml');
-  if ($xml eq "true") {
-    print "Content-Type: text/xml\n\n";
-    print $self->xml_output(\%context);
-  } else {
-    print "Content-Type: text/html\n\n";
-    print "$result";
-  }
-}
-
-my $op = op->new();
-$op->execute();
diff --git a/base/ra/forms/agent/index.cgi b/base/ra/forms/agent/index.cgi
deleted file mode 100755
index c8f2040fe..000000000
--- a/base/ra/forms/agent/index.cgi
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/perl
-#
-# --- BEGIN COPYRIGHT BLOCK ---
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Copyright (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# --- END COPYRIGHT BLOCK ---
-#
-#
-#
-#
-
-package op;
-
-use lib $ENV{DOCUMENT_ROOT} . "/../lib/perl";
-
-use CGI;
-use Template::Velocity;
-use PKI::Base::Conf;
-use PKI::Base::UserStore;
-use PKI::Base::Registry;
-use PKI::Base::Util;
-
-use vars qw (@ISA);
-use PKI::Service::Op;
-@ISA = qw(PKI::Service::Op);
-
-sub new {
-  my $self = {};
-  bless ($self);
-  return $self;
-}
-
-sub process()
-{
-  my $self = shift;
-
-  my $q = CGI->new();
-
-  my $util = PKI::Base::Util->new();
-
-  my $docroot = PKI::Base::Registry->get_docroot();
-  my $parser = PKI::Base::Registry->get_parser();
-  my $cfg = PKI::Base::Registry->get_config();
-
-  $self->debug_params($cfg, $q);
-
-  if (!$self->agent_auth($cfg)) {
-    print $q->redirect("/agent/error.cgi?error=Authentication%20Error");
-    return;
-  }
-  my $uid = $self->get_current_uid($cfg);
-
-  my %context;
-  $context{uid} = $util->html_encode($uid);
-
-  my $result = $parser->execute_file_with_context("agent/index.vm", 
-                    \%context);
-
-  my $xml = $q->param('xml');
-  if ($xml eq "true") {
-    print "Content-Type: text/xml\n\n";
-    print $self->xml_output(\%context);
-  } else {
-    print "Content-Type: text/html\n\n";
-    print "$result";
-  }
-}
-
-my $op = op->new();
-$op->execute();
diff --git a/base/ra/forms/agent/request/add_note.cgi b/base/ra/forms/agent/request/add_note.cgi
deleted file mode 100755
index 0ffac91c7..000000000
--- a/base/ra/forms/agent/request/add_note.cgi
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/perl
-#
-# --- BEGIN COPYRIGHT BLOCK ---
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Copyright (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# --- END COPYRIGHT BLOCK ---
-#
-#
-#
-#
-
-package op;
-
-use lib $ENV{DOCUMENT_ROOT} . "/../lib/perl";
-
-use CGI;
-use Template::Velocity;
-use PKI::Base::Conf;
-use PKI::Base::Util;
-use PKI::Base::Registry;
-use PKI::Request::Queue;
-use PKI::Base::TimeTool;
-
-use vars qw (@ISA);
-use PKI::Service::Op;
-@ISA = qw(PKI::Service::Op);
-
-sub new {
-  my $self = {};
-  bless ($self);
-  return $self;
-}
-
-sub process()
-{
-  my $self = shift;
-
-  my $q = CGI->new();
-
-  my $util = PKI::Base::Util->new();
-  my $docroot = PKI::Base::Registry->get_docroot();
-  my $parser = PKI::Base::Registry->get_parser();
-  my $cfg = PKI::Base::Registry->get_config();
-
-  $self->debug_params($cfg, $q);
-
-  if (!$self->agent_auth($cfg)) {
-    print $q->redirect("/agent/error.cgi");
-    return;
-  }
-  my $uid = $self->get_current_uid($cfg);
-
-  my %context;
-  $context{uid} = $util->html_encode($uid);
-
-  my $id = $util->get_alphanum_val($q->param('id'));
-  my $note = $util->get_val($q->param('note'));
-
-  if ($note eq "") {
-    # dont add anything
-    print $q->redirect("/agent/request/read.cgi?id=" . $id);
-    return;
-  }
-
-  my $timet = PKI::Base::TimeTool->new();
-  my $now = $timet->get_time();
-  my $new_note = "==== Note created by $uid at $now ====\n" .
-                   $note . "\n";
-
-  my $queue = PKI::Request::Queue->new();
-  $queue->open($cfg);
-  my $ref = $queue->read_request($id);
-  $queue->set_request($id, "note", $ref->{'note'} . $new_note);
-  $queue->close();
-
-  print $q->redirect("/agent/request/read.cgi?id=" . $id);
-}
-
-my $op = op->new();
-$op->execute();
diff --git a/base/ra/forms/agent/request/index.cgi b/base/ra/forms/agent/request/index.cgi
deleted file mode 100755
index 81b25977a..000000000
--- a/base/ra/forms/agent/request/index.cgi
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/usr/bin/perl
-#
-# --- BEGIN COPYRIGHT BLOCK ---
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Copyright (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# --- END COPYRIGHT BLOCK ---
-#
-#
-#
-#
-
-package op;
-
-use lib $ENV{DOCUMENT_ROOT} . "/../lib/perl";
-
-use DBI;
-use CGI;
-use Template::Velocity;
-use PKI::RA::GlobalVar;
-use PKI::Base::Conf;
-use PKI::Base::Util;
-use PKI::Base::Registry;
-use PKI::Request::Queue;
-use PKI::Service::Op;
-
-use vars qw (@ISA);
-use PKI::Service::Op;
-@ISA = qw(PKI::Service::Op);
-
-sub new {
-  my $self = {};
-  bless ($self);
-  return $self;
-}
-
-sub process()
-{
-  my $self = shift;
-  my $q = CGI->new();
-
-  my $util = PKI::Base::Util->new();
-  my $docroot = PKI::Base::Registry->get_docroot();
-  my $parser = PKI::Base::Registry->get_parser();
-  my $cfg = PKI::Base::Registry->get_config();
-
-  $self->debug_params($cfg, $q);
-
-  if (!$self->agent_auth($cfg)) {
-    print $q->redirect("/agent/error.cgi");
-    return;
-  }
-  my $uid = $self->get_current_uid($cfg);
-  $self->debug_log( $cfg, "in request/index.cgi, uid == $uid");
-
-  my %context;
-  $context{uid} = $util->html_encode($uid);
-
-  my @roles = $self->get_current_roles($cfg);
-#  my $r = join(",",@roles);
-
-  my $status = $util->get_alphanum_val($q->param('status'));
-  if ($status eq "") {
-    $context{status} = "";
-  } else {
-    $context{status} = $util->html_encode($status);
-  }
-
-  my $sp = $util->get_alphanum_val($q->param('sp'));
-  if ($sp eq "") {
-    $sp = "0";
-  }
-  $context{sp} = $sp;
-  my $mc = $util->get_alphanum_val($q->param('mc'));
-  if ($mc eq "") {
-    $mc = "20";
-  }
-  $context{mc} = $mc;
-  $context{pp} = $sp - $mc; # previous pos (for paging)
-  $context{np} = $sp + $mc; # next pos (for paging)
-
-  my $queue = PKI::Request::Queue->new();
-  $queue->open($cfg);
-  my $total = $queue->count_requests_by_roles(\@roles, $status);
-  $context{total} = $util->html_encode($total);
-
-  my @reqs = $queue->list_requests_by_roles(\@roles, $status, $sp, $mc);
-#  my @reqs = $queue->list_requests_by_roles($r, $status, $sp, $mc);
-  $queue->close();
-
-  my @r;
-  my $i = 0;
-  foreach my $req (@reqs) {
-    $r[$i] = new PKI::RA::GlobalVar(
-                    getId => sub { return $util->html_encode($req->{'rowid'}) },
-                    getType => sub { return $util->html_encode($req->{'type'}) },
-                    getStatus => sub { return $util->html_encode($req->{'status'}) },
-                    getError => sub { return $util->html_encode($req->{'errorString'}) },
-                    getAssignedTo => sub { return $util->html_encode($req->{'assigned_to'}) },
-                    getData => sub { return $util->html_encode($req->{'data'}); },
-                    getCreatedBy => sub { return $util->html_encode($req->{'created_by'}); },
-                    getCreatedAt => sub { return $util->html_encode($req->{'created_at'}); },
-                   );
-    $i++;
-  }
-  $context{rows} = \@r;
-
-  if ($sp - $mc < 0) {
-    $context{show_previous} = "no";
-  } else {
-    $context{show_previous} = "yes";
-  }
-
-  if ($i < 20) {
-    $context{show_next} = "no";
-  } else {
-    $context{show_next} = "yes";
-  }
-
-  my $result = $parser->execute_file_with_context("agent/request/index.vm",
-                  \%context);
-
-  my $xml = $q->param('xml');
-  if ($xml eq "true") {
-    print "Content-Type: text/xml\n\n";
-    print $self->xml_output(\%context);
-  } else {
-    print "Content-Type: text/html\n\n";
-    print "$result";
-  }
-}
-
-my $op = op->new();
-$op->execute();
diff --git a/base/ra/forms/agent/request/op.cgi b/base/ra/forms/agent/request/op.cgi
deleted file mode 100755
index 363d7121b..000000000
--- a/base/ra/forms/agent/request/op.cgi
+++ /dev/null
@@ -1,153 +0,0 @@
-#!/usr/bin/perl
-#
-# --- BEGIN COPYRIGHT BLOCK ---
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Copyright (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# --- END COPYRIGHT BLOCK ---
-#
-#
-#
-#
-
-package op;
-
-use lib $ENV{DOCUMENT_ROOT} . "/../lib/perl";
-
-use Benchmark;
-use CGI;
-use Template::Velocity;
-use PKI::Base::Conf;
-use PKI::Base::Registry;
-use PKI::Request::Queue;
-use PKI::Base::Util;
-use Encode;
-
-use vars qw (@ISA);
-use PKI::Service::Op;
-@ISA = qw(PKI::Service::Op);
-
-sub new {
-  my $self = {};
-  bless ($self);
-  return $self;
-}
-
-sub process()
-{
-  my $self = shift;
-
-  my $q = CGI->new();
-
-  my $st = new Benchmark;
-
-  my $util = PKI::Base::Util->new();
-  my $docroot = PKI::Base::Registry->get_docroot();
-  my $parser = PKI::Base::Registry->get_parser();
-  my $cfg = PKI::Base::Registry->get_config();
-
-  $self->debug_params($cfg, $q);
-
-  if (!$self->agent_auth($cfg)) {
-    print $q->redirect("/agent/error.cgi");
-    return;
-  }
-  my $uid = $self->get_current_uid($cfg);
-
-  my %context;
-  $context{uid} = $util->html_encode($uid);
-
-  my $type = $util->get_alphanum_val($q->param('type'));
-  my $id = $util->get_alphanum_val($q->param('id'));
-
-  my $db_st = new Benchmark;
-  my $queue = PKI::Request::Queue->new();
-  $queue->open($cfg);
-
-  my $ref;
-
-  my @roles = $self->get_current_roles($cfg);
-  my $pref = $queue->read_request_by_roles(\@roles, $id);
-
-  if (! defined $pref) {
-    $queue->close();
-    $self->debug_log($cfg, "Invalid attempt to process request id= " . $id .
-        " by userid= " . $uid);
-    print $q->redirect("/agent/error.cgi");
-    return;
-  }
-
-  my $curr_status = $pref->{'status'};
-  if ($type eq "approve") {
-    if (($curr_status ne "OPEN") && ($curr_status ne "ERROR")) {
-      $queue->close();
-      print $q->redirect("/agent/request/read.cgi?id=$id");
-      return;
-    }
- 
-    $ref = $queue->approve_request($id, $uid);
-  } elsif ($type eq "reject") {
-    if (($curr_status ne "OPEN") && ($curr_status ne "ERROR")) {
-      $queue->close();
-      print $q->redirect("/agent/request/read.cgi?id=$id");
-      return;
-    }
-
-    $ref = $queue->reject_request($id, $uid);
-  }
-  $queue->close();
-  my $db_et = new Benchmark;
- 
-  $context{data} = $util->breakline($util->html_encode(Encode::decode('UTF-8', $ref->{'data'})), 40);
-  $context{output} = $util->breakline($util->html_encode($ref->{'output'}), 40);
-  $context{serialno} = $util->html_encode($ref->{'serialno'});
-  $context{type} = $util->html_encode($ref->{'type'});
-  $context{ip} = $util->html_encode($ref->{'ip'});
-  $context{note} = $util->html_encode($ref->{'note'});
-  $context{note} =~ s/\n/<br\/>/g;
-  $context{created_at} = $util->html_encode($ref->{'created_at'});
-  $context{updated_at} = $util->html_encode($ref->{'updated_at'});
-  $context{assigned_to} = $util->html_encode($ref->{'assigned_to'});
-  $context{processed_by} = $util->html_encode($ref->{'processed_by'});
-  $context{created_by} = $util->html_encode($ref->{'created_by'});
-  $context{status} = $util->html_encode($ref->{'status'});
-  $context{errorString} = $util->html_encode($ref->{'errorString'});
-  $context{id} = $util->html_encode($ref->{'rowid'});
-
-  my $t_st = new Benchmark;
-  my $result = $parser->execute_file_with_context("agent/request/op.vm",
-                  \%context);
-  my $t_et = new Benchmark;
-
-  my $xml = $q->param('xml');
-  if ($xml eq "true") {
-    print "Content-Type: text/xml\n\n";
-    print $self->xml_output(\%context);
-  } else {
-    print "Content-Type: text/html\n\n";
-    print "$result";
-  }
-
-  my $et = new Benchmark;
-
-  $self->debug_log($cfg, "benchmark " .
-                  "total=" . timestr(timediff($et, $st)) . " " .
-                  "db total=" . timestr(timediff($db_et, $db_st)) . " " .
-                  "template total=" . timestr(timediff($t_et, $t_st)) . " "
-               );
-}
-
-my $op = op->new();
-$op->execute();
diff --git a/base/ra/forms/agent/request/read.cgi b/base/ra/forms/agent/request/read.cgi
deleted file mode 100755
index d1633c164..000000000
--- a/base/ra/forms/agent/request/read.cgi
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/usr/bin/perl
-#
-# --- BEGIN COPYRIGHT BLOCK ---
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Copyright (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# --- END COPYRIGHT BLOCK ---
-#
-#
-#
-#
-
-package op;
-
-use lib $ENV{DOCUMENT_ROOT} . "/../lib/perl";
-
-use DBI;
-use CGI;
-use Template::Velocity;
-use PKI::Base::Conf;
-use PKI::Base::Registry;
-use PKI::Base::Util;
-use PKI::Request::Queue;
-use Encode;
-
-use vars qw (@ISA);
-use PKI::Service::Op;
-@ISA = qw(PKI::Service::Op);
-
-sub new {
-  my $self = {};
-  bless ($self);
-  return $self;
-}
-
-sub process()
-{
-  my $self = shift;
-  my $q = CGI->new();
-
-  my $util = PKI::Base::Util->new();
-  my $docroot = PKI::Base::Registry->get_docroot();
-  my $parser = PKI::Base::Registry->get_parser();
-  my $cfg = PKI::Base::Registry->get_config();
-
-  $self->debug_params($cfg, $q);
-
-  if (!$self->agent_auth($cfg)) {
-    print $q->redirect("/agent/error.cgi");
-    return;
-  }
-  my $uid = $self->get_current_uid($cfg);
-
-  my %context;
-  $context{uid} = $util->html_encode($uid);
-
-
-  my @roles = $self->get_current_roles($cfg);
-#  my $r = join(",",@roles);
-
-  my $id = $util->get_alphanum_val($q->param('id'));
-
-  my $queue = PKI::Request::Queue->new();
-  $queue->open($cfg);
-  my $ref = $queue->read_request_by_roles(\@roles, $id);
-  $queue->close();
-
-  $context{data} = $util->breakline($util->html_encode(Encode::decode('UTF-8',$ref->{'data'})), 40);
-  $context{output} = $util->breakline($util->html_encode($ref->{'output'}), 40);
-  $context{meta_info} = $util->breakline($util->html_encode($ref->{'meta_info'}), 40);
-
-  $context{serialno} = $util->html_encode($ref->{'serialno'});
-  $context{subject_dn} = $util->html_encode($ref->{'subject_dn'});
-  $context{type} = $util->html_encode($ref->{'type'});
-  $context{created_at} = $util->html_encode($ref->{'created_at'});
-  $context{created_by} = $util->html_encode($ref->{'created_by'});
-  $context{updated_at} = $util->html_encode($ref->{'updated_at'});
-  $context{ip} = $util->html_encode($ref->{'ip'});
-  $context{processed_by} = $util->html_encode($ref->{'processed_by'});
-  $context{note} = $util->html_encode($ref->{'note'});
-  $context{note} =~ s/\n/<br\/>/g;
-  $context{assigned_to} = $util->html_encode($ref->{'assigned_to'});
-  $context{status} = $util->html_encode($ref->{'status'});
-  if ($ref->{'status'} eq "OPEN") {
-    $context{is_open} = 1;
-  }
-  if ($ref->{'status'} eq "ERROR") {
-    $context{is_error} = 1;
-  }
-  $context{errorString} = $util->html_encode($ref->{'errorString'});
-  $context{id} = $util->html_encode($ref->{'rowid'});
-
-  my $result = $parser->execute_file_with_context("agent/request/read.vm",
-                    \%context);
-
-  my $xml = $q->param('xml');
-  if ($xml eq "true") {
-    print "Content-Type: text/xml\n\n";
-    print $self->xml_output(\%context);
-  } else {
-    print "Content-Type: text/html\n\n";
-    print "$result";
-  }
-}
-
-my $op = op->new();
-$op->execute();