From 4d2de360632c7744752a907a3af5f09ddc25376c Mon Sep 17 00:00:00 2001
From: Joseph Lewis <joehms22@gmail.com>
Date: Thu, 28 Jul 2011 12:58:07 -0600
Subject: [PATCH] Removed all of the old cgi.js usages that I could find and
 replaced them with the new openils.CGI widget instances.

It appears that most of the actual imports are never used, but they were replaced
anyway in hopes of not breaking anything :)

Signed-off-by: Joseph Lewis <joehms22@gmail.com>
---
 Open-ILS/web/conify/global/actor/org_unit.html              |  1 -
 Open-ILS/web/conify/global/actor/org_unit.js                |  3 ++-
 Open-ILS/web/conify/global/actor/org_unit_type.html         |  1 -
 Open-ILS/web/conify/global/actor/org_unit_type.js           |  3 ++-
 Open-ILS/web/conify/global/config/copy_status.html          |  1 -
 Open-ILS/web/conify/global/config/copy_status.js            |  3 ++-
 Open-ILS/web/conify/global/config/marc_code_maps.html       |  1 -
 Open-ILS/web/conify/global/config/marc_code_maps.js         |  3 ++-
 Open-ILS/web/conify/global/permission/grp_tree.html         |  1 -
 Open-ILS/web/conify/global/permission/grp_tree.js           |  3 ++-
 Open-ILS/web/conify/global/permission/perm_list.html        |  1 -
 Open-ILS/web/conify/global/permission/perm_list.js          |  3 ++-
 Open-ILS/web/opac/extras/bbags.js                           |  3 ++-
 Open-ILS/web/opac/extras/bbags.xml                          |  3 ++-
 Open-ILS/web/opac/extras/circ/alt_holds_print.html          |  3 +--
 Open-ILS/web/opac/extras/circ/alt_holds_print.js            |  1 +
 Open-ILS/web/opac/extras/selfcheck/selfcheck.xml            |  8 ++++++--
 Open-ILS/web/opac/skin/default/xml/common/js_common.xml     | 10 +++++++++-
 Open-ILS/web/reports/oils_rpt.js                            |  4 +++-
 Open-ILS/web/reports/oils_rpt_builder.js                    |  5 +++--
 Open-ILS/web/reports/oils_rpt_common.xhtml                  |  5 +++--
 Open-ILS/web/reports/xul/source-setup.js                    |  5 +++--
 Open-ILS/web/reports/xul/template-config.js                 |  3 ++-
 Open-ILS/web/reports/xul/template_builder.xul               |  3 ++-
 .../chrome/content/OpenILS/util_overlay_chrome.xul          |  8 +++++++-
 .../chrome/content/OpenILS/util_overlay_offline.xul         |  8 +++++++-
 Open-ILS/xul/staff_client/chrome/content/main/main.xul      |  8 +++++++-
 Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul   |  8 +++++++-
 Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml   | 10 ++++++++--
 Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml   | 10 +++++++++-
 Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml |  4 +++-
 Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml | 11 ++++++++---
 .../staff_client/server/admin/hold_pull_list_classic.xhtml  | 10 ++++++++--
 Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml  | 11 +++++++++--
 .../xul/staff_client/server/admin/printer_settings.html     |  8 +++++++-
 .../xul/staff_client/server/admin/stat_cat_editor.xhtml     |  8 +++++++-
 Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml   |  8 +++++++-
 Open-ILS/xul/staff_client/server/index.xhtml                |  7 ++++++-
 Open-ILS/xul/staff_client/server/patron/ue.xhtml            | 11 +++++++++--
 Open-ILS/xul/staff_client/server/patron/user_edit.xhtml     | 13 ++++++++++---
 40 files changed, 168 insertions(+), 52 deletions(-)

diff --git a/Open-ILS/web/conify/global/actor/org_unit.html b/Open-ILS/web/conify/global/actor/org_unit.html
index 726898b446..9d04df51b4 100644
--- a/Open-ILS/web/conify/global/actor/org_unit.html
+++ b/Open-ILS/web/conify/global/actor/org_unit.html
@@ -49,7 +49,6 @@
 		<!-- The OpenSRF API writ JS -->
 		<script language='javascript' src='/IDL2js' type='text/javascript'></script>
 		<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
-		<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
 		<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
 
 		<!-- Dojo goodness -->
diff --git a/Open-ILS/web/conify/global/actor/org_unit.js b/Open-ILS/web/conify/global/actor/org_unit.js
index 12f9139113..98ed86c3f5 100644
--- a/Open-ILS/web/conify/global/actor/org_unit.js
+++ b/Open-ILS/web/conify/global/actor/org_unit.js
@@ -36,9 +36,10 @@ dojo.require('dijit.layout.SplitContainer');
 dojo.require('dojox.widget.Toaster');
 dojo.require('dojox.fx');
 dojo.requireLocalization("openils.conify", "conify");
+dojo.require('openils.CGI');
 
 // some handy globals
-var cgi = new CGI();
+var cgi = new openils.CGI();
 var ses = dojo.cookie('ses') || cgi.param('ses');
 var pcrud = new openils.PermaCrud({ authtoken : ses });
 
