Index: branches/1.1dev/bin/module_maker/list_template.cli.php
===================================================================
--- branches/1.1dev/bin/module_maker/list_template.cli.php	(revision 183)
+++ branches/1.1dev/bin/module_maker/list_template.cli.php	(revision 185)
@@ -104,5 +104,5 @@
 
 <\x3fphp include 'form_error_header.ihtml'; \x3f>
-<form action="<\x3fphp echo \$_SERVER['PHP_SELF']; \x3f>" method="post">
+<form action="<\x3fphp echo oTxt(\$_SERVER['PHP_SELF']); \x3f>" method="post">
 <\x3fphp printHiddenSession(false); \x3f>
 
Index: branches/1.1dev/bin/module_maker/module.cli.php
===================================================================
--- branches/1.1dev/bin/module_maker/module.cli.php	(revision 183)
+++ branches/1.1dev/bin/module_maker/module.cli.php	(revision 185)
@@ -248,7 +248,7 @@
 $search['admin_form_tag_init'] = '/%ADMIN_FORM_TAG_INIT%/';
 if ($multipart_form_required) {
-    $replace['admin_form_tag_init'] = "<form enctype=\"multipart/form-data\" method=\"post\" action=\"<\x3fphp echo \$_SERVER['PHP_SELF']; \x3f>\">\n<input type=\"hidden\" name=\"MAX_FILE_SIZE\" value=\"12000000\">";
-} else {
-    $replace['admin_form_tag_init'] = "<form method=\"post\" action=\"<\x3fphp echo \$_SERVER['PHP_SELF']; \x3f>\">";
+    $replace['admin_form_tag_init'] = "<form enctype=\"multipart/form-data\" method=\"post\" action=\"<\x3fphp echo oTxt(\$_SERVER['PHP_SELF']); \x3f>\">\n<input type=\"hidden\" name=\"MAX_FILE_SIZE\" value=\"12000000\">";
+} else {
+    $replace['admin_form_tag_init'] = "<form method=\"post\" action=\"<\x3fphp echo oTxt(\$_SERVER['PHP_SELF']); \x3f>\">";
 }
 
Index: branches/1.1dev/bin/module_maker/skel/adm_list.ihtml
===================================================================
--- branches/1.1dev/bin/module_maker/skel/adm_list.ihtml	(revision 183)
+++ branches/1.1dev/bin/module_maker/skel/adm_list.ihtml	(revision 185)
@@ -3,5 +3,5 @@
 
 <div id="commandbox">
-    <form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="get">
+    <form action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>" method="get">
         <?php printHiddenSession(false); ?>
         <span class="nowrap commandtext"><a href="<?php echo ohref($_SERVER['PHP_SELF'] . '?op=add'); ?>"><?php echo _("Add %ITEM_TITLE%"); ?></a></span>
@@ -18,5 +18,5 @@
 <?php include 'adm_list_info.ihtml'; ?>
 
-<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post">
+<form action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>" method="post">
     <?php printHiddenSession(false); ?>
     <table class="list">
Index: branches/1.1dev/lib/PEdit.inc.php
===================================================================
--- branches/1.1dev/lib/PEdit.inc.php	(revision 183)
+++ branches/1.1dev/lib/PEdit.inc.php	(revision 185)
@@ -273,5 +273,5 @@
         }
         ?>
-        <form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post">
+        <form action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>" method="post">
         <input type="hidden" name="filename" value="<?php echo $this->_filename; ?>" />
         <input type="hidden" name="file_hash" value="<?php echo md5('frog_guts' . $this->_filename); ?>" />
Index: branches/1.1dev/templates/adm_admin_form.ihtml
===================================================================
--- branches/1.1dev/templates/adm_admin_form.ihtml	(revision 183)
+++ branches/1.1dev/templates/adm_admin_form.ihtml	(revision 185)
@@ -1,5 +1,5 @@
 <?php include 'form_error_header.ihtml'; ?>
 
-<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<form method="post" action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>">
 <?php printHiddenSession(); ?>
 <input type="hidden" name="op" value="<?php echo $frm['new_op']; ?>">
Index: branches/1.1dev/templates/adm_admin_list.ihtml
===================================================================
--- branches/1.1dev/templates/adm_admin_list.ihtml	(revision 183)
+++ branches/1.1dev/templates/adm_admin_list.ihtml	(revision 185)
@@ -1,5 +1,5 @@
 
 <?php include 'form_error_header.ihtml'; ?>
-<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post">
+<form action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>" method="post">
 <?php $carry_queries = array('search_query', 'filter_admin_priv'); ?>
 <?php printHiddenSession(false); ?>
Index: branches/1.1dev/templates/adm_log_list.ihtml
===================================================================
--- branches/1.1dev/templates/adm_log_list.ihtml	(revision 183)
+++ branches/1.1dev/templates/adm_log_list.ihtml	(revision 185)
@@ -1,5 +1,5 @@
 
 <?php include 'form_error_header.ihtml'; ?>
-<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post">
+<form action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>" method="post">
 <?php printHiddenSession(false); ?>
 
Index: branches/1.1dev/templates/adm_login_form.ihtml
===================================================================
--- branches/1.1dev/templates/adm_login_form.ihtml	(revision 183)
+++ branches/1.1dev/templates/adm_login_form.ihtml	(revision 185)
@@ -1,3 +1,3 @@
-<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<form method="post" action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>">
 <?php printHiddenSession() ?>
 <table border="0" cellspacing="0" cellpadding="4">
Index: branches/1.1dev/templates/adm_record_lock.ihtml
===================================================================
--- branches/1.1dev/templates/adm_record_lock.ihtml	(revision 183)
+++ branches/1.1dev/templates/adm_record_lock.ihtml	(revision 185)
@@ -1,3 +1,3 @@
-<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<form method="post" action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>">
 <?php printHiddenSession() ?>
 <input type="hidden" name="lock_id" value="<?php echo $lock->getID(); ?>" />
Index: branches/1.1dev/templates/adm_record_version_list.ihtml
===================================================================
--- branches/1.1dev/templates/adm_record_version_list.ihtml	(revision 183)
+++ branches/1.1dev/templates/adm_record_version_list.ihtml	(revision 185)
@@ -1,3 +1,3 @@
-<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<form method="post" action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>">
 <?php printHiddenSession() ?>
 <input type="submit" class="formsubmitbutton" name="op" value="<?php echo _("Cancel"); ?>">
Index: branches/1.1dev/templates/login_form.ihtml
===================================================================
--- branches/1.1dev/templates/login_form.ihtml	(revision 183)
+++ branches/1.1dev/templates/login_form.ihtml	(revision 185)
@@ -1,3 +1,3 @@
-<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<form method="post" action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>">
 <?php printHiddenSession() ?>
 <table border="0" cellspacing="0" cellpadding="4">
Index: branches/1.1dev/templates/passwd.ihtml
===================================================================
--- branches/1.1dev/templates/passwd.ihtml	(revision 183)
+++ branches/1.1dev/templates/passwd.ihtml	(revision 185)
@@ -1,5 +1,5 @@
 <?php include 'form_error_header.ihtml'; ?>
 
-<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<form method="post" action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>">
 <?php printHiddenSession() ?>
 <input type="hidden" name="op" value="update_password">