diff --git a/Open-ILS/web/conify/global/actor/org_unit_type.html b/Open-ILS/web/conify/global/actor/org_unit_type.html
index 4b1e843807..ca4b484a39 100644
--- a/Open-ILS/web/conify/global/actor/org_unit_type.html
+++ b/Open-ILS/web/conify/global/actor/org_unit_type.html
@@ -51,7 +51,6 @@
 		<!-- The OpenSRF API writ JS -->
 		<script language='javascript' src='/IDL2js' type='text/javascript'></script>
 		<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
-		<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
 		<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
 
 		<!-- Dojo goodness -->
diff --git a/Open-ILS/web/conify/global/actor/org_unit_type.js b/Open-ILS/web/conify/global/actor/org_unit_type.js
index 26cb07d10e..a02a2fb821 100644
--- a/Open-ILS/web/conify/global/actor/org_unit_type.js
+++ b/Open-ILS/web/conify/global/actor/org_unit_type.js
@@ -36,10 +36,11 @@ dojo.require('dijit.layout.LayoutContainer');
 dojo.require('dijit.layout.SplitContainer');
 dojo.require('dojox.widget.Toaster');
 dojo.require('dojox.fx');
+dojo.require('openils.CGI');
 dojo.requireLocalization("openils.conify", "conify");
 
 // some handy globals
-var cgi = new CGI();
+var cgi = new openils.CGI();
 var ses = dojo.cookie('ses') || cgi.param('ses');
 var pCRUD = new openils.PermaCrud({authtoken:ses});
 
diff --git a/Open-ILS/web/conify/global/config/copy_status.html b/Open-ILS/web/conify/global/config/copy_status.html
index 262eaf21c9..c0e840d88d 100644
--- a/Open-ILS/web/conify/global/config/copy_status.html
+++ b/Open-ILS/web/conify/global/config/copy_status.html
@@ -52,7 +52,6 @@
 		<!-- The OpenSRF API writ JS -->
 		<script language='javascript' src='/IDL2js' type='text/javascript'></script>
 		<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
-		<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
 		<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
 
 		<!-- Dojo goodness -->
diff --git a/Open-ILS/web/conify/global/config/copy_status.js b/Open-ILS/web/conify/global/config/copy_status.js
index 1613ae8eb7..8e33cfcce5 100644
--- a/Open-ILS/web/conify/global/config/copy_status.js
+++ b/Open-ILS/web/conify/global/config/copy_status.js
@@ -32,10 +32,11 @@ dojo.require('dijit.layout.BorderContainer');
 dojo.require('dojox.widget.Toaster');
 dojo.require('dojox.fx');
 dojo.require('dojox.grid.Grid');
+dojo.require('openils.CGI');
 dojo.requireLocalization("openils.conify", "conify");
 
 // some handy globals
-var cgi = new CGI();
+var cgi = new openils.CGI();
 var ses = dojo.cookie('ses') || cgi.param('ses');
 var pCRUD = new openils.PermaCrud({authtoken:ses});
 
diff --git a/Open-ILS/web/conify/global/config/marc_code_maps.html b/Open-ILS/web/conify/global/config/marc_code_maps.html
index 9a8bbb0ad8..4ebde697ab 100644
--- a/Open-ILS/web/conify/global/config/marc_code_maps.html
+++ b/Open-ILS/web/conify/global/config/marc_code_maps.html
@@ -52,7 +52,6 @@
 		<!-- The OpenSRF API writ JS -->
 		<script language='javascript' src='/IDL2js' type='text/javascript'></script>
 		<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
-		<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
 		<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
 
 		<!-- Dojo goodness -->
diff --git a/Open-ILS/web/conify/global/config/marc_code_maps.js b/Open-ILS/web/conify/global/config/marc_code_maps.js
index 4589a9870b..422662e490 100644
--- a/Open-ILS/web/conify/global/config/marc_code_maps.js
+++ b/Open-ILS/web/conify/global/config/marc_code_maps.js
@@ -34,12 +34,13 @@ dojo.require('dijit.layout.BorderContainer');
 dojo.require('dojox.widget.Toaster');
 dojo.require('dojox.fx');
 dojo.require('dojox.grid.Grid');
+dojo.require('openils.CGI');
 dojo.requireLocalization("openils.conify", "conify");
 
 console.log('loading marc_code_maps.js');
 
 // some handy globals
-var cgi = new CGI();
+var cgi = new openils.CGI();
 var ses = dojo.cookie('ses') || cgi.param('ses');
 var pCRUD = new openils.PermaCrud({authtoken:ses});
 
diff --git a/Open-ILS/web/conify/global/permission/grp_tree.html b/Open-ILS/web/conify/global/permission/grp_tree.html
index ac2026f36c..1574da60c9 100644
--- a/Open-ILS/web/conify/global/permission/grp_tree.html
+++ b/Open-ILS/web/conify/global/permission/grp_tree.html
@@ -62,7 +62,6 @@
 		<!-- The OpenSRF API writ JS -->
 		<script language='javascript' src='/IDL2js' type='text/javascript'></script>
 		<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
-		<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
 		<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
 
 		<!-- Dojo goodness -->
diff --git a/Open-ILS/web/conify/global/permission/grp_tree.js b/Open-ILS/web/conify/global/permission/grp_tree.js
index 1ee39d3656..9d790a4d77 100644
--- a/Open-ILS/web/conify/global/permission/grp_tree.js
+++ b/Open-ILS/web/conify/global/permission/grp_tree.js
@@ -40,10 +40,11 @@ dojo.require('dijit.layout.SplitContainer');
 dojo.require('dojox.widget.Toaster');
 dojo.require('dojox.fx');
 dojo.require('dojox.grid.Grid');
+dojo.require('openils.CGI');
 dojo.requireLocalization("openils.conify", "conify");
 
 // some handy globals
-var cgi = new CGI();
+var cgi = new openils.CGI();
 var ses = dojo.cookie('ses') || cgi.param('ses');
 var server = {};
 server.pcrud = new openils.PermaCrud({ authtoken : ses });
diff --git a/Open-ILS/web/conify/global/permission/perm_list.html b/Open-ILS/web/conify/global/permission/perm_list.html
index 680cf6104f..ec88121abb 100644
--- a/Open-ILS/web/conify/global/permission/perm_list.html
+++ b/Open-ILS/web/conify/global/permission/perm_list.html
@@ -52,7 +52,6 @@
 		<!-- The OpenSRF API writ JS -->
 		<script language='javascript' src='/IDL2js?au,aou,aout,pgt,ppl,ccs' type='text/javascript'></script>
 		<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
-		<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
 		<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
 
 		<!-- Dojo goodness -->
diff --git a/Open-ILS/web/conify/global/permission/perm_list.js b/Open-ILS/web/conify/global/permission/perm_list.js
index ff303f965c..162124d831 100644
--- a/Open-ILS/web/conify/global/permission/perm_list.js
+++ b/Open-ILS/web/conify/global/permission/perm_list.js
@@ -32,10 +32,11 @@ dojo.require('dijit.layout.BorderContainer');
 dojo.require('dojox.widget.Toaster');
 dojo.require('dojox.fx');
 dojo.require('dojox.grid.Grid');
+dojo.require('openils.CGI');
 dojo.requireLocalization("openils.conify", "conify");
 
 // some handy globals
-var cgi = new CGI();
+var cgi = new openils.CGI();
 var ses = dojo.cookie('ses') || cgi.param('ses');
 var pCRUD = new openils.PermaCrud({authtoken : ses});
 
diff --git a/Open-ILS/web/opac/extras/bbags.js b/Open-ILS/web/opac/extras/bbags.js
index be5fdc1a39..6f4ba0b607 100644
--- a/Open-ILS/web/opac/extras/bbags.js
+++ b/Open-ILS/web/opac/extras/bbags.js
@@ -1,9 +1,10 @@
 
 /* XXX allow to pass in a 'local' var so the links back into the opac can be localized */
 /* maybe also a 'skin' var */
+dojo.require('openils.CGI');
 
 function bbInit() {
-	var cgi	= new CGI();
+	var cgi	= new openils.CGI();
 	var bb	= cgi.param('bb');
 	if(!bb) { unHideMe($('not_found')); return; }
 	var req = new Request(FLESH_PUBLIC_CONTAINER, 'biblio', bb);
diff --git a/Open-ILS/web/opac/extras/bbags.xml b/Open-ILS/web/opac/extras/bbags.xml
index 2b6ecf7537..372d5693e8 100644
--- a/Open-ILS/web/opac/extras/bbags.xml
+++ b/Open-ILS/web/opac/extras/bbags.xml
@@ -8,9 +8,10 @@
 
 	<head>
 		<title>Evergreen: Bookbag Viewer</title>
+		<script language='javascript' src='/js/dojo/dojo/dojo.js'></script>
+		<script language='javascript' src='/js/dojo/dojo/openils_dojo.js'></script>
 		<script language='javascript' src='/opac/common/js/utils.js'> </script>
 		<script language='javascript' src='/opac/common/js//config.js'> </script> 
-		<script language='javascript' src='/opac/common/js/CGI.js'> </script>
 	
 		<script language='javascript' src='/opac/common/js/slimtree.js'> </script>
 		<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
diff --git a/Open-ILS/web/opac/extras/circ/alt_holds_print.html b/Open-ILS/web/opac/extras/circ/alt_holds_print.html
index a7a1619aad..7f01694688 100644
--- a/Open-ILS/web/opac/extras/circ/alt_holds_print.html
+++ b/Open-ILS/web/opac/extras/circ/alt_holds_print.html
@@ -26,7 +26,6 @@
         </style>
         <!-- The OpenSRF API writ JS -->
         <script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
-        <script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
         <script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
         <!-- Dojo goodness -->
         <script type="text/javascript">
@@ -41,7 +40,7 @@
         <script type="text/javascript" src="/opac/extras/circ/alt_holds_print.js"></script>
         <script type="text/javascript">
             function my_init() {
-                cgi = new CGI();
+                cgi = new openils.CGI();
                 authtoken = (typeof ses == "function" ? ses() : 0) ||
                     cgi.param("ses") || dojo.cookie("ses");
 
diff --git a/Open-ILS/web/opac/extras/circ/alt_holds_print.js b/Open-ILS/web/opac/extras/circ/alt_holds_print.js
index 724e4e7568..76da8b33a7 100644
--- a/Open-ILS/web/opac/extras/circ/alt_holds_print.js
+++ b/Open-ILS/web/opac/extras/circ/alt_holds_print.js
@@ -2,6 +2,7 @@ dojo.require("dojo.cookie");
 dojo.require("dojox.xml.parser");
 dojo.require("openils.BibTemplate");
 dojo.require("openils.widget.ProgressDialog");
+dojo.requier("openils.CGI");
 
 var authtoken;
 var cgi;
diff --git a/Open-ILS/web/opac/extras/selfcheck/selfcheck.xml b/Open-ILS/web/opac/extras/selfcheck/selfcheck.xml
index d78f05eb02..34a90ea44c 100644
--- a/Open-ILS/web/opac/extras/selfcheck/selfcheck.xml
+++ b/Open-ILS/web/opac/extras/selfcheck/selfcheck.xml
@@ -31,14 +31,18 @@
 
     <head>
     	<script type="text/javascript" src='/js/dojo/dojo/dojo.js'></script>
+        <!-- Remove use of old cgi.js by replacing it with the new openils.cgi. -->
+        <script language='javascript' src='/js/dojo/dojo/openils_dojo.js'></script>
+        <script language='javascript'>
+            dojo.require('openils.CGI');
+            CGI = openils.CGI; 
+        </script>
 
         <script language='javascript' type='text/javascript' 
             src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/utils.js'></script>
 	    <script language='javascript' type='text/javascript' 
             src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/config.js'></script>
 	    <script language='javascript' type='text/javascript' 
-            src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/CGI.js'></script>
-	    <script language='javascript' type='text/javascript' 
             src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/md5.js'></script>
         <script language='javascript' type='text/javascript' 
             src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/JSON_v1.js'></script>
diff --git a/Open-ILS/web/opac/skin/default/xml/common/js_common.xml b/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
index 4fc46053a2..011416114a 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
@@ -40,7 +40,6 @@
 <!--START COMPRESSION-->
 <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/utils.js'></script>
 <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/config.js'></script>
-<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/CGI.js'></script>
 <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/md5.js'></script>
 <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/slimtree.js'></script>
 <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/opac_utils.js'></script>
@@ -52,6 +51,15 @@
 <!--#endif -->
 
 <!-- Some global js -->
+
+<!-- Remove use of old cgi.js by replacing it with the new openils.cgi. -->
+<script language='javascript' src='/js/dojo/dojo/dojo.js'></script>
+<script language='javascript' src='/js/dojo/dojo/openils_dojo.js'></script>
+<script language='javascript'>
+    dojo.require('openils.CGI');
+    CGI = openils.CGI; 
+</script>
+
 <script language='javascript' type='text/javascript'>
     config.css.color_1 = "color_1";
     config.css.color_2 = "color_2";
diff --git a/Open-ILS/web/reports/oils_rpt.js b/Open-ILS/web/reports/oils_rpt.js
index 835e06ec9b..9edd31eb7b 100644
--- a/Open-ILS/web/reports/oils_rpt.js
+++ b/Open-ILS/web/reports/oils_rpt.js
@@ -1,5 +1,7 @@
 var perms = [ 'RUN_REPORTS', 'SHARE_REPORT_FOLDER' ];
 
+dojo.require('openils.CGI');
+
 function oilsInitReports() {
 	oilsRptIdObjects();
 
@@ -9,7 +11,7 @@ function oilsInitReports() {
 
 	DEBUGSLIM = true;
 
-	var cgi = new CGI();
+	var cgi = new openils.CGI();
 	fetchUser(cgi.param('ses'));
 	DOM.oils_rpt_user.appendChild(text(USER.usrname()));
 
diff --git a/Open-ILS/web/reports/oils_rpt_builder.js b/Open-ILS/web/reports/oils_rpt_builder.js
index 0b82c21dc7..d0ce89798e 100644
--- a/Open-ILS/web/reports/oils_rpt_builder.js
+++ b/Open-ILS/web/reports/oils_rpt_builder.js
@@ -2,6 +2,7 @@
   * grabs and builds the IDL tree
   */
 dojo.requireLocalization("openils.reports", "reports");
+dojo.require('openils.CGI');
 
 var rpt_strings = dojo.i18n.getLocalization("openils.reports", "reports");
 var __dblclicks = {}; /* retain a cache of the selector value doubleclick event handlers */
@@ -15,7 +16,7 @@ function oilsInitReportBuilder() {
 		function() { 
 			hideMe(DOM.oils_rpt_tree_loading); 
 			unHideMe(DOM.oils_rpt_table); 
-			oilsRptBuilderDrawClone(new CGI().param('ct'));
+			oilsRptBuilderDrawClone(new openils.CGI().param('ct'));
 		}
 	);
 
@@ -104,7 +105,7 @@ function oilsReportBuilderSave() {
 	tmpl.name(DOM.oils_rpt_builder_new_name.value);
 	tmpl.description(DOM.oils_rpt_builder_new_desc.value);
 	tmpl.owner(USER.id());
-	tmpl.folder(new CGI().param('folder'));
+	tmpl.folder(new openils.CGI().param('folder'));
 	tmpl.data(js2JSON(oilsRpt.def));
 
 	if(!confirm(dojo.string.substitute( rpt_strings.RPT_BUILDER_CONFIRM_SAVE, [tmpl.name(), tmpl.description()] )) )
diff --git a/Open-ILS/web/reports/oils_rpt_common.xhtml b/Open-ILS/web/reports/oils_rpt_common.xhtml
index c1aad544c6..048ec5ffeb 100644
--- a/Open-ILS/web/reports/oils_rpt_common.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_common.xhtml
@@ -11,6 +11,8 @@
 	}
 </script>
 <script type="text/javascript" src="/js/dojo/dojo/dojo.js"></script>
+<script type="text/javascript" src="/js/dojo/dojo/openils_dojo.js"></script>
+
 <script type="text/javascript">
 	dojo.require('dojo.parser');
 	dojo.require('dojo.string');
@@ -22,8 +24,7 @@
 </script>
 
 <script type='text/javascript' src='/opac/common/js/utils.js'> </script>
-<script type='text/javascript' src='/opac/common/js//config.js'> </script> 
-<script type='text/javascript' src='/opac/common/js/CGI.js'> </script>
+<script type='text/javascript' src='/opac/common/js/config.js'> </script> 
 <script type='text/javascript' src='/opac/common/js/JSON_v1.js'> </script>
 <script type='text/javascript' src='/opac/common/js/fmall.js'> </script>
 <script type='text/javascript' src='/opac/common/js/fmgen.js'> </script>
diff --git a/Open-ILS/web/reports/xul/source-setup.js b/Open-ILS/web/reports/xul/source-setup.js
index 7a9ca848e2..0694f9fb20 100644
--- a/Open-ILS/web/reports/xul/source-setup.js
+++ b/Open-ILS/web/reports/xul/source-setup.js
@@ -1,4 +1,5 @@
 dojo.requireLocalization("openils.reports", "reports");
+dojo.require('openils.CGI');
 
 var rpt_strings = dojo.i18n.getLocalization("openils.reports", "reports");
 var idlNS	= "http://opensrf.org/spec/IDL/base/v1";
@@ -37,7 +38,7 @@ function sortLabels (a,b) {
 
 
 function loadTemplate(id) {
-	var cgi = new CGI();
+	var cgi = new openils.CGI();
 	var session = cgi.param('ses');
 
 	var r = new Request('open-ils.reporter:open-ils.reporter.template.retrieve', session, id);
@@ -71,7 +72,7 @@ function loadIDL() {
 				filterByAttributeNS( oilsIDL.getElementsByTagName('class'), rptNS, 'core', 'true' )
 			);
 
-			var cgi = new CGI();
+			var cgi = new openils.CGI();
 			var template_id = cgi.param('ct');
 			if (template_id) loadTemplate(template_id);
                 }
diff --git a/Open-ILS/web/reports/xul/template-config.js b/Open-ILS/web/reports/xul/template-config.js
index 46c66ac70a..4859308be7 100644
--- a/Open-ILS/web/reports/xul/template-config.js
+++ b/Open-ILS/web/reports/xul/template-config.js
@@ -1,6 +1,7 @@
 dojo.requireLocalization("openils.reports", "reports");
 
 var rpt_strings = dojo.i18n.getLocalization("openils.reports", "reports");
+dojo.require('openils.CGI');
 
 function removeReportAtom (args) {
 	if (!args) args = {};
@@ -789,7 +790,7 @@ function save_template () {
 	//prompt( 'template', js2JSON( template ) );
 
 	// and the saving throw ...
-	var cgi = new CGI();
+	var cgi = new openils.CGI();
 	var session = cgi.param('ses');
 	fetchUser( session );
 
diff --git a/Open-ILS/web/reports/xul/template_builder.xul b/Open-ILS/web/reports/xul/template_builder.xul
index 40ffface0d..73438c9411 100644
--- a/Open-ILS/web/reports/xul/template_builder.xul
+++ b/Open-ILS/web/reports/xul/template_builder.xul
@@ -23,16 +23,17 @@
 ]]>
 </script>
 <script type="text/javascript" src="/js/dojo/dojo/dojo.js"></script>
+<script type="text/javascript" src="/js/dojo/dojo/openils_dojo.js"></script>
 <script type="text/javascript">
 <![CDATA[
 	dojo.require('dojo.parser');
 	dojo.require('dojo.string');
+	dojo.require('openils.CGI');
 ]]>
 </script>
 
 <script src='/opac/common/js/utils.js' type="application/x-javascript; e4x=1"/>
 <script src='/opac/common/js/config.js' type="application/x-javascript; e4x=1"/>
-<script src='/opac/common/js/CGI.js' type="application/x-javascript; e4x=1"/>
 <script src='/opac/common/js/JSON_v1.js' type="application/x-javascript; e4x=1"/>
 <script src='/opac/common/js/fmall.js' type="application/x-javascript; e4x=1"/>
 <script src='/opac/common/js/fmgen.js' type="application/x-javascript; e4x=1"/>
diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
index 32f6ee902b..400bf08323 100644
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
@@ -32,7 +32,13 @@
         </script>
         <script type="text/javascript" src="../main/constants.js" />
         <script type="text/javascript" src="util/utils.js" />
-        <script type="text/javascript" src="util/CGI.js" />
+        <!-- Remove use of old cgi.js by replacing it with the new openils.cgi. -->
+        <script language='javascript' src='/js/dojo/dojo/dojo.js'></script>
+        <script language='javascript' src='/js/dojo/dojo/openils_dojo.js'></script>
+        <script language='javascript'>
+            dojo.require('openils.CGI');
+            CGI = openils.CGI; 
+        </script>
         <script type="text/javascript" src="util/md5.js" />
         <script type="text/javascript" src="util/JSON_v1.js" />
         <script type="text/javascript" src="util/fmall.js" />
diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul
index 3fb8de2d57..64e8eee1c6 100644
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul
@@ -34,7 +34,13 @@
     <scripts id="openils_util_scripts">
         <script type="text/javascript" src="../main/constants.js" />
         <script type="text/javascript" src="util/utils.js" />
-        <script type="text/javascript" src="util/CGI.js" />
+        <!-- Remove use of old cgi.js by replacing it with the new openils.cgi. -->
+        <script language='javascript' src='/js/dojo/dojo/dojo.js'></script>
+        <script language='javascript' src='/js/dojo/dojo/openils_dojo.js'></script>
+        <script language='javascript'>
+            dojo.require('openils.CGI');
+            CGI = openils.CGI; 
+        </script>
         <script type="text/javascript" src="util/md5.js" />
         <script type="text/javascript" src="util/JSON_v1.js" />
         <script type="text/javascript" src="global_util.js" />   
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/main.xul b/Open-ILS/xul/staff_client/chrome/content/main/main.xul
index 1c9d96f68d..527860a83e 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/main.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/main.xul
@@ -33,7 +33,13 @@
     <scripts id="openils_util_scripts">
         <script type="text/javascript" src="constants.js" />
         <script type="text/javascript" src="../OpenILS/util/utils.js" />
-        <script type="text/javascript" src="../OpenILS/util/CGI.js" />
+        <!-- Remove use of old cgi.js by replacing it with the new openils.cgi. -->
+        <script language='javascript' src='/js/dojo/dojo/dojo.js'></script>
+        <script language='javascript' src='/js/dojo/dojo/openils_dojo.js'></script>
+        <script language='javascript'>
+            dojo.require('openils.CGI');
+            CGI = openils.CGI; 
+        </script>
         <script type="text/javascript" src="../OpenILS/util/md5.js" />
         <script type="text/javascript" src="../OpenILS/util/JSON_v1.js" />
         <!--
diff --git a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
index 242acdcd0d..bc2d086b09 100644
--- a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
@@ -65,7 +65,13 @@
         <script type="text/javascript" src="/xul/server/cat/util.js" />
         <script type="text/javascript" src="/xul/server/patron/util.js" />
         <script type="text/javascript" src="/opac/common/js/utils.js" />
-        <script type="text/javascript" src="/opac/common/js/CGI.js" />
+        <!-- Remove use of old cgi.js by replacing it with the new openils.cgi. -->
+        <script language='javascript' src='/js/dojo/dojo/dojo.js'></script>
+        <script language='javascript' src='/js/dojo/dojo/openils_dojo.js'></script>
+        <script language='javascript'>
+            dojo.require('openils.CGI');
+            CGI = openils.CGI; 
+        </script>
         <script type="text/javascript" src="/opac/common/js/md5.js" />
         <script type="text/javascript" src="/opac/common/js/RemoteRequest.js" />
         <script type='text/javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js' />
diff --git a/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml b/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
index eadabca99f..0b0829bdb7 100644
--- a/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
@@ -10,9 +10,15 @@
 
     <head>
         <title>&staff.server.admin.cash.title;</title>
+        <!-- Remove use of old cgi.js by replacing it with the new openils.cgi. -->
+        <script language='javascript' src='/js/dojo/dojo/dojo.js'></script>
+        <script language='javascript' src='/js/dojo/dojo/openils_dojo.js'></script>
+        <script language='javascript'>
+            dojo.require('openils.CGI');
+            CGI = openils.CGI; 
+        </script>
         <script language='javascript' src='/opac/common/js/utils.js'> </script>
-        <script language='javascript' src='/opac/common/js//config.js'> </script>
-        <script language='javascript' src='/opac/common/js/CGI.js'> </script>
+        <script language='javascript' src='/opac/common/js/config.js'> </script>
     
         <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
         <script language='javascript' src='/opac/common/js/fmall.js'> </script>
diff --git a/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml b/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
index a3af761c2e..401c995501 100644
--- a/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
@@ -12,7 +12,15 @@
         <title>&staff.server.admin.closed_dates.title;</title>
         <script type='text/javascript' src='/opac/common/js/utils.js'> </script>
         <script type='text/javascript' src='/opac/common/js/config.js'> </script>
-        <script type='text/javascript' src='/opac/common/js/CGI.js'> </script>
+        
+        <!-- Remove use of old cgi.js by replacing it with the new openils.cgi. -->
+        <script language='javascript' src='/js/dojo/dojo/dojo.js'></script>
+        <script language='javascript' src='/js/dojo/dojo/openils_dojo.js'></script>
+        <script language='javascript'>
+            dojo.require('openils.CGI');
+            CGI = openils.CGI; 
+        </script>
+        
         <script type='text/javascript' src='/opac/common/js/JSON_v1.js'> </script>
         <script type='text/javascript' src='/opac/common/js/fmall.js'> </script>
         <script type='text/javascript' src='/opac/common/js/fmgen.js'> </script>
diff --git a/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml b/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
index 189df60ab6..d42eaf9579 100644
--- a/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
@@ -16,10 +16,12 @@
         <script type="text/javascript">
             dojo.require("fieldmapper.AutoIDL");
             dojo.require("openils.widget.TranslatorPopup");
+            // Remove use of old cgi.js by replacing it with the new openils.cgi.
+            dojo.require('openils.CGI');
+            CGI = openils.CGI;
         </script>
         <script language='javascript' src='/opac/common/js/utils.js'> </script>
         <script language='javascript' src='/opac/common/js//config.js'> </script>
-        <script language='javascript' src='/opac/common/js/CGI.js'> </script>
     
         <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
         <script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
diff --git a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml
index e0fad8aa15..944884c7a1 100644
--- a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml
@@ -13,9 +13,14 @@
     <head>
         <title>&staff.server.admin.hold_pull.title;</title>
         <script language='javascript' src='/opac/common/js/utils.js'> </script>
-        <script language='javascript' src='/opac/common/js//config.js'> </script> 
-        <script language='javascript' src='/opac/common/js/CGI.js'> </script>
-    
+        <script language='javascript' src='/opac/common/js/config.js'> </script> 
+        <!-- Remove use of old cgi.js by replacing it with the new openils.cgi. -->
+        <script language='javascript' src='/js/dojo/dojo/dojo.js'></script>
+        <script language='javascript' src='/js/dojo/dojo/openils_dojo.js'></script>
+        <script language='javascript'>
+            dojo.require('openils.CGI');
+            CGI = openils.CGI; 
+        </script>    
         <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
         <script language='javascript' src='/opac/common/js/fmall.js'> </script>
         <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
diff --git a/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml b/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml
index c689400e48..0d34dc8d88 100644
--- a/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml
@@ -11,9 +11,15 @@
 
     <head>
         <title>Evergreen Holds Pull List</title>
+        <!-- Remove use of old cgi.js by replacing it with the new openils.cgi. -->
+        <script language='javascript' src='/js/dojo/dojo/dojo.js'></script>
+        <script language='javascript' src='/js/dojo/dojo/openils_dojo.js'></script>
+        <script language='javascript'>
+            dojo.require('openils.CGI');
+            CGI = openils.CGI; 
+        </script>
         <script language='javascript' src='/opac/common/js/utils.js'> </script>
-        <script language='javascript' src='/opac/common/js//config.js'> </script> 
-        <script language='javascript' src='/opac/common/js/CGI.js'> </script>
+        <script language='javascript' src='/opac/common/js/config.js'> </script> 
     
         <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
         <script language='javascript' src='/opac/common/js/fmall.js'> </script>
diff --git a/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml b/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml
index 803b8caad7..680133a56f 100644
--- a/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml
@@ -12,8 +12,15 @@
         <title>&staff.server.admin.non_cat_types.title;</title>
         <script language='javascript' src='/opac/common/js/utils.js'> </script>
         <script language='javascript' src='/opac/common/js//config.js'> </script>
-        <script language='javascript' src='/opac/common/js/CGI.js'> </script>
-    
+        
+        <!-- Remove use of old cgi.js by replacing it with the new openils.cgi. -->
+        <script language='javascript' src='/js/dojo/dojo/dojo.js'></script>
+        <script language='javascript' src='/js/dojo/dojo/openils_dojo.js'></script>
+        <script language='javascript'>
+            dojo.require('openils.CGI');
+            CGI = openils.CGI; 
+        </script>
+        
         <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
         <script language='javascript' src='/opac/common/js/fmall.js'> </script>
         <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
diff --git a/Open-ILS/xul/staff_client/server/admin/printer_settings.html b/Open-ILS/xul/staff_client/server/admin/printer_settings.html
index fdd0db3ffd..c0eb3fc07b 100644
--- a/Open-ILS/xul/staff_client/server/admin/printer_settings.html
+++ b/Open-ILS/xul/staff_client/server/admin/printer_settings.html
@@ -11,8 +11,14 @@
     <style type='text/css'>
         .messagecatalog { -moz-binding: url( /xul/server/main/bindings.xml#messagecatalog ) }
     </style>
+    <!-- Remove use of old cgi.js by replacing it with the new openils.cgi. -->
+    <script language='javascript' src='/js/dojo/dojo/dojo.js'></script>
+    <script language='javascript' src='/js/dojo/dojo/openils_dojo.js'></script>
+    <script language='javascript'>
+        dojo.require('openils.CGI');
+        CGI = openils.CGI; 
+    </script>
     <script type="text/javascript" src="/opac/common/js/utils.js"></script>
-    <script type="text/javascript" src="/opac/common/js/CGI.js"></script>
     <script type="text/javascript" src="/opac/common/js/md5.js"></script>
     <script type="text/javascript" src="/opac/common/js/JSON_v1.js"></script>
     <script type="text/javascript" src="/opac/common/js/fmall.js"></script>
diff --git a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml
index c1341ebe75..8d466b1fab 100644
--- a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml
@@ -10,9 +10,15 @@
 
     <head>
         <title>&staff.server.admin.stat_cat.title;</title>
+        <!-- Remove use of old cgi.js by replacing it with the new openils.cgi. -->
+        <script language='javascript' src='/js/dojo/dojo/dojo.js'></script>
+        <script language='javascript' src='/js/dojo/dojo/openils_dojo.js'></script>
+        <script language='javascript'>
+            dojo.require('openils.CGI');
+            CGI = openils.CGI; 
+        </script>
         <script language='javascript' src='/opac/common/js/utils.js'> </script>
         <script language='javascript' src='/opac/common/js//config.js'> </script> 
-        <script language='javascript' src='/opac/common/js/CGI.js'> </script>
     
         <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
         <script language='javascript' src='/opac/common/js/fmall.js'> </script>
diff --git a/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml b/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml
index eae0bbeb90..b5d62ea663 100644
--- a/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml
@@ -16,8 +16,14 @@
     <script type="text/javascript" src="/xul/server/main/constants.js" />
     <script type="text/javascript" src="/xul/server/OpenILS/global_util.js" />
 
+    <!-- Remove use of old cgi.js by replacing it with the new openils.cgi. -->
+    <script language='javascript' src='/js/dojo/dojo/dojo.js'></script>
+    <script language='javascript' src='/js/dojo/dojo/openils_dojo.js'></script>
+    <script language='javascript'>
+        dojo.require('openils.CGI');
+        CGI = openils.CGI; 
+    </script>
     <script type="text/javascript" src="/opac/common/js/utils.js" />
-    <script type="text/javascript" src="/opac/common/js/CGI.js" />
     <script type="text/javascript" src="/opac/common/js/md5.js" />
     <script type="text/javascript" src="/opac/common/js/JSON_v1.js" />
     <script type="text/javascript" src="/opac/common/js/fmall.js" />
diff --git a/Open-ILS/xul/staff_client/server/index.xhtml b/Open-ILS/xul/staff_client/server/index.xhtml
index 44b6c81731..703d3d6bcd 100644
--- a/Open-ILS/xul/staff_client/server/index.xhtml
+++ b/Open-ILS/xul/staff_client/server/index.xhtml
@@ -57,7 +57,12 @@
 </script>
   <script type="text/javascript" src="/opac/common/js/utils.js">
 </script>
-  <script type="text/javascript" src="/opac/common/js/CGI.js">
+<!-- Remove use of old cgi.js by replacing it with the new openils.cgi. -->
+<script language='javascript' src='/js/dojo/dojo/dojo.js'></script>
+<script language='javascript' src='/js/dojo/dojo/openils_dojo.js'></script>
+<script language='javascript'>
+    dojo.require('openils.CGI');
+    CGI = openils.CGI; 
 </script>
   <script type="text/javascript" src="/opac/common/js/md5.js">
 </script>
diff --git a/Open-ILS/xul/staff_client/server/patron/ue.xhtml b/Open-ILS/xul/staff_client/server/patron/ue.xhtml
index 37b807db2f..af4809d2a8 100644
--- a/Open-ILS/xul/staff_client/server/patron/ue.xhtml
+++ b/Open-ILS/xul/staff_client/server/patron/ue.xhtml
@@ -12,8 +12,15 @@
     <head>
         <title>&ev.staff.patron.ue_xhtml.ev_user_editor.label;</title>
         <script language='javascript' src='/opac/common/js/utils.js'> </script>
-        <script language='javascript' src='/opac/common/js//config.js'> </script> 
-        <script language='javascript' src='/opac/common/js/CGI.js'> </script>
+        <script language='javascript' src='/opac/common/js/config.js'> </script> 
+        
+        <!-- Remove use of old cgi.js by replacing it with the new openils.cgi. -->
+        <script language='javascript' src='/js/dojo/dojo/dojo.js'></script>
+        <script language='javascript' src='/js/dojo/dojo/openils_dojo.js'></script>
+        <script language='javascript'>
+            dojo.require('openils.CGI');
+            CGI = openils.CGI; 
+        </script>
     
         <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
         <script language='javascript' src='/opac/common/js/fmall.js'> </script>
diff --git a/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml b/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml
index 8bdf628b73..2442587d6b 100644
--- a/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml
+++ b/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml
@@ -11,9 +11,16 @@
         <head>
                 <title>&staff.patron.user_edit.title;</title>
                 <script language='javascript' src='/opac/common/js/utils.js'> </script>
-                <script language='javascript' src='/opac/common/js//config.js'> </script>
-                <script language='javascript' src='/opac/common/js/CGI.js'> </script>
-
+                <script language='javascript' src='/opac/common/js/config.js'> </script>
+                
+                <!-- Remove use of old cgi.js by replacing it with the new openils.cgi. -->
+                <script language='javascript' src='/js/dojo/dojo/dojo.js'></script>
+                <script language='javascript' src='/js/dojo/dojo/openils_dojo.js'></script>
+                <script language='javascript'>
+                    dojo.require('openils.CGI');
+                    CGI = openils.CGI; 
+                </script>
+    
                 <script language='javascript' src='/opac/common/js/slimtree.js'> </script>
                 <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
                 <script language='javascript' src='/opac/common/js/fmall.js'> </script>
-- 
2.11.0